diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix
index 2f06409..79994bd 100644
--- a/nix-conf/home/includes/common.nix
+++ b/nix-conf/home/includes/common.nix
@@ -57,6 +57,10 @@ in
   ];
 
   programs.gpg.enable = true;
-  programs.nix-index.enable = true;
+  programs.nix-index = {
+    enable = true;
+    enableZshIntegration = false;
+    enableBashIntegration = false;
+  };
 }
 
diff --git a/nix-conf/home/includes/zsh.nix b/nix-conf/home/includes/zsh.nix
index a101ca0..854c82b 100644
--- a/nix-conf/home/includes/zsh.nix
+++ b/nix-conf/home/includes/zsh.nix
@@ -23,7 +23,7 @@
     keys = [ "id_rsa" "id_ed25519" "C171251002C200F2" ];
   #  extraFlags = [ "--quiet" "--ignore-missing" ];
   };
-  programs.command-not-found.enable = false;
+  programs.command-not-found.enable = true;
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -70,8 +70,6 @@
     };
 
     initExtra = ''
-      source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
-
       # Taken from prezto tmux plugin
       if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && -z "$SSH_TTY" ]]; then
         tmux start-server