about summary refs log tree commit diff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/configuration.nix8
-rw-r--r--hosts/default.nix1
2 files changed, 5 insertions, 4 deletions
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