diff --git a/home.nix b/home.nix
index 021b63b..adbb887 100644
--- a/home.nix
+++ b/home.nix
@@ -19,8 +19,9 @@
   imports = [
     ./home/alacritty
     ./home/bat
-    ./home/git
+    ./home/fish
     ./home/ghostty
+    ./home/git
     ./home/helix
     ./home/home-manager
     ./home/neovim
@@ -83,17 +84,6 @@
     settings.color.when = "never";
   };
 
-  programs.fish = {
-    enable = true;
-    functions.fish_greeting = "";
-    shellInit = ''
-      fish_add_path /usr/local/bin
-      # https://github.com/Homebrew/brew/blob/master/Library/Homebrew/cmd/shellenv.sh
-      eval (/opt/homebrew/bin/brew shellenv)
-      . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
-    '';
-  };
-
   programs.starship.enable = true;
 
   programs.zoxide.enable = true;
diff --git a/home/fish/default.nix b/home/fish/default.nix
new file mode 100644
index 0000000..86bb492
--- /dev/null
+++ b/home/fish/default.nix
@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+  programs.fish = {
+    enable = true;
+    functions.fish_greeting = "";
+    shellInit = ''
+      fish_add_path /usr/local/bin
+      # https://github.com/Homebrew/brew/blob/master/Library/Homebrew/cmd/shellenv.sh
+      eval (/opt/homebrew/bin/brew shellenv)
+      . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
+    '';
+  };
+}