summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.vim6
-rw-r--r--modules/general.vim18
2 files changed, 18 insertions, 6 deletions
diff --git a/init.vim b/init.vim
index 03a1c42d..20a52b12 100644
--- a/init.vim
+++ b/init.vim
@@ -23,9 +23,3 @@ source $HOME/.config/nvim/modules/echodoc.vim
" Special test file "
source $HOME/.config/nvim/modules/test.vim
-set conceallevel=0
-"fix ctrl+l in python
-nnoremap <M-h> <C-w>h
-nnoremap <M-j> <C-w>j
-nnoremap <M-k> <C-w>k
-nnoremap <M-l> <C-w>l
diff --git a/modules/general.vim b/modules/general.vim
index 9c55b521..75b9cff8 100644
--- a/modules/general.vim
+++ b/modules/general.vim
@@ -74,9 +74,27 @@ tnoremap <C-h> <C-\><C-n><C-w>h
tnoremap <C-j> <C-\><C-n><C-w>j
tnoremap <C-k> <C-\><C-n><C-w>k
tnoremap <C-l> <C-\><C-n><C-w>l
+
+nnoremap <M-h> <C-w>h
+nnoremap <M-j> <C-w>j
+nnoremap <M-k> <C-w>k
+nnoremap <M-l> <C-w>l
+
+nnoremap <D-h> <C-w>h
+nnoremap <D-j> <C-w>j
+nnoremap <D-k> <C-w>k
+nnoremap <D-l> <C-w>l
+
" TAB in general mode will move to text buffer
nnoremap <TAB> :bnext<CR>
" SHIFT-TAB will go back
nnoremap <S-TAB> :bprevious<CR>
+" Copy paste between vim and everything else
+set clipboard=unnamedplus
+" hold when tabbing
+vnoremap < <gv
+vnoremap > >gv
+
+set conceallevel=0