From da32211e2be61f9d9818dfc03f510d847fab1c69 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 19 May 2018 12:20:19 +0200
Subject: Update vim config

---
 pkgs/vim/conf/rc.vim                       | 12 +++++++++---
 pkgs/vim/conf/vim-color-akr/colors/akr.vim |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'pkgs/vim/conf')

diff --git a/pkgs/vim/conf/rc.vim b/pkgs/vim/conf/rc.vim
index 6ad5d7b..fcd49b3 100644
--- a/pkgs/vim/conf/rc.vim
+++ b/pkgs/vim/conf/rc.vim
@@ -20,8 +20,6 @@ set directory=~/.vim/swap//,.
 set wrap
 set tabstop=4 shiftwidth=4
 set backspace=indent,eol,start
-set listchars=tab:\ \ 
-set list
 set linebreak
 
 set hlsearch
@@ -29,6 +27,8 @@ set incsearch
 set ignorecase
 set smartcase
 
+set wildchar=<Tab> wildmenu wildmode=full
+
 let mapleader=","
 
 map <leader>s  :let @/=""<CR>
@@ -50,6 +50,9 @@ autocmd FileType pandoc  setlocal nonumber autoread
 autocmd FileType pandoc  let      g:airline#extensions#whitespace#checks=['indent', 'trailing', 'long']
 autocmd FileType tex     set      conceallevel=2
 
+nnoremap <C-Tab>   :bnext<CR>
+nnoremap <C-S-Tab> :bprev<CR>
+
 " select previous line on file reload, useful when cycling file extensions
 autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g`\" zz" | endif
 nnoremap <Tab> :CounterpointNext<CR>
@@ -98,7 +101,8 @@ let g:goyo_width                = 90
 let g:goyo_margin_top           = 1
 let g:goyo_margin_bottom        = 0
 
-nnoremap <F5> :UndotreeToggle<CR>
+nnoremap <F4> :call BufferList()<CR>
+nnoremap <F6> :UndotreeToggle<CR>
 nnoremap <F6> :GitGutterToggle<CR>
 nnoremap <F7> :TagbarToggle<CR>
 nnoremap <F8> :Goyo<CR>
@@ -113,6 +117,8 @@ let g:ctrlp_custom_ignore = {
 \ 'file': '\.o$\|\.d$'
 \ }
 
+let g:ackprg = 'ag --vimgrep'
+
 let g:undotree_SetFocusWhenToggle = 1
 
 let g:tagbar_autoclose      = 1
diff --git a/pkgs/vim/conf/vim-color-akr/colors/akr.vim b/pkgs/vim/conf/vim-color-akr/colors/akr.vim
index 127f022..8ff58d8 100644
--- a/pkgs/vim/conf/vim-color-akr/colors/akr.vim
+++ b/pkgs/vim/conf/vim-color-akr/colors/akr.vim
@@ -48,7 +48,7 @@ hi      Conditional    gui=bold       guifg=#aadb0f  guibg=NONE
 hi      MatchParen     gui=bold       guifg=NONE     guibg=NONE
 
 hi      Special        gui=NONE       guifg=#808080  guibg=NONE
-hi      SpecialKeyTab  gui=NONE       guifg=NONE     guibg=#212121
+hi      Tabs           gui=NONE       guifg=NONE     guibg=#212121
 
 hi      ColorColumn    gui=NONE       guifg=NONE     guibg=#000000
 hi      Conceal        gui=NONE       guifg=#808080  guibg=NONE
@@ -100,4 +100,4 @@ hi      prologClauseHead gui=NONE      guifg=#aadb0f  guibg=NONE
 hi      IndentGuidesEven gui=NONE      guifg=#424242  guibg=#2D2D2D
 hi      IndentGuidesOdd  gui=NONE      guifg=#424242  guibg=#2D2D2D
 
-match   SpecialKey     '^\s\+'
+match   Tabs /[\t]\+/
-- 
cgit v1.2.3