Refact config

Author: luathn

tmux.conf

@@ -1,98 +1,62 @@
 # General ##################################################################
 set -g mouse on
-
-# utf8 is on
-set -g utf8 on
-set -g status-utf8 on
-
-# address vim mode switching delay (http://superuser.com/a/252717/65504)
-set -s escape-time 0
-
-# increase scrollback buffer size
-set -g history-limit 50000
-
-# tmux messages are displayed for 4 seconds
-set -g display-time 4000
-
-# refresh 'status-left' and 'status-right' more often
+set -s escape-time 0                       # address vim mode switching delay
+set -g history-limit 50000                 # increase scrollback buffer size
 set -g status-interval 5
-
-# upgrade $TERM
 set -g default-terminal "screen-256color"
-
-# vi keybinding
-set -g mode-keys vi
-
-# focus events enabled for terminals that support them
-set -g focus-events on
-
-# super useful when using "grouped sessions" and multi-monitor setup
-setw -g aggressive-resize on
+set -g mode-keys vi                        # vi keybinding
+set -g focus-events on                     # focus events enabled for terminals that support them
+setw -g aggressive-resize on               # super useful when using "grouped sessions" and multi-monitor setup
 
 # change default prefix key
 set -g prefix C-a
 unbind C-b
 bind C-a send-prefix
 
-set -g base-index 1           # start windows numbering at 1
-setw -g pane-base-index 1     # make pane numbering consistent with windows
-set -g renumber-windows on    # renumber windows when a window is closed
+set -g base-index 1                        # start windows numbering at 1
+setw -g pane-base-index 1                  # make pane numbering consistent with windows
+set -g renumber-windows on                 # renumber windows when a window is closed
 
+# vim keybinding
 bind / copy-mode \; send-key ?
 bind-key -T copy-mode-vi v send-keys -X begin-selection
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 bind-key -T copy-mode-vi C-w send-keys b \; send -X begin-selection \; send-keys E
-bind-key -T copy-mode-vi C-shift-c send-keys -X copy-pipe-and-cancel "xclip -in -selection clipboard"
-
-bind l choose-tree            # list and choose sessions
+bind-key -T copy-mode-vi C-c send-keys -X copy-pipe-and-cancel "xclip -in -selection clipboard"
 
-# bind key to toggle mouse
+bind l choose-session
 bind m set -g mouse \; display "Mouse #{?mouse,on,off}"
-
-# reload config
 bind r source-file ~/.tmux.conf \; display "tmux.conf reloaded."
-
-# fullscreen
 bind f resize-pane -Z
-
-# split windows like vim
 bind v split-window -h -c "#{pane_current_path}"
 bind s split-window -v -c "#{pane_current_path}"
-
-bind > swap-pane -D       # swap current pane with the next one
-bind < swap-pane -U       # swap current pane with the previous one
-
-# pane resizing
+bind > swap-pane -D
+bind < swap-pane -U
 bind -r H resize-pane -L 4
 bind -r J resize-pane -D 4
 bind -r K resize-pane -U 4
 bind -r L resize-pane -R 4
+bind C-p previous-window
+bind C-n next-window
 
 # Open small terminal :D
 bind T split-window -l 15 -c "#{pane_current_path}" \; display "Create terminal"
 bind t resize-pane -t 1 -Z
 
-# Vim Tmux navigator
-# 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)?$'"
+  | 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"
-bind-key -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"
 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
+bind-key -T copy-mode-vi 'C-\' select-pane -l
 
 # Theme file ################################################################
 source-file ~/dotfiles/tmux.conf.basic
 
-# List of plugins
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-
-# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run -b '~/.tmux/plugins/tpm/tpm'
+run-shell ~/dotfiles/tmux/plugins/tmux-resurrect/resurrect.tmux

tmux/plugins/tmux-resurrect

@@ -0,0 +1 @@
+Subproject commit 1160c1da711c47f5b9a3983433442569f3c9d22b

vim/vimrc

