diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix
index 9d0018d6..6f47472f 100644
--- a/home-manager/common/desktops/hyprland/default.nix
+++ b/home-manager/common/desktops/hyprland/default.nix
@@ -14,6 +14,7 @@
 
     # Disable tmux on Hyprland
     programs.bash.sessionVariables = { DISABLE_TMUX = "true"; };     
+    programs.fish.sessionVariables = { DISABLE_TMUX = "true"; };     
       
     stylix  = {
       image = lib.mkForce /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 7c7cdc21..c1ad6034 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -9,7 +9,10 @@
       ssh-add > /dev/null &> /dev/null
       if set -q ZELLIJ 
       else 
-        exec zellij attach -c "MAIN" && exit
+        if set -q DISABLE_TMUX
+        else
+          exec zellij attach -c "MAIN" && exit
+        end
       end
       '';
       
diff --git a/home-manager/common/software/cli/zellij.nix b/home-manager/common/software/cli/zellij.nix
index b74b20ae..dc93155b 100644
--- a/home-manager/common/software/cli/zellij.nix
+++ b/home-manager/common/software/cli/zellij.nix
@@ -4,6 +4,7 @@
     # enableBashIntegration = true;
     # enableFishIntegration = true;
     settings = {
+      session_serialization = false;
       mirror_session = true;
       simplified_ui = true;
       ui.pane_frames.rounded_corners = true;
diff --git a/home-manager/small.nix b/home-manager/small.nix
index e87bcb55..80f5fd9b 100644
--- a/home-manager/small.nix
+++ b/home-manager/small.nix
@@ -1,14 +1,15 @@
 { lib, inputs, hostname, username, desktop, hmStateVersion, ... }: {
   imports = [ 
     # Common configs
-    ./common/software/cli/bash.nix
+    # ./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
     ./common/software/cli/btop.nix
     ./common/software/cli/starship.nix
-    ./common/software/cli/tmux.nix
+    # ./common/software/cli/tmux.nix
+    ./common/software/cli/zellij.nix
     ./common/software/cli/atuin.nix
       
     # User configs