diff --git a/users/tacocat/programs/default.nix b/users/tacocat/programs/default.nix
index e199fcd..0e25f30 100644
--- a/users/tacocat/programs/default.nix
+++ b/users/tacocat/programs/default.nix
@@ -4,10 +4,10 @@
     ./taskwarrior.nix
     ./firefox.nix
     ./fzf.nix
-    ./tmux.nix
     ./tiny.nix
     ./zoxide.nix
     ./ncmpcpp.nix
+    ./zellij.nix
   ];
 
   programs.eza = {
diff --git a/users/tacocat/programs/zellij.nix b/users/tacocat/programs/zellij.nix
new file mode 100644
index 0000000..0baa012
--- /dev/null
+++ b/users/tacocat/programs/zellij.nix
@@ -0,0 +1,27 @@
+{...}: {
+  programs.zellij = {
+    enable = true;
+    enableFishIntegration = true;
+    settings = {
+      simplified_ui = true;
+      default_shell = "fish";
+      copy_command = "wl-copy";
+      pane_frames = false;
+      default_mode = "locked";
+      theme = "custom";
+      themes.custom = {
+        bg = "#44415a";
+        fg = "#e0def4";
+        red = "#eb6f92";
+        green = "#3e8fb0";
+        blue = "#9ccfd8";
+        yellow = "#f6c177";
+        magenta = "#c4a7e7";
+        orange = "#fe640b";
+        cyan = "#ea9a97";
+        black = "#393552";
+        white = "#e0def4";
+      };
+    };
+  };
+}
diff --git a/users/tacocat/shell/fish.nix b/users/tacocat/shell/fish.nix
index b0a50e7..d0450ab 100644
--- a/users/tacocat/shell/fish.nix
+++ b/users/tacocat/shell/fish.nix
@@ -6,10 +6,6 @@
 
       fish_vi_key_bindings
       set -g fish_cursor_insert line
-
-      if not set -q TMUX
-        tmux attach
-      end
     '';
   };
 }