diff --git a/flake.nix b/flake.nix
index 87af239..2fada42 100644
--- a/flake.nix
+++ b/flake.nix
@@ -141,7 +141,7 @@
     };
 
     darwinConfigurations."zroux-mac" = nix-darwin.lib.darwinSystem {
-      specialArgs = { inherit inputs; };
+      specialArgs = {inherit inputs;};
       modules = [
         ./modules/cli/darwin.nix
         home-manager.darwinModules.home-manager
@@ -158,7 +158,8 @@
             users.zroux = {
               imports = [
                 ./modules/cli/home.nix
-                  nix-index-database.hmModules.nix-index
+                ./modules/gui/ghostty.nix
+                nix-index-database.hmModules.nix-index
               ];
             };
           };
diff --git a/modules/cli/darwin.nix b/modules/cli/darwin.nix
index b17e2b2..96c25f8 100644
--- a/modules/cli/darwin.nix
+++ b/modules/cli/darwin.nix
@@ -19,7 +19,6 @@
     vim
     tmux
     jq
-    mosh
   ];
 
   programs.zsh.enable = true;
@@ -32,5 +31,4 @@
     };
     info.enable = true;
   };
-
 }
diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix
index b77928f..f31bc08 100644
--- a/modules/cli/zsh/default.nix
+++ b/modules/cli/zsh/default.nix
@@ -15,7 +15,6 @@
       ripgrep
       fzf
       nix-your-shell
-      mosh
       unzip
       sshfs-fuse
       zip
@@ -238,7 +237,7 @@
     initExtraFirst = ''
       # Create a new tmux session (with a random name) and attach.
       if [[ -z "$TMUX" ]]; then
-      	exec tmux new-session -s "$(hexdump -n 4 -v -e '/1 "%02X"' /dev/urandom)"
+      	exec tmux -u new-session -s "$(hexdump -n 4 -v -e '/1 "%02X"' /dev/urandom)"
       fi
     '';
     initExtraBeforeCompInit = builtins.readFile ./comp.zsh;