Browse Source

Removed tmux/vim intergration as it conflicted with redraw binding

master
Josh Wolfe 3 years ago
parent
commit
657a59096b
2 changed files with 17 additions and 11 deletions
  1. 0
    10
      tmux/.tmux.conf
  2. 17
    1
      vim/.vimrc

+ 0
- 10
tmux/.tmux.conf View File

@@ -81,13 +81,3 @@ set-option -g display-panes-active-colour colour33 #blue
set-option -g display-panes-colour colour166 #orange
# clock
set-window-option -g clock-mode-colour green #green

# 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"
bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"

+ 17
- 1
vim/.vimrc View File

@@ -26,8 +26,10 @@ Plug 'tpope/vim-repeat'
Plug 'tpope/vim-rsi'
Plug 'tpope/vim-scriptease'
Plug 'tpope/vim-afterimage'
Plug 'christoomey/vim-tmux-navigator'

Plug 'haya14busa/incsearch.vim'
Plug 'vim-scripts/matchit.zip'
Plug 'junegunn/vim-easy-align'

" Completion
Plug 'ervandew/supertab'
@@ -104,6 +106,7 @@ hi CursorLine cterm=bold ctermbg=NONE

nnoremap <Space> <nop>
let g:mapleader = "\<Space>"
let g:maplocalleader = "\\"

" Make j and k behave like they should for wrapped lines
nnoremap j gj
@@ -137,6 +140,8 @@ nnoremap <leader>f :Ag<cr>
nnoremap <leader>t :Tags<cr>
nnoremap <leader>T :call fzf#vim#tags(expand('<cword>'))<cr>

nnoremap <localleader><localleader> :b#<cr>

" }}}

" Custom Configuration {{{
@@ -191,6 +196,17 @@ inoremap <c-x><c-l> <Plug>(fzf-complete-line)
" [Tags] Command to generate tags file
let g:fzf_tags_command = 'ctags -R'

" incsearch
map / <Plug>(incsearch-forward)
map ? <Plug>(incsearch-backward)
map g/ <Plug>(incsearch-stay)

" Easy Align
" Start interactive EasyAlign in visual mode (e.g. vipga)
xmap ga <Plug>(EasyAlign)
" Start interactive EasyAlign for a motion/text object (e.g. gaip)
nmap ga <Plug>(EasyAlign)

" Supertab
let g:SuperTabDefaultCompletionType = "<C-X><C-O>"
" If you prefer the Omni-Completion tip window to close when a selection is

Loading…
Cancel
Save