diff --git a/private_dot_config/private_fish/config.fish b/private_dot_config/private_fish/config.fish
index 9e07bd5..d11b40f 100644
--- a/private_dot_config/private_fish/config.fish
+++ b/private_dot_config/private_fish/config.fish
@@ -74,6 +74,18 @@ if type -q ip
 end
 
 function s
+    # auto-tmux when called as: s <host> <session>
+    if test (count $argv) -eq 2; and not string match -q -- '-*' $argv[1]; and not string match -q -- '-*' $argv[2]
+        set -l host $argv[1]
+        set -l session $argv[2]
+        if test "$TERM" = xterm-kitty
+            kitten ssh $host -t "tmux new-session -A -s $session"
+        else
+            ssh $host -t "tmux new-session -A -s $session"
+        end
+        return
+    end
+
     if test "$TERM" = xterm-kitty
         kitten ssh $argv
     else
@@ -81,14 +93,23 @@ function s
     end
 end
 
-function mosh
+function m
+    # auto-tmux when called as: m <host> <session>
+    if test (count $argv) -eq 2; and not string match -q -- '-*' $argv[1]; and not string match -q -- '-*' $argv[2]
+        set -l host $argv[1]
+        set -l session $argv[2]
+        command mosh -A $host -- env KITTY_MOSH=1 tmux new-session -A -s $session
+        return
+    end
+
     if contains -- -- $argv
-        command mosh $argv
+        command mosh -A $argv
     else
-        command mosh $argv -- env KITTY_MOSH=1 sh -lc 'exec "${SHELL:?}" -l'
+        command mosh -A $argv -- env KITTY_MOSH=1 sh -lc 'exec "${SHELL:?}" -l'
     end
 end
 
+
 function icat
     if test "$TERM_PROGRAM" = "WezTerm"
         wezterm imgcat $argv