diff --git a/home/fish.nix b/home/fish.nix
index d73f448..f2590d0 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -1,17 +1,7 @@
-{pkgs, ...}: {
+{ ... }:
+{
   programs.fish = {
     enable = true;
-    plugins = [
-    {
-      name = "colored-man-pages";
-      src = pkgs.fetchFromGitHub {
-        owner = "PatrickF1";
-        repo = "colored_man_pages.fish";
-        rev = "f885c2507128b70d6c41b043070a8f399988bc7a";
-        hash = "sha256-ii9gdBPlC1/P1N9xJzqomrkyDqIdTg+iCg0mwNVq2EU=";
-      };
-    }
-    ];
     shellAliases = {
       "vi" = "nvim";
       "vim" = "nvim";
@@ -45,15 +35,7 @@
     };
   };
 
-  programs.fzf = {
-    enableFishIntegration = true;
-  };
-
-  programs.zoxide = {
-    enableFishIntegration = true;
-  };
-
-  programs.eza = {
-    enableFishIntegration = true;
-  };
+  programs.fzf.enableFishIntegration = true;
+  programs.zoxide.enableFishIntegration = true;
+  programs.eza.enableFishIntegration = true;
 }
diff --git a/home/yt/common.nix b/home/yt/common.nix
index f4918ad..110c79d 100644
--- a/home/yt/common.nix
+++ b/home/yt/common.nix
@@ -19,4 +19,9 @@
     man
     man-db
   ];
+
+  programs.zoxide.options = [ "--cmd cd" ];
+  programs.fzf.enable = true;
+  programs.zoxide.enable = true;
+  programs.eza.enable = true;
 }
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 8e5e6f3..ca495aa 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -84,19 +84,7 @@
     };
   };
 
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
-  programs.zoxide = {
-    enable = true;
-    enableZshIntegration = true;
-    options = [ "--cmd cd" ];
-  };
-
-  programs.eza = {
-    enable = true;
-    enableZshIntegration = true;
-  };
+  programs.fzf.enableZshIntegration = true;
+  programs.zoxide.enableZshIntegration = true;
+  programs.eza.enableZshIntegration = true;
 }
diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix
index 0639e6a..e486e34 100644
--- a/hosts/ytnix/default.nix
+++ b/hosts/ytnix/default.nix
@@ -115,9 +115,9 @@
       "libvirtd"
       "docker"
     ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
   };
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
 
   environment.systemPackages = with pkgs; [
     tmux