diff --git a/common/fish/paths.fish b/common/fish/paths.fish index 4c7fa5a..b6b5376 100644 --- a/common/fish/paths.fish +++ b/common/fish/paths.fish @@ -58,7 +58,6 @@ set --export --universal XDG_PICTURES_DIR $NICE_HOME/img set --export --universal XDG_VIDEOS_DIR $NICE_HOME/video set --export --universal XDG_GAMES_DIR $NICE_HOME/games -set --export --universal TMUX_PLUGIN_MANAGER_PATH $XDG_CONFIG_HOME/tmux/plugins/ set --export --universal NOTES_PATH $XDG_DOCUMENTS_DIR/notes set --export --universal USER_LOGS_PATH $XDG_DOCUMENTS_DIR/logs set --export --universal SCROTS_PATH $XDG_PICTURES_DIR/scrots diff --git a/common/fish/vars.fish b/common/fish/vars.fish index 675496b..2b0e249 100644 --- a/common/fish/vars.fish +++ b/common/fish/vars.fish @@ -6,7 +6,8 @@ set --export --universal EXA_COLORS '*=0' set --export --universal ERL_AFLAGS "-kernel shell_history enabled -kernel shell_history_file_bytes 1024000" set --export --universal TERMINAL kitty -set --export --universal BROWSER firefox-nightly +set --export --universal TERMINAL_ARGS '--single-instance' +set --export --universal BROWSER firefox-developer-edition set --export --universal PAGER less set --export --universal LESS "-r" diff --git a/host/layer/personal/tmux-tpm.conf b/host/layer/personal/tmux-tpm.conf index 307b98f..bc7f117 100644 --- a/host/layer/personal/tmux-tpm.conf +++ b/host/layer/personal/tmux-tpm.conf @@ -1,4 +1,4 @@ -bind-key Z "display-message yotpm" +bind-key X "display-message PLUGINSCONFIGURED" set -g @tpm_plugins ' \ tmux-plugins/tpm \ @@ -7,7 +7,10 @@ set -g @tpm_plugins ' \ tmux-plugins/tmux-continuum \ ' -set -g @continuum-restore 'on' -set -g @continuum-boot 'on' +set -g @resurrect-save 'V' +set -g @resurrect-restore 'L' + +# set -g @continuum-restore 'on' +# set -g @continuum-boot 'on' run '~/.tmux/plugins/tpm/tpm' diff --git a/host/layer/personal/tmux.d.conf b/host/layer/personal/tmux.d.conf index 370571c..7e8e35f 100644 --- a/host/layer/personal/tmux.d.conf +++ b/host/layer/personal/tmux.d.conf @@ -1,3 +1,3 @@ -bind-key Z "display-message yo" +bind-key Z "display-message PERSONALLAYER" if-shell -b "test -d $HOME/.tmux/plugins/tpm" "source-file $ENV_PATH/host-layer-personal/tmux-tpm.conf" diff --git a/os/linux/bin/sway-init-tmux b/os/linux/bin/sway-init-tmux new file mode 100755 index 0000000..2539410 --- /dev/null +++ b/os/linux/bin/sway-init-tmux @@ -0,0 +1,5 @@ +#!/usr/bin/env fish +# +tmux new-session -d -s sway +tmux run-shell "$HOME/.tmux/plugins/tmux-resurrect/scripts/restore.sh" +kitty --single-instance fish -C 'tmux attach -t sway' diff --git a/os/linux/sway/config b/os/linux/sway/config index e313a9e..37516e4 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -182,6 +182,8 @@ exec mako exec pipewire exec /usr/lib/kdeconnectd exec gammastep -t 6500:3500 -l 39.0:-94.5 +exec sway-init-tmux +exec $term exec_always 'killall kanshi; kanshi' exec_always notify-send -a "sway" -i ~/.wallpaper "sway configuration loaded"