diff --git a/tmux.conf b/tmux.conf index b48d7d0..4b1e448 100644 --- a/tmux.conf +++ b/tmux.conf @@ -6,21 +6,6 @@ bind C-l send-keys 'C-l' bind r source ~/.tmux.conf\; display "~/.tmux.conf sourced!" -# 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-Left if-shell "$is_vim" "send-keys C-Left" "select-pane -L" -# bind-key -n C-Down if-shell "$is_vim" "send-keys C-Down" "select-pane -D" -# bind-key -n C-Up if-shell "$is_vim" "send-keys C-Up" "select-pane -U" -# bind-key -n C-Right if-shell "$is_vim" "send-keys C-Right" "select-pane -R" -# bind-key -n C-backspace if-shell "$is_vim" "send-keys C-Backspace" "select-pane -l" - -# bind-key -T copy-mode-vi C-Left select-pane -L -# bind-key -T copy-mode-vi C-Down select-pane -D -# bind-key -T copy-mode-vi C-Up select-pane -U -# bind-key -T copy-mode-vi C-Right select-pane -R -# bind-key -T copy-mode-vi C-Backspace select-pane -l - # List of plugins set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' diff --git a/vimrc b/vimrc index bd8ed91..dddac66 100644 --- a/vimrc +++ b/vimrc @@ -50,31 +50,21 @@ if v:version >= 703 set backupdir=/tmp//,. endif -" TODO put in a file group +" TODO put in file groups imap cll console.log()==f(a - -" let g:tmux_navigator_no_mappings = 1 -" let g:tmux_navigator_save_on_switch = 1 -" Disable tmux navigator when zooming the Vim pane -" let g:tmux_navigator_disable_when_zoomed = 1 - -" nnoremap :TmuxNavigateLeft -" nnoremap :TmuxNavigateDown -" nnoremap :TmuxNavigateUp -" nnoremap :TmuxNavigateRight -" nnoremap :TmuxNavigatePrevious +imap ii IO.inspect( set ignorecase smartcase set incsearch set complete=.,b,u,] -set wildignore+=deps/*,*.sw? +set wildignore+=deps/*,node_modules/*,*.sw? -" set background=light -" source ~/.vim/colors/midnight.vim color desert -let g:airline_theme=papercolor +if has("AirlineTheme") + let g:airline_theme=papercolor +endif " enable syntax highlighting if it is supported if has("syntax")