diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix
index 389aae3..630be1d 100644
--- a/home-manager/modules/zsh.nix
+++ b/home-manager/modules/zsh.nix
@@ -31,10 +31,15 @@
     history.path = "${config.xdg.dataHome}/zsh/history";
 
     initExtra = ''
-      # Start Tmux automatically if not already running
+      # Start Tmux automatically if not already running. No Tmux in TTY
       if [ -z "$TMUX" ] && [ -n "$DISPLAY" ]; then
         tmux attach-session -t default || tmux new-session -s default
       fi
+
+      # Start UWSM
+      if uwsm check may-start > /dev/null && uwsm select; then
+        exec systemd-cat -t uwsm_start uwsm start default
+      fi
     '';
   };
 }
diff --git a/nixos/modules/hyprland.nix b/nixos/modules/hyprland.nix
index 797c49d..07e9c5c 100644
--- a/nixos/modules/hyprland.nix
+++ b/nixos/modules/hyprland.nix
@@ -1,6 +1,8 @@
 {
+  programs.uwsm.enable = true;
   programs.hyprland = {
     enable = true;
+    withUWSM = true;
   };
 
   security.pam.services.hyprlock = {};