@@ -142,10 +142,10 @@ Plug 'ap/vim-css-color'
 " Plug 'neoclide/coc-eslint', {'do': 'yarn install --frozen-lockfile'}
 
 " UI
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-" Plug 'itchyny/lightline.vim'
-" Plug 'mengelbrecht/lightline-bufferline'
+" Plug 'vim-airline/vim-airline'
+" Plug 'vim-airline/vim-airline-themes'
+Plug 'itchyny/lightline.vim'
+Plug 'mengelbrecht/lightline-bufferline'
 Plug 'morhetz/gruvbox'
 
 " other
@@ -171,36 +171,37 @@ colorscheme gruvbox
 let g:gruvbox_contrast_dark='hard'
 set background=dark
 
-" Airline config
-let g:airline#extensions#tabline#enabled = 1
-let g:airline#extensions#tabline#show_tabs = 0
-let g:airline#extensions#tabline#left_sep = ' '
-let g:airline#extensions#tabline#left_alt_sep = '|'
-let g:airline_theme='gruvbox'
-let g:airline_powerline_fonts = 1
-
-" " Lightline config
-" let g:lightline = {
-"   \   'colorscheme': 'gruvbox',
-"   \   'active': {
-"   \     'left':[ [ 'mode', 'paste' ],
-"   \              [ 'gitbranch', 'readonly', 'filename', 'modified' ]
-"   \     ]
-"   \   },
-" 	\   'component': {
-" 	\     'lineinfo': ' %3l:%-2v',
-" 	\   },
-"   \   'component_function': {
-"   \     'gitbranch': 'fugitive#head',
-"   \   }
-"   \ }
-" let g:lightline.tabline = {
-"   \   'left': [ ['buffers'] ],
-"   \   'right': [ ['close'] ]
-"   \ }
-" let g:lightline.component_expand = {'buffers': 'lightline#bufferline#buffers'}
-" let g:lightline.component_type   = {'buffers': 'tabsel'}
-" set showtabline=2  " Show tabline
+" " Airline config
+" let g:airline#extensions#tabline#enabled = 1
+" let g:airline#extensions#tabline#show_tabs = 0
+" let g:airline#extensions#ale#enabled = 1
+" let g:airline#extensions#tabline#left_sep = ' '
+" let g:airline#extensions#tabline#left_alt_sep = '|'
+" let g:airline_theme='gruvbox'
+" let g:airline_powerline_fonts = 1
+
+" Lightline config
+let g:lightline = {
+  \   'colorscheme': 'gruvbox',
+  \   'active': {
+  \     'left':[ [ 'mode', 'paste' ],
+  \              [ 'gitbranch', 'readonly', 'filename', 'modified' ]
+  \     ]
+  \   },
+	\   'component': {
+	\     'lineinfo': ' %3l:%-2v',
+	\   },
+  \   'component_function': {
+  \     'gitbranch': 'fugitive#head',
+  \   }
+  \ }
+let g:lightline.tabline = {
+  \   'left': [ ['buffers'] ],
+  \   'right': [ ['close'] ]
+  \ }
+let g:lightline.component_expand = {'buffers': 'lightline#bufferline#buffers'}
+let g:lightline.component_type   = {'buffers': 'tabsel'}
+set showtabline=2  " Show tabline
 
 " NERDTree
 let g:NERDTreeMouseMode=3
@@ -242,7 +243,7 @@ if executable('ag')
 endif
 
 " Ale plugin
-let g:ale_fix_on_save = 1
+" let g:ale_fix_on_save = 1
 let g:ale_fixers = {
   \ '*': ['remove_trailing_lines', 'trim_whitespace'],
   \ 'ruby': ['rubocop'],

zshrc

@@ -73,12 +73,18 @@ plugins=(rails docker git ruby tmux zsh-autosuggestions zsh-syntax-highlighting)
 
 source $ZSH/oh-my-zsh.sh
 
-# User configuration
+# Key binding #################################################################
 bindkey '^ ' autosuggest-accept
-
-# Disable Ctrl-S and Ctrl-Q in terminal
 stty -ixon
 
+# vi mode
+# bindkey -v
+bindkey "^[" vi-cmd-mode
+
+# handy keybindings
+bindkey "^B" beginning-of-line
+bindkey "^E" end-of-line
+
 export EDITOR='vim'
 
 # export MANPATH="/usr/local/man:$MANPATH"