diff --git a/flake.lock b/flake.lock
index a5f3b81..3099d30 100644
--- a/flake.lock
+++ b/flake.lock
@@ -474,6 +474,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773552174,
+        "narHash": "sha256-mHSRNrT1rjeYBgkAlj07dW3+1nFEgAd8Gu6lgyfT9DU=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "8faeb68130df077450451b6734a221ba0d6cde42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1764242076,
@@ -728,6 +748,7 @@
         "linux-tkg": "linux-tkg",
         "neovim-nightly": "neovim-nightly",
         "nix-gaming": "nix-gaming",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_6",
         "nvim-treesitter": "nvim-treesitter",
         "pastel": "pastel",
diff --git a/flake.nix b/flake.nix
index c359c93..407c4fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,8 @@
     neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-gaming.url = "github:fufexan/nix-gaming";
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
     spicetify-nix.url = "github:Gerg-L/spicetify-nix";
     spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
 
diff --git a/modules/default.nix b/modules/default.nix
index 93b3c88..f47d4ee 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -54,6 +54,7 @@ in {
   ];
   user = mkAttrsFromPaths [
     ./user/catppuccin.nix
+    ./user/comma.nix
     ./user/direnv.nix
     ./user/dunst.nix
     ./user/eww.nix
diff --git a/modules/system/packages.nix b/modules/system/packages.nix
index 8670e6e..afeef4e 100644
--- a/modules/system/packages.nix
+++ b/modules/system/packages.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   imports = [ ./packages-gui.nix ];
   environment.systemPackages = with pkgs; [
-    comma
     # ecryptfs
     efibootmgr
     fd
diff --git a/modules/user/comma.nix b/modules/user/comma.nix
new file mode 100644
index 0000000..5ae7f03
--- /dev/null
+++ b/modules/user/comma.nix
@@ -0,0 +1,7 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.nix-index-database.homeModules.default
+  ];
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+}
diff --git a/modules/user/zsh.nix b/modules/user/zsh.nix
index 6e8db74..1eb736c 100644
--- a/modules/user/zsh.nix
+++ b/modules/user/zsh.nix
@@ -102,7 +102,6 @@ let
     bindkey -a -r ':'
   '';
 in {
-  programs.command-not-found.enable = true;
   programs.zsh = {
     enable = true;
     dotDir = "${config.xdg.configHome}/zsh";
diff --git a/users/hana/default.nix b/users/hana/default.nix
index ed7a464..da2022a 100644
--- a/users/hana/default.nix
+++ b/users/hana/default.nix
@@ -21,6 +21,7 @@
     };
 
     imports = with modules.user; [
+      comma
       direnv
       git
       neovim-minimal
diff --git a/users/rin/default.nix b/users/rin/default.nix
index 91166ed..a70d716 100644
--- a/users/rin/default.nix
+++ b/users/rin/default.nix
@@ -21,6 +21,7 @@
       sessionVariables
 
       catppuccin
+      comma
       direnv
       git
       gpg