diff --git a/home-manager/common/software/cli/default.nix b/home-manager/common/software/cli/default.nix
index 30e19bdb..f714483c 100644
--- a/home-manager/common/software/cli/default.nix
+++ b/home-manager/common/software/cli/default.nix
@@ -2,6 +2,7 @@
   imports = [
         ./atuin.nix
         ./bash.nix
+        ./fish.nix
         ./btop.nix
         ./starship.nix
         ./git.nix
diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index c88d7c21..073fc257 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -1,14 +1,16 @@
 { ... }: {
   programs.kitty.shellIntegration.enableFishIntegration = true;
+  programs.starship.enableFishIntegration = true;
+
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
-      GPG_TTY=$(tty)
-      EDITOR=vim
+      set GPG_TTY $tty
+      set EDITOR vim
       ssh-add > /dev/null &> /dev/null
-      if [ -z "$DISABLE_TMUX" ] && [ -z "$TMUX" ] ; then 
+      if [ -z "$DISABLE_TMUX" ] && [ -z "$TMUX" ]; 
         tmux attach || exec tmux new-session && exit
-      fi
+      end
     '';
     functions = {
       update_secrets = ''
@@ -18,10 +20,10 @@
       '';
       restart-docker = ''
         pushd /Storage/Data/docker-compose/sysctl.io/
-        docker stop $1
-        docker rm $1
+        docker stop $argv
+        docker rm $argv
         git pull
-        docker compose up -d $1
+        docker compose up -d $argv
         popd
       '';
       # Build ISOs/SD Card Images
@@ -137,7 +139,7 @@
       dl  = "docker logs -f ";
       dps = ''docker ps --format "table [{{.ID}}] {{.Names}}\t{{.Status}}\t{{.State}}\t{{.Label \"type\"}}"'';
 
-      # bash / system
+      # fish / system
       ls  = "exa --icons -F --group-directories-first --git";
       cp  = "rsync -avr";
       ll  = "exa -lah --icons -F --group-directories-first --git";
@@ -177,6 +179,5 @@
       rebuild-home-remote = "git -C /etc/nixos/git pull && home-manager switch -b backup --flake /etc/nixos/git --max-jobs 0";
       rebuild-all-remote  = "rebuild-host-remote && rebuild-home-remote";
     };
- 
   };
 }
diff --git a/home-manager/small.nix b/home-manager/small.nix
index 36b442f1..e87bcb55 100644
--- a/home-manager/small.nix
+++ b/home-manager/small.nix
@@ -2,6 +2,7 @@
   imports = [ 
     # Common configs
     ./common/software/cli/bash.nix
+    ./common/software/cli/fish.nix
     ./common/software/cli/git.nix
     # ./common/software/cli/nixvim/base.nix
     ./common/software/cli/ssh.nix