diff --git a/programs/fish.nix b/programs/fish.nix
new file mode 100644
index 0000000..074fbbf
--- /dev/null
+++ b/programs/fish.nix
@@ -0,0 +1,27 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  programs.fish.enable = true;
+
+  environment.systemPackages = with pkgs; [nix-your-shell];
+
+  hm.programs.fish = {
+    enable = true;
+
+    shellInit = ''
+      set -x EDTIOR nvim
+    '';
+
+    interactiveShellInit = with pkgs; ''
+      ${lib.getExe starship} init fish | source
+      ${lib.getExe nix-your-shell} fish | source
+    '';
+
+    functions = {
+      fish_greeting = "";
+      kssh = "${lib.getExe pkgs.kitty} +kitten ssh -- $argv";
+    };
+  };
+}
diff --git a/systems/common.nix b/systems/common.nix
index a900409..67daf6d 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -8,19 +8,11 @@
     neovim
     git
     curl
-    nix-your-shell
   ];
 
   programs = {
     ssh.startAgent = true;
 
-    fish = {
-      enable = true;
-      interactiveShellInit = ''
-        nix-your-shell fish | source
-      '';
-    };
-
     direnv.enable = true;
 
     command-not-found.enable = false;