From b70fbc7fead57d5b80daf94c5ef539f7a0d3babd Mon Sep 17 00:00:00 2001 From: Karl Mutch Date: Fri, 3 Dec 2021 11:45:02 -0800 Subject: [PATCH] Windows WSL changes --- config/sublime-text-3/Packages/GitGutter | 2 +- diff-so-fancy | 2 +- dotbot | 2 +- fzf | 2 +- oh-my-zsh | 2 +- oh-my-zsh-custom/plugins/zsh-autosuggestions | 2 +- .../plugins/zsh-syntax-highlighting | 2 +- oh-my-zsh-custom/themes/powerlevel10k | 2 +- tmux.conf | 56 ++++++++++--------- tmux/plugins/tpm | 2 +- vim/bundle/Dockerfile.vim | 2 +- vim/bundle/Recover.vim | 2 +- vim/bundle/bufexplorer | 2 +- vim/bundle/ctrlp.vim | 2 +- vim/bundle/nerdtree | 2 +- vim/bundle/nerdtree-git-plugin | 2 +- vim/bundle/rainbow | 2 +- vim/bundle/splitjoin.vim | 2 +- vim/bundle/supertab | 2 +- vim/bundle/syntastic | 2 +- vim/bundle/syntax | 2 +- vim/bundle/tagbar | 2 +- vim/bundle/unicode.vim | 2 +- vim/bundle/vim-airline | 2 +- vim/bundle/vim-airline-themes | 2 +- vim/bundle/vim-clang-format | 2 +- vim/bundle/vim-colortemplate | 2 +- vim/bundle/vim-devicons | 2 +- vim/bundle/vim-fugitive | 2 +- vim/bundle/vim-gitgutter | 2 +- vim/bundle/vim-go | 2 +- vim/bundle/vim-gtfo | 2 +- vim/bundle/vim-instant-markdown | 2 +- vim/bundle/vim-lastplace | 2 +- vim/bundle/vim-startify | 2 +- vim/bundle/vim-tmux-navigator | 2 +- vim/bundle/vim-vinegar | 2 +- zsh-completions | 2 +- zsh.rc/90-term | 8 ++- 39 files changed, 72 insertions(+), 66 deletions(-) diff --git a/config/sublime-text-3/Packages/GitGutter b/config/sublime-text-3/Packages/GitGutter index 1badb94..832d031 160000 --- a/config/sublime-text-3/Packages/GitGutter +++ b/config/sublime-text-3/Packages/GitGutter @@ -1 +1 @@ -Subproject commit 1badb94bd1827f4b3f96fd90c26bf1b348783ff9 +Subproject commit 832d03168121b3ad729b2910f51fedec20c48bac diff --git a/diff-so-fancy b/diff-so-fancy index c3205c8..e5bddde 160000 --- a/diff-so-fancy +++ b/diff-so-fancy @@ -1 +1 @@ -Subproject commit c3205c8a2633a311110fa8609f97b22388298ac8 +Subproject commit e5bdddeeaa4f6f5dcf9d788f1694b76994043359 diff --git a/dotbot b/dotbot index ac5793c..eb7f3fb 160000 --- a/dotbot +++ b/dotbot @@ -1 +1 @@ -Subproject commit ac5793ceb58863d23427d21597634d3dcf66f9ac +Subproject commit eb7f3fb7b1dd7966e4d105e9210787b7d96e58dd diff --git a/fzf b/fzf index 20b4e69..b82c169 160000 --- a/fzf +++ b/fzf @@ -1 +1 @@ -Subproject commit 20b4e6953ec439f52e9bdcc06ac6ee5bb590d39d +Subproject commit b82c1693c097a53e66ed27dd94d1d0bd9d974d2e diff --git a/oh-my-zsh b/oh-my-zsh index 1c1d74c..93ad3a8 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 1c1d74c5ec49e5ab7e2d664e557c61745d1995e6 +Subproject commit 93ad3a88214b95f571e03c21f7d9bd76f9110938 diff --git a/oh-my-zsh-custom/plugins/zsh-autosuggestions b/oh-my-zsh-custom/plugins/zsh-autosuggestions index a411ef3..ae315de 160000 --- a/oh-my-zsh-custom/plugins/zsh-autosuggestions +++ b/oh-my-zsh-custom/plugins/zsh-autosuggestions @@ -1 +1 @@ -Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8 +Subproject commit ae315ded4dba10685dbbafbfa2ff3c1aefeb490d diff --git a/oh-my-zsh-custom/plugins/zsh-syntax-highlighting b/oh-my-zsh-custom/plugins/zsh-syntax-highlighting index c7caf57..e851724 160000 --- a/oh-my-zsh-custom/plugins/zsh-syntax-highlighting +++ b/oh-my-zsh-custom/plugins/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit c7caf57ca805abd54f11f756fda6395dd4187f8a +Subproject commit e8517244f7d2ae4f9d979faf94608d6e4a74a73e diff --git a/oh-my-zsh-custom/themes/powerlevel10k b/oh-my-zsh-custom/themes/powerlevel10k index a9f208c..6d545d5 160000 --- a/oh-my-zsh-custom/themes/powerlevel10k +++ b/oh-my-zsh-custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit a9f208c8fc509b9c591169dd9758c48ad4325f76 +Subproject commit 6d545d5dd06bd85bbfda5cc8fd7938aee4b79d55 diff --git a/tmux.conf b/tmux.conf index 73e7d47..557da4b 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,5 +1,8 @@ # ~/.tmux.conf +run-shell 'tmux setenv -g TMUX_VERSION $(tmux -V | \ + sed -En "s/^tmux[^0-9]*([.0-9]+).*/\1/p")' + ########################################################################### # Change prefix from default (C-b) to C-g # C-g doesn't interfere with emacs-style editing keys @@ -18,12 +21,17 @@ bind C-g send-key C-g # Default termtype. If the rcfile sets $TERM, that overrides this value. #set -g default-terminal screen-256color #set -g default-terminal rxvt-unicode-256color -if "[[ ${TERM} == xterm-256color || ${TERM} == xterm ]]" 'set -g default-terminal xterm-256color' -if "[[ ${TERM} =~ termite || ${TERM} == xterm-termite ]]" 'set -g default-terminal xterm-256color' -if "[[ ${TERM} =~ termite || ${TERM} == xterm-termite ]]" 'set -ga terminal-overrides ",xterm-termite:Tc"' +#if "[[ ${TERM} == xterm-256color || ${TERM} == xterm ]]" 'set -g default-terminal xterm-256color' +#if "[[ ${TERM} =~ termite || ${TERM} == xterm-termite ]]" 'set -g default-terminal xterm-256color' +#if "[[ ${TERM} =~ termite || ${TERM} == xterm-termite ]]" 'set -ga terminal-overrides ",xterm-termite:Tc"' + +#set -g default-terminal "tmux-256color" +#set -ga terminal-overrides ",xterm-termite:Tc" -set -g default-terminal "tmux-256color" -set -ga terminal-overrides ",xterm-termite:Tc" + +# UTF8 is autodetected in 2.2 onwards, but errors if explicitly set +if-shell -b '[ "$(echo "$TMUX_VERSION < 2.2" | bc)" = 1 ]' \ + "set -g utf8 on; set -g status-utf8 on; set -g mouse-utf8 on" ## update the TERM variable of terminal emulator when creating a new session or attaching a existing session set -g update-environment 'DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM' @@ -140,29 +148,13 @@ bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L" bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" -bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l" +bind -n C-\\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l" ########################################################################### # Mouse mode set -g mouse on -# Toggle mouse on -bind m \ - set -g mode-mouse on \;\ - set -g mouse-resize-pane on \;\ - set -g mouse-select-pane on \;\ - set -g mouse-select-window on \;\ - display 'Mouse: ON' - -# Toggle mouse off -bind M \ - set -g mode-mouse off \;\ - set -g mouse-resize-pane off \;\ - set -g mouse-select-pane off \;\ - set -g mouse-select-window off \;\ - display 'Mouse: OFF' - set -g default-shell /bin/zsh set -g default-command /bin/zsh @@ -205,11 +197,21 @@ set -g status-left "#[fg=black,bg=colour27] #S #[fg=colour27,bg=colour234,nobold #set -g status-right "  #(/bin/bash $HOME/.tmux/kube.tmux 250 red cyan) #[fg=colour237,bg=colour234,nobold,nounderscore,noitalics]#[fg=colour144,bg=colour237] ⇅ #{cpu} ☰ #{ram} #{online_status} #{battery_icon}  %d.%m.%Y  %H:%M #[fg=colour27,bg=colour237,nobold,nounderscore,noitalics]#[fg=black,bg=colour27] #h " set -g status-right "  #[fg=colour237,bg=colour234,nobold,nounderscore,noitalics]#[fg=colour144,bg=colour237] ⇅ #{cpu} ☰ #{ram} #{online_status} #{battery_icon}  %d.%m.%Y  %H:%M #[fg=colour27,bg=colour237,nobold,nounderscore,noitalics]#[fg=black,bg=colour27] #h " -set-window-option -g window-status-fg colour249 -set-window-option -g window-status-activity-attr none -set-window-option -g window-status-bell-attr none -set-window-option -g window-status-activity-fg yellow -set-window-option -g window-status-bell-fg red +if-shell -b '[ "$(echo "$TMUX_VERSION < 2.1" | bc)" = 1 ]' " \ + set-window-option -g window-status-fg colour249; \ + set-window-option -g window-status-activity-attr none; \ + set-window-option -g window-status-bell-attr none; \ + set-window-option -g window-status-activity-fg yellow; \ + set-window-option -g window-status-bell-fg red" + + +if-shell -b '[ "$(echo "$TMUX_VERSION >= 2.9" | bc)" = 1 ]' \ + "set -g message-style fg=red,bg=black; \ + set -g message-style bright; \ + set -g window-status-style fg=colour249,bg=default; \ + set -g window-status-current-style fg=default,bg=cyan,bold; \ + set -g window-status-bell-style fg=red,bg=black; \ + set -g window-status-activity-style fg=yellow,bg=default" setw -g window-status-format "#[bg=colour239,fg=colour234]#[bg=colour239,fg=colour111] #I#[bg=colour239,fg=colour111] #T #[fg=colour239,bg=colour234]" #setw -g window-status-format "#[bg=blue,fg=black]#[bg=blue,fg=black] #I#[bg=blue,fg=black] #15T #[fg=blue,bg=black]" diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm index 693e5a2..29c871e 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b +Subproject commit 29c871e8105dee0c4994ac97682d26bf9f9a4371 diff --git a/vim/bundle/Dockerfile.vim b/vim/bundle/Dockerfile.vim index 2a31e6b..2386923 160000 --- a/vim/bundle/Dockerfile.vim +++ b/vim/bundle/Dockerfile.vim @@ -1 +1 @@ -Subproject commit 2a31e6bcea5977209c05c728c4253d82fd873c82 +Subproject commit 2386923a8c30d0c4f06f27eef2a025752423ea86 diff --git a/vim/bundle/Recover.vim b/vim/bundle/Recover.vim index 5b496fb..f019bb0 160000 --- a/vim/bundle/Recover.vim +++ b/vim/bundle/Recover.vim @@ -1 +1 @@ -Subproject commit 5b496fbf6d2b989d93f1748340d1a43c6d80766f +Subproject commit f019bb0bc15093da74ef0bd1a9356dedf13ba885 diff --git a/vim/bundle/bufexplorer b/vim/bundle/bufexplorer index 99557c4..29258f5 160000 --- a/vim/bundle/bufexplorer +++ b/vim/bundle/bufexplorer @@ -1 +1 @@ -Subproject commit 99557c451ff6ed3bbb9b9f6215ad57e919740635 +Subproject commit 29258f58357acc10c672585a9efe8913d756734d diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim index fff7498..971c4d4 160000 --- a/vim/bundle/ctrlp.vim +++ b/vim/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit fff74986c5439015cf5cc69cf2c6390a40fdd79f +Subproject commit 971c4d41880b72dbbf1620b3ad91418a6a6f6b9c diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree index eed488b..f63fb69 160000 --- a/vim/bundle/nerdtree +++ b/vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424 +Subproject commit f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2 diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin index e1fe727..5fa0e3e 160000 --- a/vim/bundle/nerdtree-git-plugin +++ b/vim/bundle/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit e1fe727127a813095854a5b063c15e955a77eafb +Subproject commit 5fa0e3e1487b17f8a23fc2674ebde5f55ce6a816 diff --git a/vim/bundle/rainbow b/vim/bundle/rainbow index c18071e..4d15633 160000 --- a/vim/bundle/rainbow +++ b/vim/bundle/rainbow @@ -1 +1 @@ -Subproject commit c18071e5c7790928b763c2e88c487dfc93d84a15 +Subproject commit 4d15633cdaf61602e1d9fd216a77fc02e0881b2d diff --git a/vim/bundle/splitjoin.vim b/vim/bundle/splitjoin.vim index 0f45bfd..f0d785f 160000 --- a/vim/bundle/splitjoin.vim +++ b/vim/bundle/splitjoin.vim @@ -1 +1 @@ -Subproject commit 0f45bfd7d6a8acb7d6ac126001a27190851bf3f5 +Subproject commit f0d785f7607be60c282b5f5a5d32a2e51560c07c diff --git a/vim/bundle/supertab b/vim/bundle/supertab index f0093ae..d80e8e2 160000 --- a/vim/bundle/supertab +++ b/vim/bundle/supertab @@ -1 +1 @@ -Subproject commit f0093ae12a9115498f887199809a6114659fc858 +Subproject commit d80e8e2c1fa08607fa34c0ca5f1b66d8a906c5ef diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index 2c4b33f..d97a664 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 2c4b33f6e6679fb5f3824d9cd38d4813c71a19a3 +Subproject commit d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e diff --git a/vim/bundle/syntax b/vim/bundle/syntax index 4b7314a..27e0ffc 160000 --- a/vim/bundle/syntax +++ b/vim/bundle/syntax @@ -1 +1 @@ -Subproject commit 4b7314a497ea2dd0a6911ccb94ce83b2d8684617 +Subproject commit 27e0ffc215b81fa5aa87eca396acd4421d36c060 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar index dd2f46a..51ff7a0 160000 --- a/vim/bundle/tagbar +++ b/vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit dd2f46af80d614e3305847845c2a4a4b7447017c +Subproject commit 51ff7a05404e2f5c83799dd6c38134ed4aaca85c diff --git a/vim/bundle/unicode.vim b/vim/bundle/unicode.vim index 664d7b2..afb8db4 160000 --- a/vim/bundle/unicode.vim +++ b/vim/bundle/unicode.vim @@ -1 +1 @@ -Subproject commit 664d7b2e5cedf36ea3a85ad7e8e28e43c16f025b +Subproject commit afb8db4f81580771c39967e89bc5772e72b9018e diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline index 841a355..a262ec6 160000 --- a/vim/bundle/vim-airline +++ b/vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 841a3551965e729e9f1ccd1aca758bdc84af2abf +Subproject commit a262ec6ce4e1c7d36e5f4a9274948d9da09c71f5 diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes index 97cf3e6..fa808d7 160000 --- a/vim/bundle/vim-airline-themes +++ b/vim/bundle/vim-airline-themes @@ -1 +1 @@ -Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 +Subproject commit fa808d74e0aacf131337b58f01ee45fd3d3588af diff --git a/vim/bundle/vim-clang-format b/vim/bundle/vim-clang-format index b8ca314..95593b6 160000 --- a/vim/bundle/vim-clang-format +++ b/vim/bundle/vim-clang-format @@ -1 +1 @@ -Subproject commit b8ca314c9d60add2b6d68fc857c6a528cc47a029 +Subproject commit 95593b67723f23979cd7344ecfd049f2f917830f diff --git a/vim/bundle/vim-colortemplate b/vim/bundle/vim-colortemplate index 61fde52..03331ec 160000 --- a/vim/bundle/vim-colortemplate +++ b/vim/bundle/vim-colortemplate @@ -1 +1 @@ -Subproject commit 61fde5296f29b61dfd05bbde0d841b751c961e74 +Subproject commit 03331ec03ea6d9d6b4ed10d4da73a2fa3f7c896b diff --git a/vim/bundle/vim-devicons b/vim/bundle/vim-devicons index d16475c..4d14cb8 160000 --- a/vim/bundle/vim-devicons +++ b/vim/bundle/vim-devicons @@ -1 +1 @@ -Subproject commit d16475cbd7d50664e3d9261951cd4415967c5c41 +Subproject commit 4d14cb82cf7381c2f8eca284d1a757faaa73b159 diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive index 5a24c25..9cba97f 160000 --- a/vim/bundle/vim-fugitive +++ b/vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 5a24c2527584e4e61a706ad7ecb3514ac7031307 +Subproject commit 9cba97f4db4e0af4275f802c2de977f553d26ec6 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter index 256702d..1283ec1 160000 --- a/vim/bundle/vim-gitgutter +++ b/vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit 256702dd1432894b3607d3de6cd660863b331818 +Subproject commit 1283ec1670d1f4fce37213c5d66924088b2e730c diff --git a/vim/bundle/vim-go b/vim/bundle/vim-go index a319aaf..755b498 160000 --- a/vim/bundle/vim-go +++ b/vim/bundle/vim-go @@ -1 +1 @@ -Subproject commit a319aaf6bf652dadb197807e4629ff5b1750a17b +Subproject commit 755b498c7604e7aee4d001d2a78c2d1e079eb8d5 diff --git a/vim/bundle/vim-gtfo b/vim/bundle/vim-gtfo index 7c7a495..d85e7a2 160000 --- a/vim/bundle/vim-gtfo +++ b/vim/bundle/vim-gtfo @@ -1 +1 @@ -Subproject commit 7c7a495210a82b93e39bda72c6e4c59642dc4b07 +Subproject commit d85e7a2f7e017c54bc5467a3946ca5065d17113d diff --git a/vim/bundle/vim-instant-markdown b/vim/bundle/vim-instant-markdown index ed9162a..eb52cb6 160000 --- a/vim/bundle/vim-instant-markdown +++ b/vim/bundle/vim-instant-markdown @@ -1 +1 @@ -Subproject commit ed9162ac74e11cf1608da80e407d0c52fa5a93f3 +Subproject commit eb52cb6d651023c6507033d2f87715addbd55aab diff --git a/vim/bundle/vim-lastplace b/vim/bundle/vim-lastplace index d522829..48ba343 160000 --- a/vim/bundle/vim-lastplace +++ b/vim/bundle/vim-lastplace @@ -1 +1 @@ -Subproject commit d522829d810f3254ca09da368a896c962d4a3d61 +Subproject commit 48ba343c8c1ca3039224727096aae214f51327d1 diff --git a/vim/bundle/vim-startify b/vim/bundle/vim-startify index 81e36c3..f2fc118 160000 --- a/vim/bundle/vim-startify +++ b/vim/bundle/vim-startify @@ -1 +1 @@ -Subproject commit 81e36c352a8deea54df5ec1e2f4348685569bed2 +Subproject commit f2fc11844b234479d37bef37faa7ceb2aade788b diff --git a/vim/bundle/vim-tmux-navigator b/vim/bundle/vim-tmux-navigator index 9ca5bfe..6a1e58c 160000 --- a/vim/bundle/vim-tmux-navigator +++ b/vim/bundle/vim-tmux-navigator @@ -1 +1 @@ -Subproject commit 9ca5bfe5bd274051b5dd796cc150348afc993b80 +Subproject commit 6a1e58c3ca3bc7acca36c90521b3dfae83b2a602 diff --git a/vim/bundle/vim-vinegar b/vim/bundle/vim-vinegar index 43576e8..5f48edf 160000 --- a/vim/bundle/vim-vinegar +++ b/vim/bundle/vim-vinegar @@ -1 +1 @@ -Subproject commit 43576e84d3034bccb1216f39f51ed36d945d7b96 +Subproject commit 5f48edf4dcc130ae4a658541c0d6f72a558bc70d diff --git a/zsh-completions b/zsh-completions index 536bd1d..aa98bc5 160000 --- a/zsh-completions +++ b/zsh-completions @@ -1 +1 @@ -Subproject commit 536bd1d3d4480e99c2d0532f488eb547d073a66d +Subproject commit aa98bc593fee3fbdaf1acedc42a142f3c4134079 diff --git a/zsh.rc/90-term b/zsh.rc/90-term index 03ee1e5..646004c 100644 --- a/zsh.rc/90-term +++ b/zsh.rc/90-term @@ -8,9 +8,13 @@ then fi fi -if [[ "$UbuntuWindows" == "1" || "$Linux" == "1" || "$UbuntuLinux" == "1" ]] +if [[ "$Name" == "Razer" ]] then - export TERM=xterm-termite +else + if [[ "$UbuntuWindows" == "1" || "$Linux" == "1" || "$UbuntuLinux" == "1" ]] + then + export TERM=xterm-termite + fi fi CPU=$(uname -m)