diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix
index 0bbbbbe..17f3f58 100644
--- a/modules/home-manager/shell.nix
+++ b/modules/home-manager/shell.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:
  
 {
   # configure z-shell to use omz with some plugins
@@ -13,7 +13,7 @@
       plugins = [ "git" "ssh-agent" "gpg-agent" ];
     };
     # only display a fancy theme when glyphs are rendered
-    initExtraBeforeCompInit = ''
+    initContent = lib.mkOrder 550 ''
       if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
         ZSH_THEME="gentoo"
       else
diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix
index 723bb6d..00e1716 100644
--- a/modules/home-manager/tmux.nix
+++ b/modules/home-manager/tmux.nix
@@ -40,12 +40,17 @@
       bind J resize-pane -D 5
       bind K resize-pane -U 5
       bind L resize-pane -R 5
+      # Wayland clipboard integration
+      # Copy selection to both clipboard (Ctrl+V / Shift+Insert) and primary (middle-click)
+      bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
+      bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
+      bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
       # Kill commands
       bind q kill-window
       bind Q kill-session
       # Bars
-      set -g status-left "#[fg=black,bg=blue,bold] #S#[fg=blue,bg=black,nobold,noitalics,nounderscore]"
-      set -g status-left "#[fg=black,bg=blue,bold] #S #[fg=blue,bg=black,nobold,noitalics,nounderscore]"
+      set -g status-left-length 24
+      set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]"
       set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H "
       # Windows
       set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"
diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix
index ffd389c..9c17fd5 100644
--- a/modules/nixos/packages.nix
+++ b/modules/nixos/packages.nix
@@ -41,6 +41,7 @@
     unzip
     usbutils
     vim
+    wl-clipboard
     wget
     which
     xz