diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index f0a240c..9386a69 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -48,17 +48,18 @@ bind -r Down resizep -D 5
 unbind \'; bind \' splitw -hc '#{pane_current_path}'
 unbind \-; bind \- splitw -vc '#{pane_current_path}'
 
-unbind y; bind y if -F '#{pane_in_mode}' 'send -X cancel' 'copy-mode'
-unbind /; bind / if -F '#{pane_in_mode}' { send -X cancel } { copy-mode ; command-prompt -p '/' { send -X search-forward -- '%%' } }
-unbind ?; bind ? if -F '#{pane_in_mode}' { send -X cancel } { copy-mode ; command-prompt -p '?' { send -X search-backward -- '%%' } }
+unbind y; bind y if -F '#{pane_in_mode}' 'send-keys -X cancel' 'copy-mode'
+unbind /; bind / if -F '#{pane_in_mode}' { send-keys -X cancel } { copy-mode ; command-prompt -p '/' { send -X search-forward -- '%%' } }
+unbind ?; bind ? if -F '#{pane_in_mode}' { send-keys -X cancel } { copy-mode ; command-prompt -p '?' { send -X search-backward -- '%%' } }
 
-bind -T copy-mode-vi v send -X begin-selection
-bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'test -n "$WAYLAND_DISPLAY" && wl-copy || xclip -in -sel c'
+bind -T copy-mode-vi v send-keys -X begin-selection
+bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'test -n "$WAYLAND_DISPLAY" && wl-copy || xclip -in -sel c'
 
 unbind b; bind b set status\; refresh -S
-unbind m; bind m set -g mouse\; run 'mux bar'\; refresh -S
+unbind m; bind m set -g mouse\; run-shell 'mux bar'\; refresh -S
 
 unbind ^; bind ^ last-window
+unbind w; bind w kill-pane;
 
 unbind e; bind e neww -n 'tmux.conf' "sh -c 'nvim $XDG_CONFIG_HOME/nix/config/tmux/tmux.conf; tmux source $XDG_CONFIG_HOME/tmux/tmux.conf'"
 
diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix
index 6313de2..a1531d8 100644
--- a/hosts/xps15/configuration.nix
+++ b/hosts/xps15/configuration.nix
@@ -108,7 +108,7 @@ in
     enable = true;
     vt = 1;
     settings.default_session = {
-      command = "${tuigreet} --time --asterisks --cmd '${lib.getExe config.users.users.barrett.shell} --login' --theme 'border=dark-gray;text=white;prompt=blue;time=dark-gray;action=dark-gray;button=blue;container=black;input=white'";
+      command = "${tuigreet} --time --asterisks --cmd 'sh -c \"exec $(getent passwd $(id -un) | cut -d: -f7) -l\"' --theme 'border=dark-gray;text=white;prompt=blue;time=dark-gray;action=dark-gray;button=blue;container=black;input=white'";
       user = "greeter";
     };
   };