diff --git a/users/tacocat/programs/default.nix b/users/tacocat/programs/default.nix
index 5fa8557..42609b2 100644
--- a/users/tacocat/programs/default.nix
+++ b/users/tacocat/programs/default.nix
@@ -6,6 +6,7 @@
     ./firefox.nix
     ./vscode.nix
     ./fzf.nix
+    ./tmux.nix
     # ./thunderbird.nix
   ];
 
diff --git a/users/tacocat/programs/tmux.nix b/users/tacocat/programs/tmux.nix
new file mode 100644
index 0000000..c395c5b
--- /dev/null
+++ b/users/tacocat/programs/tmux.nix
@@ -0,0 +1,18 @@
+{
+  pkgs,
+  ...
+}: {
+  programs.tmux = {
+    enable = true;
+    escapeTime = 0;
+    clock24 = true;
+    mouse = true;
+    newSession = true;
+    shell = "${pkgs.fish}/bin/fish";
+    sensibleOnTop = true;
+    terminal = "screen-256color";
+    # extraConfig = ''
+    #   set -g default-terminal "screen-256color"
+    # '';
+  };
+}
diff --git a/users/tacocat/shell/fish.nix b/users/tacocat/shell/fish.nix
index 1ad4b26..2257ac0 100644
--- a/users/tacocat/shell/fish.nix
+++ b/users/tacocat/shell/fish.nix
@@ -6,6 +6,10 @@
 
       fish_vi_key_bindings
       set -g fish_cursor_insert line
+
+      if not set -q TMUX
+        tmux attach
+      end
     '';
     plugins = [
       {