49 papercuts

CHANGELOG.md

@@ -1,3 +1,4 @@
+- Use `nix-index-database` for prebuilt `nix-index` databases on all platforms
 - Fixed `darwin-rebuild switch` outputting `Dock` PID
 - Fixed `vscode` build on macOS
 - Removed `berkeleydb` and `swift-quit` overlays

flake.nix

@@ -67,8 +67,12 @@
 
   inputs.impermanence.url = "github:nix-community/impermanence";
 
+  inputs.nix-index-database.url = "github:nix-community/nix-index-database";
+  inputs.nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+
   outputs = inputs@{ self, nixpkgs, nix-darwin, home-manager, flake-utils-plus
-    , agenix, disko, impermanence, flake-parts, git-hooks, terranix, ... }:
+    , agenix, disko, impermanence, nix-index-database, flake-parts, git-hooks
+    , terranix, ... }:
 
     nixpkgs.lib.recursiveUpdate
 
@@ -133,6 +137,7 @@
           darwinModules = map (getAttr "darwinModule")
             (filter (hasAttr "darwinModule") modulesToImport);
           home = [
+            nix-index-database.hmModules.nix-index
             impermanence.nixosModules.home-manager.impermanence
             ./hosts/${host}/home.nix
           ] ++ homeModules;
@@ -160,6 +165,7 @@
                 agenix.nixosModules.age
                 disko.nixosModules.disko
                 impermanence.nixosModules.impermanence
+                nix-index-database.nixosModules.nix-index
                 ./hosts/${host}/configuration.nix
               ] ++ nixosModules ++ [
                 home-manager.nixosModules.home-manager
@@ -190,6 +196,7 @@
               modules = [
                 flake-utils-plus.darwinModules.autoGenFromInputs
                 agenix.darwinModules.age
+                nix-index-database.darwinModules.nix-index
                 ./hosts/${host}/darwin-configuration.nix
               ] ++ darwinModules ++ [
                 home-manager.darwinModules.home-manager

modules/base.nix

@@ -67,6 +67,8 @@ let
         path = "${config.users.users.${user}.home}/.zshrc.secrets";
         owner = user;
       };
+
+      programs.nix-index-database.comma.enable = true;
     };
 in {
   imports = [
@@ -75,7 +77,6 @@ in {
     "cache"
     "flakes"
     "kitty"
-    "nix-index"
     "syncthing"
     "termite"
     "vm"
@@ -361,6 +362,8 @@ in {
         };
       };
 
+      programs.nix-index-database.comma.enable = true;
+
       programs.direnv.enable = true;
       programs.direnv.nix-direnv.enable = true;