From e42e30d3cc0af8b6a7d9abda195eeed89b42ab33 Mon Sep 17 00:00:00 2001
From: Zuckerberg <zuckerberg@neet.dev>
Date: Sat, 24 Jan 2026 15:01:16 -0800
Subject: [PATCH] Fix nix-index autogenerated db comma integration

---
 common/shell.nix | 22 +---------------------
 flake.nix        |  2 +-
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/common/shell.nix b/common/shell.nix
index aa1697d..0bc818e 100644
--- a/common/shell.nix
+++ b/common/shell.nix
@@ -6,14 +6,11 @@
 # - add some handy shell commands
 
 {
-  environment.systemPackages = with pkgs; [
-    comma
-  ];
-
   # nix-index
   programs.nix-index.enable = true;
   programs.nix-index.enableFishIntegration = true;
   programs.command-not-found.enable = false;
+  programs.nix-index-database.comma.enable = true;
 
   programs.fish = {
     enable = true;
@@ -35,21 +32,4 @@
 
     llsblk = "lsblk -o +uuid,fsType";
   };
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      # comma uses the "nix-index" package built into nixpkgs by default.
-      # That package doesn't use the prebuilt nix-index database so it needs to be changed.
-      comma = prev.comma.overrideAttrs (old: {
-        nativeBuildInputs = old.nativeBuildInputs ++ [
-          prev.makeWrapper
-        ];
-        postInstall = ''
-          wrapProgram $out/bin/comma \
-            --prefix PATH : ${lib.makeBinPath [ prev.fzy config.programs.nix-index.package ]}
-          ln -s $out/bin/comma $out/bin/,
-        '';
-      });
-    })
-  ];
 }
diff --git a/flake.nix b/flake.nix
index 8c494b6..cd9fb5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,7 +89,7 @@
             simple-nixos-mailserver.nixosModule
             agenix.nixosModules.default
             dailybuild_modules.nixosModule
-            nix-index-database.nixosModules.nix-index
+            nix-index-database.nixosModules.default
             home-manager.nixosModules.home-manager
             self.nixosModules.kernel-modules
             ({ lib, ... }: {