Update nix-index config

simonrw · Jul 7, 2024 · 527c562 · 527c562
1 parent 4e9902a
commit 527c562
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/flake.nix b/flake.nix
@@ -60,7 +60,6 @@
     flake-utils,
     home-manager,
     jetbrains-updater,
-    nix-index-database,
     vscode-server,
     cert-info,
     nur,
@@ -72,7 +71,6 @@
         keymapp = final.callPackage ./derivations/keymapp {pkgs = final;};
         listprojects = final.callPackage ./derivations/listprojects {};
         notify-wrapper = final.callPackage ./derivations/notify-wrapper {};
-        database = nix-index-database.legacyPackages.${system}.database;
         monaspace = final.callPackage ./derivations/monaspace {};
         ansi = final.callPackage ./derivations/ansi {};
         wally = final.callPackage ./derivations/wally {};
@@ -142,10 +140,10 @@
               imports = [
                 ./home/home.nix
                 nixvim.homeManagerModules.nixvim
+                inputs.nix-index-database.hmModules.nix-index
               ];
             };
           }
-          nix-index-database.nixosModules.nix-index
           vscode-server.nixosModule
           ({
             config,
@@ -197,10 +195,10 @@
                 imports = [
                   ./home/home.nix
                   nixvim.homeManagerModules.nixvim
+                  inputs.nix-index-database.hmModules.nix-index
                 ];
               };
             }
-            nix-index-database.darwinModules.nix-index
           ];
         };
       };
@@ -220,6 +218,7 @@
             modules = [
               ./home/home.nix
               nixvim.homeManagerModules.nixvim
+              inputs.nix-index-database.hmModules.nix-index
             ];
             # stop infinite recusion when trying to access
             # pkgs.stdenv.is{Linux,Darwin} from within a module

diff --git a/home/nix-index.nix b/home/nix-index.nix
@@ -1,9 +1,6 @@
-# add symlink to nix-index database
 {
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
-  home.file."${config.xdg.cacheHome}/nix-index/files".source = pkgs.database;
+  programs = {
+    nix-index-database.comma.enable = true;
+    nix-index.enable = true;
+  };
 }
diff --git a/minimal/home.nix b/minimal/home.nix
@@ -21,7 +21,7 @@ in {
     ../home/fzf.nix
     ../home/jq.nix
     ../home/nixvim
-    ../home/nix-index.nix
+    # ../home/nix-index.nix
     ../home/tmux.nix
     ../home/git/global.nix
   ];

diff --git a/system/darwin/mba/configuration.nix b/system/darwin/mba/configuration.nix
@@ -47,7 +47,6 @@
 
   programs.fish.enable = true;
   programs.zsh.enable = true;
-  programs.nix-index.enable = true;
   programs.gnupg.agent.enable = true;
 
   system.keyboard.enableKeyMapping = true;