diff --git a/.gitmodules b/.gitmodules index c00fbbb..0371589 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,10 +23,6 @@ path = config/tmux/plugins/tmux-continuum url = https://github.com/tmux-plugins/tmux-continuum ignore = dirty -[submodule "tmux/tmux-resurrect"] - path = config/tmux/plugins/tmux-resurrect - url = https://github.com/tmux-plugins/tmux-resurrect - ignore = dirty [submodule "tmux/tmux-sensible"] path = config/tmux/plugins/tmux-sensible url = https://github.com/tmux-plugins/tmux-sensible.git diff --git a/add-submodules.sh b/add-submodules.sh index 1a108bd..2e19b34 100755 --- a/add-submodules.sh +++ b/add-submodules.sh @@ -23,8 +23,6 @@ git submodule add --name tmux/tmux-continuum \ -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum git submodule add --name tmux/tmux-mode-indicator \ -f https://github.com/MunifTanjim/tmux-mode-indicator.git config/tmux/plugins/tmux-mode-indicator -git submodule add --name tmux/tmux-resurrect \ - -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect git submodule add --name tmux/tmux-sensible \ -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible git submodule add --name tmux/tmux-sessionist \ @@ -49,6 +47,7 @@ done [ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm [ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus +[ -d "config/tmux/plugins/tmux-resurrect" ] && rm -rf config/tmux/plugins/tmux-resurrect [ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab [ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap [ -d "config/nvim-kickstart" ] && rm -rf config/nvim-kickstart diff --git a/config/tmux/plugins/tmux-resurrect b/config/tmux/plugins/tmux-resurrect deleted file mode 160000 index e87d7d5..0000000 --- a/config/tmux/plugins/tmux-resurrect +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e87d7d592cac97fa38c12395ebec042c154a1844 diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index bd9cea4..d5011a2 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -147,16 +147,12 @@ set -g @tmux_window_name_max_name_len "20" set -g @tmux_window_name_use_tilde "True" set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']" set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']" -set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh', 'antidot', 'direnv']" # Default is [] +set -g @tmux_window_name_ignored_programs "['sqlite3', 'oh-my-posh', 'antidot', 'direnv']" # Default is [] set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local'), ('.+asdf', 'asdf')]" ## https://github.com/tmux-plugins/tmux-continuum # set -g @continuum-restore 'on' -## https://github.com/tmux-plugins/tmux-resurrect -# set -g @resurrect-strategy-nvim 'session' -# set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect' - ## https://github.com/MunifTanjim/tmux-mode-indicator set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7' set -g @mode_indicator_copy_mode_style 'bg=default,fg=yellow' @@ -169,7 +165,6 @@ set -g @mode_indicator_sync_mode_style 'bg=default,fg=red' run-shell ~/.dotfiles/config/tmux/plugins/tmux-sensible/sensible.tmux run-shell ~/.dotfiles/config/tmux/plugins/tmux-window-name/tmux_window_name.tmux -# run-shell ~/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux # run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux # run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmux