Fix tmux, add prefix highlighting

Signed-off-by: Tomas Slusny <[email protected]>
deathbeam · Apr 11, 2017 · c4c953f · c4c953f
1 parent 3bc8560
commit c4c953f
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -116,3 +116,6 @@
 [submodule "vim/.vim/bundle/completor.vim"]
 	path = vim/.vim/bundle/completor.vim
 	url = https://github.com/maralla/completor.vim
+[submodule "tmux/.tmux/bundle/tmux-sessionist"]
+	path = tmux/.tmux/bundle/tmux-sessionist
+	url = https://github.com/tmux-plugins/tmux-sessionist
diff --git a/README.md b/README.md
@@ -153,6 +153,8 @@ To add your own Vim, Tmux or Zsh plugin you can just clone it to proper
    tmux environment across system restarts
  * [tmux-sensible](https://github.com/tmux-plugins/tmux-sensible): basic tmux
    settings everyone can agree on
+ * [tmux-sessionist](https://github.com/tmux-plugins/tmux-sessionist):
+   Lightweight tmux utils for manipulating sessions
  * [tmux-yank](https://github.com/tmux-plugins/tmux-yank): Plugin for copying to
    system clipboard
  * [vim-tmux-navigator](https://github.com/christoomey/vim-tmux-navigator):

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
@@ -25,9 +25,6 @@ unbind C-b
 set -g prefix C-Space
 bind C-space send-prefix
 
-# Kill current session
-bind X kill-session
-
 # Open new windows and tabs with current path
 bind c new-window -c "#{pane_current_path}"
 bind '"' split-window -h -c "#{pane_current_path}"
@@ -77,10 +74,12 @@ set -g set-titles-string '#T'
 # Status bar
 set -g status on
 set -g status-bg default
-set -g status-fg default
+set -g status-fg cyan
 
-set -g status-left ''
+set -g status-left '#{?client_prefix,#[fg=green]#[bold]-- PREFIX -- ,}#{?pane_in_mode,#[fg=green]#[bold]-- VISUAL -- ,}'
+set -g status-left-length 100
 set -g status-right '#[fg=cyan]#S'
+set -g status-right-length 100
 set -g window-status-format '#[fg=black]#I:#W#F'
 set -g window-status-current-format '#[fg=blue]#I:#W#F'
 
@@ -97,7 +96,7 @@ set -g @continuum-restore 'on'
 set -g @continuum-save-interval '10'
 
 # Pathogen-like loader for plugins
-run-shell 'find -L ~/.tmux/bundle -type f -name "*.tmux" | sort -r | while read f; do bash $f; done'
+run-shell 'find -L ~/.tmux/bundle -type f -name "*.tmux" | sort | while read f; do bash $f; done'
 
 # }}}
 

diff --git a/tmux/.tmux/bundle/tmux-sessionist b/tmux/.tmux/bundle/tmux-sessionist
diff --git a/vim/.vim/bundle/completor.vim b/vim/.vim/bundle/completor.vim
diff --git a/vim/.vim/bundle/tsuquyomi b/vim/.vim/bundle/tsuquyomi
diff --git a/vim/.vim/bundle/vim-test b/vim/.vim/bundle/vim-test
diff --git a/zsh/.fzf b/zsh/.fzf
diff --git a/zsh/.zim b/zsh/.zim
diff --git a/zsh/.zsh/bundle/vi-mode.plugin.zsh b/zsh/.zsh/bundle/vi-mode.plugin.zsh
@@ -36,6 +36,7 @@ bindkey '^e' end-of-line
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+  MODE_INDICATOR="%{$FX[bold]%}%{$FG[2]%}-- INSERT --%{$FX[reset]%}"
 fi
 
 vi_mode_prompt_info() {

diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -34,6 +34,7 @@ if [ -f ~/.zim/init.zsh ]; then
     archive \
     directory \
     environment \
+    spectrum \
     fasd \
     git \
     git-info \
+1 −1		README.md
+25 −4		autoload/tsuquyomi/config.vim
+77 −26		autoload/tsuquyomi/tsClient.vim
+2 −1		doc/tsuquyomi.jax
+2 −1		doc/tsuquyomi.txt