diff --git a/home/fish.nix b/home/fish.nix
index 1cda73a..8003572 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -42,4 +42,5 @@
   programs.fzf.enableFishIntegration = true;
   programs.zoxide.enableFishIntegration = true;
   programs.eza.enableFishIntegration = true;
+  programs.nix-index.enableFishIntegration = true;
 }
diff --git a/home/yt/common.nix b/home/yt/common.nix
index 110c79d..844f01b 100644
--- a/home/yt/common.nix
+++ b/home/yt/common.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../tmux.nix
-    ../zsh
+    ../fish.nix
   ];
 
   home.sessionVariables = {
diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix
index 02f8838..0056a40 100644
--- a/home/yt/ytnix.nix
+++ b/home/yt/ytnix.nix
@@ -6,7 +6,6 @@
   imports = [
     ./common.nix
     ../foot.nix
-    ../fish.nix
   ];
   home = {
     username = "yt";
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index ca495aa..fabb7ba 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -87,4 +87,5 @@
   programs.fzf.enableZshIntegration = true;
   programs.zoxide.enableZshIntegration = true;
   programs.eza.enableZshIntegration = true;
+  programs.nix-index.enableZshIntegration = true;
 }
diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix
index 216ed72..bf8bc98 100644
--- a/hosts/chunk/default.nix
+++ b/hosts/chunk/default.nix
@@ -156,9 +156,7 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdhAQYy0+vS+QmyCd0MAbqbgzyMGcsuuFyf6kg2yKge yt@ytlinux"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINyn2+OoRN4nExti+vFQ1NHEZip0slAoCH9C5/FzvgZD yt@ytnix"
     ];
-    shell = pkgs.zsh;
   };
-  programs.zsh.enable = true;
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdhAQYy0+vS+QmyCd0MAbqbgzyMGcsuuFyf6kg2yKge yt@ytlinux"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINyn2+OoRN4nExti+vFQ1NHEZip0slAoCH9C5/FzvgZD yt@ytnix"
diff --git a/hosts/common.nix b/hosts/common.nix
index e370dda..bcc2fa5 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{pkgs, ... }:
 {
   nix = {
     settings = {
@@ -24,9 +24,8 @@
   # this is true by default and mutually exclusive with
   # programs.nix-index
   programs.command-not-found.enable = false;
-  programs.nix-index = {
-    enable = true;
-    enableZshIntegration = true;
-  };
+  programs.nix-index.enable = true;
 
+  users.users.yt.shell = pkgs.fish;
+  programs.fish.enable = true;
 }
diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix
index e486e34..eef7186 100644
--- a/hosts/ytnix/default.nix
+++ b/hosts/ytnix/default.nix
@@ -115,9 +115,7 @@
       "libvirtd"
       "docker"
     ];
-    shell = pkgs.fish;
   };
-  programs.fish.enable = true;
 
   environment.systemPackages = with pkgs; [
     tmux