diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 6ae9980a..5651fd61 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -5,12 +5,11 @@
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
-     # set GPG_TTY $tty
       set EDITOR vim
+      set ZELLIJ_AUTO_ATTACH true 
+      set ZELLIJ_AUTO_EXIT true
       ssh-add > /dev/null &> /dev/null
-      if [ -z "$DISABLE_TMUX" ] && [ -z "$TMUX" ]; 
-        tmux attach || exec tmux new-session && exit
-      end
+      eval (zellij setup --generate-auto-start fish | string collect)
     '';
     functions = {
       update_secrets = ''