diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 4ce871a..b906baf 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -45,7 +45,6 @@ bind -r Right resizep -R 5
 bind -r Up resizep -U 5
 bind -r Down resizep -D 5
 
-unbind w; bind w neww -c '#{pane_current_path}'
 unbind \'; bind \' splitw -hc '#{pane_current_path}'
 unbind \-; bind \- splitw -vc '#{pane_current_path}'
 
@@ -78,7 +77,7 @@ run 'tmux source "$XDG_CONFIG_HOME/tmux/themes/${THEME:-midnight}.conf"'
 unbind a; bind a run 'mux ai'
 unbind c; bind c run 'mux code'
 unbind r; bind r run 'mux run'
-unbind t; bind t run 'mux term'
+unbind t; bind t run 'mux shell'
 unbind g; bind g run 'mux git'
 unbind m; bind m run 'mux misc'
 
diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix
index 5994077..2b824db 100644
--- a/hosts/xps15/configuration.nix
+++ b/hosts/xps15/configuration.nix
@@ -141,6 +141,7 @@
 
   nix.settings = {
     auto-optimise-store = true;
+    use-xdg-base-directories = true;
     experimental-features = [
       "nix-command"
       "flakes"
diff --git a/scripts/mux b/scripts/mux
index 3ff5add..d4416b0 100755
--- a/scripts/mux
+++ b/scripts/mux
@@ -156,8 +156,8 @@ run)
   require nvim
   spawn_or_focus run 'nvim -c "lua require([[config.tmux]]).run([[run]])"'
   ;;
-term)
-  spawn_or_focus term
+shell)
+  spawn_or_focus shell
   ;;
 misc)
   spawn_or_focus misc