summaryrefslogtreecommitdiff
path: root/nvim
diff options
context:
space:
mode:
authorMichal Idziorek <michal.idziorek@citi.com>2021-11-30 16:07:47 +0100
committerMichal Idziorek <michal.idziorek@citi.com>2021-11-30 16:07:47 +0100
commitc4af6567d609b774d7760bfa3ebb1905dd80b082 (patch)
tree1a0cbb5edf8a9031bbab9f3f6ee917c8753d4984 /nvim
parentb633c0785f7e43899b51692bf04f556c2d6c0fe5 (diff)
some temp vimdiff stuff (WIP)
Diffstat (limited to 'nvim')
-rw-r--r--nvim/.config/nvim/init.vim9
1 files changed, 9 insertions, 0 deletions
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 1d0f7bc..d73c97d 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -64,6 +64,7 @@ call plug#end()
" 256 colorscheme
colorscheme zenburn
+
" {{{ misc
set nocompatible
" set cursorcolumn
@@ -237,6 +238,14 @@ nmap <leader>t :Tags<cr>| " fuzzy find tags
nmap <leader>q :call setqflist(filter(getqflist(),"v:val['type'] == 'E'"))<CR>
" }}}
+hi DiffAdd ctermfg=none ctermbg=23
+hi DiffDelete ctermfg=none ctermbg=52
+hi DiffChange ctermfg=none ctermbg=236
+hi DiffText ctermfg=none ctermbg=94
+
+nnoremap <leader>dd :wincmd gf<cr>:Gvdiff! develop2<cr>
+nnoremap <leader>tc :tabc<cr>
+
" write current file as superuser
cmap w!! SudoWrite