tmux.conf and other things

4 files changed, 51 insertions, 3 deletions

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
new file mode 100644
index 0000000..9ad72fc
--- /dev/null
+++ b/tmux/tmux.conf
@@ -0,0 +1,46 @@
+set-option -g base-index 1
+set-option -g default-terminal "screen-256color"
+set-option -g display-panes-time 2000
+set-option -g escape-time 10
+set-option -g mode-keys vi
+set-option -g mouse
+set-option -g pane-base-index 1
+set-option -g pane-border-status top
+set-option -g renumber-windows on
+set-option -g status-interval 5
+set-option -g status-keys vi
+set-option -g status-left ' '
+set-option -g status-position bottom
+set-option -g status-right ' #h #[fg=black]#[bg=#556677]#[bg=black]#[fg=#556677]#(uptime | sed "s/,[^:]*//")#[default]'
+
+set-option -g status-style fg=#ffffff,bg=#556677
+set-option -g window-status-style fg=#ffffff,bg=#333333
+set-option -g window-status-current-style fg=#ffffff,bg=#55aa55
+set-option -g window-status-bell-style fg=#ffffff,bg=#ee3322
+set-option -g window-status-separator " "
+set-option -g window-status-format "#[fg=#556677]#[default] #I  #W #[fg=#556677]#[reverse]"
+set-option -g window-status-current-format "#[fg=#556677]#[default] #I  #W #[fg=#556677]#[reverse]"
+
+set-option -g pane-border-format "#P #T"
+set-option -g pane-active-border-style fg=#ffffff
+set-option -g pane-border-style fg=#556677
+
+# Smart pane switching with awareness of Vim splits.
+# See: https://github.com/christoomey/vim-tmux-navigator
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
+bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j'  'select-pane -D'
+bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
+bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
+tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
+if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
+    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
+if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
+    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
+
+bind-key -T copy-mode-vi 'C-h' select-pane -L
+bind-key -T copy-mode-vi 'C-j' select-pane -D
+bind-key -T copy-mode-vi 'C-k' select-pane -U
+bind-key -T copy-mode-vi 'C-l' select-pane -R
+bind-key -T copy-mode-vi 'C-\' select-pane -l
diff --git a/tmux/.tmux.conf b/tmux/tmux.conf.old
index 39178cc..39178cc 100644
--- a/tmux/.tmux.conf
+++ b/tmux/tmux.conf.old
diff --git a/vim-new/init.vim b/vim-new/init.vim
index 7fca7b6..a35f680 100644
--- a/vim-new/init.vim
+++ b/vim-new/init.vim
@@ -39,6 +39,8 @@ Plug 'neovimhaskell/haskell-vim'
 Plug 'alx741/vim-stylishask'
 Plug 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' }
 
+Plug 'christoomey/vim-tmux-navigator'
+
 call plug#end()
 " }}}
 
@@ -65,7 +67,7 @@ set completeopt-=preview
 set updatetime=300
 set signcolumn=yes
 
-" set mouse=a
+set mouse=a
 
 syntax on
 
diff --git a/zsh/zshrc b/zsh/zshrc
index 4e5bad8..bd7e42e 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,6 +1,6 @@
 if [ -z "$TMUX" ]
 then
-    tmux attach -t TMUX || tmux new -s TMUX
+    tmux -2 attach -t TMUX || tmux -2 new -s TMUX
 fi
 
 # Start configuration added by Zim install {{{
@@ -166,7 +166,7 @@ add-zle-hook-widget -Uz keymap-select _prompt_miguel_keymap_select
 
 typeset -gA git_info
 if (( ${+functions[git-info]} )); then
-  zstyle ':zim:git-info:branch' format '%b'
+  zstyle ':zim:git-info:branch' format '%F{blue}%b%f'
   zstyle ':zim:git-info:commit' format 'HEAD %F{green}(%c)'
   zstyle ':zim:git-info:action' format ' %F{yellow}(${(U):-%s})'
   zstyle ':zim:git-info:stashed' format '\\\$'