Fix setup for macos, fix tmux on startup for shell, add todo for better tmux on startup

This commit is contained in:
Daniel Flanagan 2023-01-17 23:05:23 -06:00
parent 5ee9ab8d5d
commit da0da38bc9
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
4 changed files with 8 additions and 3 deletions

View file

@ -72,6 +72,10 @@ rm -f $ENV_PATH/empty
ln -s $DOTFILES_PATH/common/empty-env $ENV_PATH/empty ln -s $DOTFILES_PATH/common/empty-env $ENV_PATH/empty
# execute the user's shell # execute the user's shell
if test (uname) = Darwin
set ush (dscl . -read /Users/$USER UserShell | awk '{print $2}')
else
set ush (getent passwd (whoami) | cut -d: -f7) set ush (getent passwd (whoami) | cut -d: -f7)
end
echo "Dotfiles Installed! Don't forget to setup environments!" echo "Dotfiles Installed! Don't forget to setup environments!"
exec $ush exec $ush

View file

@ -59,6 +59,6 @@ end
# eval (zellij setup --generate-auto-start fish | string collect) # eval (zellij setup --generate-auto-start fish | string collect)
# end # end
if status is-interactive; and not set -q TMUX; and not status --is-login; and not string match '/dev/tty*' (tty) if status is-interactive; and status --is-login; and not set -q TMUX; and not string match '/dev/tty*' (tty)
tmux tmux
end end

View file

@ -34,6 +34,5 @@ D = "kill_to_line_end"
space = { q = ":reflow 80", Q = ":reflow 120" } space = { q = ":reflow 80", Q = ":reflow 120" }
[keys.select] [keys.select]
"^" = "goto_line_start"
space = { q = ":reflow 80", Q = ":reflow 120" } space = { q = ":reflow 80", Q = ":reflow 120" }
"L" = "repeat_last_motion" "L" = "repeat_last_motion"

View file

@ -182,6 +182,8 @@ exec mako
# exec gammastep -t 6500:3500 -l 39.0:-94.5 # exec gammastep -t 6500:3500 -l 39.0:-94.5
# exec /usr/lib/kdeconnectd # exec /usr/lib/kdeconnectd
# exec sway-init-tmux # exec sway-init-tmux
# TODO: initial startup window attaches to a known, default tmux session (same for SSH?)
# new kitty windows setup a fresh tmux
exec exec kitty --single-instance fish -i exec exec kitty --single-instance fish -i
exec tmux start-server exec tmux start-server