diff --git a/flake.lock b/flake.lock
index 3a13a311..ae6c61a2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -208,6 +208,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752441837,
+        "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "839e02dece5845be3a322e507a79712b73a96ba2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1752048960,
@@ -382,6 +402,7 @@
         "disko": "disko",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager_2",
+        "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2",
diff --git a/flake.nix b/flake.nix
index f7d6663e..405da7f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,11 @@
       url = "github:nix-community/home-manager/master";
     };
 
+    nix-index-database = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/nix-index-database";
+    };
+
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 47599e64..53f94a96 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -22,6 +22,7 @@
 
     ./homelab/gitea-actions-runner.nix
 
+    ./nix-index.nix
     ./nixpad
   ];
 }
diff --git a/modules/nixos/nix-index.nix b/modules/nixos/nix-index.nix
new file mode 100644
index 00000000..614416bd
--- /dev/null
+++ b/modules/nixos/nix-index.nix
@@ -0,0 +1,7 @@
+{ inputs, ... }:
+
+{
+  imports = [ inputs.nix-index-database.nixosModules.nix-index ];
+
+  programs.nix-index-database.comma.enable = true;
+}
diff --git a/users/opdavies.nix b/users/opdavies.nix
index 14bb50c7..0c60e68f 100644
--- a/users/opdavies.nix
+++ b/users/opdavies.nix
@@ -22,7 +22,6 @@ with lib;
       ++ optional config.features.cli.podman.enable "podman";
 
     packages = with pkgs; [
-      comma
       magic-wormhole
     ];