Windows WSL changes

karlmutch · Dec 3, 2021 · b70fbc7 · b70fbc7
1 parent 9b7320b
commit b70fbc7
Show file tree

Hide file tree

Showing 39 changed files with 72 additions and 66 deletions.
diff --git a/config/sublime-text-3/Packages/GitGutter b/config/sublime-text-3/Packages/GitGutter
diff --git a/diff-so-fancy b/diff-so-fancy
diff --git a/dotbot b/dotbot
diff --git a/fzf b/fzf
diff --git a/oh-my-zsh b/oh-my-zsh
diff --git a/oh-my-zsh-custom/plugins/zsh-autosuggestions b/oh-my-zsh-custom/plugins/zsh-autosuggestions
diff --git a/oh-my-zsh-custom/plugins/zsh-syntax-highlighting b/oh-my-zsh-custom/plugins/zsh-syntax-highlighting
diff --git a/oh-my-zsh-custom/themes/powerlevel10k b/oh-my-zsh-custom/themes/powerlevel10k
diff --git 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
diff --git a/vim/bundle/Dockerfile.vim b/vim/bundle/Dockerfile.vim
diff --git a/vim/bundle/Recover.vim b/vim/bundle/Recover.vim
diff --git a/vim/bundle/bufexplorer b/vim/bundle/bufexplorer
diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin
diff --git a/vim/bundle/rainbow b/vim/bundle/rainbow
diff --git a/vim/bundle/splitjoin.vim b/vim/bundle/splitjoin.vim
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
diff --git a/vim/bundle/syntax b/vim/bundle/syntax
diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar
diff --git a/vim/bundle/unicode.vim b/vim/bundle/unicode.vim
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes
diff --git a/vim/bundle/vim-clang-format b/vim/bundle/vim-clang-format
diff --git a/vim/bundle/vim-colortemplate b/vim/bundle/vim-colortemplate
diff --git a/vim/bundle/vim-devicons b/vim/bundle/vim-devicons
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
diff --git a/vim/bundle/vim-go b/vim/bundle/vim-go
diff --git a/vim/bundle/vim-gtfo b/vim/bundle/vim-gtfo
diff --git a/vim/bundle/vim-instant-markdown b/vim/bundle/vim-instant-markdown
diff --git a/vim/bundle/vim-lastplace b/vim/bundle/vim-lastplace
diff --git a/vim/bundle/vim-startify b/vim/bundle/vim-startify
diff --git a/vim/bundle/vim-tmux-navigator b/vim/bundle/vim-tmux-navigator
diff --git a/vim/bundle/vim-vinegar b/vim/bundle/vim-vinegar
diff --git a/zsh-completions b/zsh-completions
diff --git 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)
+2 −1		GitGutter.sublime-settings
+2 −1		Preferences.sublime-settings-hints
+1 −1		README.md
+1 −1		VERSION
+5 −1		dependencies.json
+12 −12		docs/install.md
+0 −4		messages.json
+28 −0		messages/1.11.3.txt
+0 −5		messages/1.11.4.txt
+0 −7		messages/1.11.5.txt
+0 −7		messages/1.11.6.txt
+0 −34		messages/1.11.7.txt
+10 −12		modules/annotation.py
+1 −1		modules/blame.py
+3 −4		modules/compare.py
+0 −4		modules/events.py
+4 −7		modules/handler.py
+1 −16		modules/temp.py
+5 −4		.circleci/config.yml
+3 −6		.gitmodules
+4 −5		.travis.yml
+1 −3		README.md
+4 −2		appveyor.yml
+78 −218		diff-so-fancy
+11 −6		hacking-and-testing.md
+6 −10		lib/DiffHighlight.pm
+2 −12		package-lock.json
+3 −3		package.json
+0 −1		test/bats
+11 −9		test/bugs.bats
+6 −6		test/diff-so-fancy.bats
+0 −252		test/git_ansi_color.pl
+1 −1		test/test_helper/bats-assert
+1 −1		test/test_helper/bats-support
+0 −4		third_party/ansi-reveal/ansi-reveal.pl
+99 −312		third_party/build_fatpack/diff-so-fancy
+0 −224		third_party/cli_bench/cli_bench.pl
+9 −2		update-deps.sh
+1 −1		.github/workflows/build.yml
+0 −49		CHANGELOG.md
+1 −1		LICENSE.md
+8 −21		README.md
+1 −1		dotbot/__init__.py
+1 −4		dotbot/cli.py
+2 −15		dotbot/dispatcher.py
+15 −40		dotbot/plugins/link.py
+0 −1		test/.gitignore
+27 −51		test/README.md
+2 −6		test/Vagrantfile
+6 −14		test/driver-lib.bash
+0 −18		test/test-lib.bash
+0 −32		test/tests/exit-on-failure.bash
+0 −106		test/tests/link-glob-patterns.bash
+0 −46		test/tests/link-glob-recursive.bash
+0 −23		test/tests/link-prefix.bash
+0 −1		.github/FUNDING.yml
+1 −1		.github/ISSUE_TEMPLATE.md
+0 −6		.github/dependabot.yml
+0 −1		.github/workflows/codeql-analysis.yml
+1 −2		.github/workflows/linux.yml
+1 −2		.github/workflows/macos.yml
+6 −41		.goreleaser.yml
+0 −565		ADVANCED.md
+2 −114		CHANGELOG.md
+1 −11		Makefile
+18 −52		README-VIM.md
+8 −12		README.md
+2 −11		bin/fzf-tmux
+16 −62		doc/fzf.txt
+8 −10		go.mod
+27 −21		go.sum
+3 −3		install
+1 −1		install.ps1
+2 −2		main.go
+1 −1		man/man1/fzf-tmux.1
+73 −120		man/man1/fzf.1
+49 −106		plugin/fzf.vim
+12 −12		shell/completion.bash
+4 −4		shell/key-bindings.bash
+3 −14		shell/key-bindings.fish
+1 −1		shell/key-bindings.zsh
+7 −7		src/algo/algo.go
+11 −11		src/algo/algo_test.go
+75 −188		src/ansi.go
+2 −242		src/ansi_test.go
+0 −1		src/core.go
+36 −163		src/options.go
+4 −4		src/options_test.go
+1 −1		src/reader_test.go
+321 −467		src/terminal.go
+37 −536		src/terminal_test.go
+0 −5		src/terminal_unix.go
+0 −26		src/terminal_windows.go
+25 −42		src/tui/light.go
+6 −6		src/tui/light_unix.go
+2 −7		src/tui/light_windows.go
+55 −122		src/tui/tcell.go
+0 −392		src/tui/tcell_test.go
+0 −16		src/tui/ttyname_unix.go
+0 −7		src/tui/ttyname_windows.go
+14 −28		src/util/util.go
+7 −41		src/util/util_windows.go
+0 −175		test/test_go.rb
+3 −3		uninstall
+1 −2		.github/workflows/test.yml
+1 −1		HACKING.md
+2 −2		README.md
+14 −16		docs/highlighters.md
+2 −7		highlighters/main/main-highlighter.zsh
+1 −1		highlighters/main/test-data/opt-shwordsplit1.zsh
+0 −38		highlighters/main/test-data/parameter-expansion-shwordsplit.zsh
+1 −2		zsh-syntax-highlighting.zsh
+2 −9		Makefile
+93 −181		README.md
+15 −53		config/p10k-classic.zsh
+14 −52		config/p10k-lean-8colors.zsh
+14 −52		config/p10k-lean.zsh
+14 −58		config/p10k-rainbow.zsh
+68 −96		font.md
+2 −7		gitstatus/Makefile
+8 −8		gitstatus/README.md
+35 −118		gitstatus/build
+3 −3		gitstatus/build.info
+43 −23		gitstatus/gitstatus.plugin.sh
+1 −7		gitstatus/gitstatus.plugin.zsh
+5 −6		gitstatus/gitstatus.prompt.sh
+22 −24		gitstatus/install
+23 −23		gitstatus/install.info
+2 −5		gitstatus/mbuild
+7 −7		gitstatus/src/dir.cc
+4 −4		gitstatus/src/dir.h
+0 −8		gitstatus/src/git.cc
+0 −9		gitstatus/src/git.h
+0 −9		gitstatus/src/gitstatus.cc
+0 −1		gitstatus/src/index.cc
+7 −27		gitstatus/src/options.cc
+0 −2		gitstatus/src/options.h
+7 −28		gitstatus/src/tag_db.cc
+1 −4		internal/configure.zsh
+0 −19		internal/icons.zsh
+123 −348		internal/p10k.zsh
+1 −1		internal/parser.zsh
+46 −79		internal/wizard.zsh
+1 −1		README.md
+1 −5		autoload/recover.vim
+1 −1		contrib/cvim
+4 −13		doc/recoverPlugin.txt
+1 −3		autoload/ctrlp.vim
+2 −6		autoload/ctrlp/buffertag.vim
+5 −13		readme.md
+2 −2		.pre-commit-config.yaml
+2 −6		README.md
+0 −7		autoload/gitstatus/util.vim
+3 −8		nerdtree_plugin/git_status.vim
+0 −38		.circleci/config.yml
+18 −0		.travis.yml
+1 −1		Gemfile
+26 −26		Gemfile.lock
+1 −1		README.md
+0 −88		autoload/sj.vim
+0 −81		autoload/sj/argparser/common.vim
+0 −34		autoload/sj/argparser/elixir.vim
+72 −4		autoload/sj/argparser/ruby.vim
+19 −218		autoload/sj/elixir.vim
+1 −1		autoload/sj/html.vim
+0 −183		autoload/sj/java.vim
+83 −17		autoload/sj/js.vim
+0 −69		autoload/sj/jsx.vim
+0 −65		autoload/sj/ruby.vim
+85 −1		autoload/sj/rust.vim
+3 −126		doc/splitjoin.txt
+2 −5		ftplugin/elixir/splitjoin.vim
+0 −17		ftplugin/java/splitjoin.vim
+0 −2		ftplugin/jsx/splitjoin.vim
+0 −2		ftplugin/ruby/splitjoin.vim
+2 −5		ftplugin/tsx/splitjoin.vim
+0 −2		plugin/splitjoin.vim
+1 −554		spec/plugin/elixir_spec.rb
+1 −1		spec/plugin/eruby_spec.rb
+0 −200		spec/plugin/java_spec.rb
+0 −18		spec/plugin/js_spec.rb
+8 −80		spec/plugin/jsx_spec.rb
+1 −38		spec/plugin/ruby_spec.rb