diff --git a/flake.lock b/flake.lock
index f5a74c2..69e5e21 100644
--- a/flake.lock
+++ b/flake.lock
@@ -212,6 +212,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1673752441,
+        "narHash": "sha256-/g4ImZWV05CrXRWTSJsda6ztIp7LAPxs2L6RCrbQ66U=",
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "rev": "391180f77505c1c8cdd45fe1a59dc89d3e40300a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1665732960,
@@ -331,6 +351,7 @@
         "hyprland": "hyprland",
         "material-wifi-icons": "material-wifi-icons",
         "nil-lsp": "nil-lsp",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
diff --git a/flake.nix b/flake.nix
index a2e1e54..93e9021 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,11 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nur.url = "github:nix-community/NUR";
 
+    nix-index-database = {
+      url = "github:Mic92/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # mpvpaper
     wegank = {
       url = "github:wegank/nur-packages";
diff --git a/user/fish.nix b/user/fish.nix
index d4c70f5..9842b52 100644
--- a/user/fish.nix
+++ b/user/fish.nix
@@ -66,7 +66,8 @@ in {
     home.file = {
       ".config/fish/conf.d/prompt.fish".source = ./fish_prompt.fish;
     };
-    programs.command-not-found.enable = true;
+    # programs.command-not-found.enable = true;
+    programs.nix-index.enable = true;
     home.packages = with pkgs; [ trash-cli ];
   };
 }
diff --git a/user/home.nix b/user/home.nix
index a91b9ae..6df722b 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -29,6 +29,7 @@ in {
     ./man.nix
     ./mpd.nix
     inputs.hyprland.homeManagerModules.default
+    inputs.nix-index-database.hmModules.nix-index
   ] ++ lib.optional (desktop == "sway") ./sway.nix;
 
   # Home Manager needs a bit of information about you and the
@@ -56,6 +57,8 @@ in {
     _diffr
     br # bulk rename
 
+    comma
+
     ## text manipulation
     sd
     ripgrep