about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBaitinq <manuelpalenzuelamerino@gmail.com>2024-06-19 00:29:22 +0200
committerBaitinq <manuelpalenzuelamerino@gmail.com>2024-06-19 00:29:34 +0200
commit5286fc54bd18682042758fd119dfe0cac390cca2 (patch)
tree94ccb17b1d79f773e969676f32e63d8d5b3dca93
parentwireguard: Add new 'server' host (diff)
downloadnixos-config-5286fc54bd18682042758fd119dfe0cac390cca2.tar.gz
nixos-config-5286fc54bd18682042758fd119dfe0cac390cca2.tar.bz2
nixos-config-5286fc54bd18682042758fd119dfe0cac390cca2.zip
Update
-rw-r--r--flake.lockbin8247 -> 7844 bytes
-rw-r--r--flake.nix5
-rw-r--r--hosts/configuration.nix8
-rw-r--r--hosts/default.nix1
-rw-r--r--overlays/base/default.nix2
5 files changed, 10 insertions, 6 deletions
diff --git a/flake.lock b/flake.lock
index f5556b0..fcaac5e 100644
--- a/flake.lock
+++ b/flake.lock
Binary files differdiff --git a/flake.nix b/flake.nix
index 8aa2b4f..d8ad14b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,10 @@
 
     nixtest.url = "github:jetpack-io/nixtest";
 
-    nix-index.url = "github:Mic92/nix-index-database";
+    nix-index = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     hosts = {
       url = "github:StevenBlack/hosts";
diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index 51846b3..f71f497 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -83,7 +83,6 @@
     XKB_DEFAULT_LAYOUT = "us";
 
     NIXPKGS_ALLOW_UNFREE = "1";
-    NIX_INDEX_DATABASE = "/etc/nix-index/";
   };
 
   environment.sessionVariables = rec {
@@ -125,7 +124,6 @@
     usbutils
     pciutils
     gnupg
-    comma
     xclip
     strace
     fzf
@@ -135,8 +133,6 @@
 
   environment.defaultPackages = [ ];
 
-  environment.etc."nix-index/files".source = inputs.nix-index.legacyPackages.${system}.database;
-
   xdg.portal = {
     enable = true;
     wlr.enable = true;
@@ -186,6 +182,10 @@
 
     dconf.enable = true;
 
+    command-not-found.enable = false;
+    nix-index.enable = true;
+    nix-index-database.comma.enable = true;
+
     firejail = {
       enable = true;
       wrappedBinaries = {
diff --git a/hosts/default.nix b/hosts/default.nix
index 928abdf..06d5e29 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -42,6 +42,7 @@ let
                 ];
               };
             }
+            inputs.nix-index.nixosModules.nix-index
           ] ++ extraSpecialModules;
         }
     else if isMacOS
diff --git a/overlays/base/default.nix b/overlays/base/default.nix
index bb2f545..c8d7af8 100644
--- a/overlays/base/default.nix
+++ b/overlays/base/default.nix
@@ -64,7 +64,7 @@ final: prev:
     ];
   });
 
-  mpv = prev.wrapMpv prev.mpv-unwrapped {
+  mpv = prev.mpv.override {
     scripts = [ prev.mpvScripts.mpris ];
   };