summaryrefslogtreecommitdiff
path: root/.vim/startup/mappings.vim
diff options
context:
space:
mode:
Diffstat (limited to '.vim/startup/mappings.vim')
-rw-r--r--.vim/startup/mappings.vim108
1 files changed, 62 insertions, 46 deletions
diff --git a/.vim/startup/mappings.vim b/.vim/startup/mappings.vim
index 1ed6f8a..c2a9b03 100644
--- a/.vim/startup/mappings.vim
+++ b/.vim/startup/mappings.vim
@@ -1,3 +1,62 @@
+" Ctrl-C, Ctrl-V, ... {{{
+ " Partly taken from: https://gist.github.com/jshih/3423345
+ " Most use "li" instead of "i" because for some (good?) reason my cursor
+ " goes to the right after executing any of those
+ inoremap <C-S> <Esc>:w<CR>li
+ inoremap <C-V> <ESC>"+pli
+ inoremap <C-A> <ESC>ggVG
+ inoremap <C-R> <ESC><C-r>i
+ inoremap <C-U> <ESC>uli
+
+ nnoremap <C-S> <Esc>:w<CR>
+ nnoremap <C-A> ggVG
+
+ xnoremap <C-V> c<ESC>"+Pl
+ xnoremap <C-A> ggVG
+ xnoremap <C-C> "+y
+ xnoremap <C-X> "+d
+" }}}
+
+" Move lines with Alt-J, Alt-K {{{
+ execute "set <M-j>=\ej"
+ nnoremap <M-j> <ESC>:m+1<CR>
+ execute "set <M-k>=\ek"
+ nnoremap <M-k> <ESC>:m-2<CR>
+
+ xnoremap <A-j> :m '>+1<CR>gv=gv
+ xnoremap <A-k> :m '<-2<CR>gv=gv
+" }}}
+
+" Omni completion (really needs a rework) {{{
+ " Omni completion supports C, HTML, CSS, JavaScript, PHP, Python, Ruby, SQL, XML
+ set omnifunc=syntaxcomplete#Complete " Completion for all supported languages
+
+ " Do omni completion from Ctrl+Space
+ inoremap <C-@> <C-X><C-O>
+
+ " Thanks to: https://vim.fandom.com/wiki/Make_Vim_completion_popup_menu_work_just_like_in_an_IDE
+ " set completeopt=longest,menuone
+ " [ The following are disabled, because they conflict with delimitMate's autobracket feature ]
+ " inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+ " inoremap <expr> <C-n> pumvisible() ? '<C-n>' : '<C-n><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>'
+
+ " "Disables" arrow navigation in completion menu
+ inoremap <expr> <up> pumvisible() ? '<c-y><up>' : '<up>'
+ inoremap <expr> <down> pumvisible() ? '<c-y><down>' : '<down>'
+
+ " Pressing tab goes from top to bottom
+ let g:SuperTabContextDefaultCompletionType = "<c-n>"
+" }}}
+
+" When line is wrapped, going up or down will also go into the wrapped part
+nnoremap j gj
+nnoremap k gk
+xnoremap j gj
+xnoremap k gk
+
+" Don't move cursor one character back on esc key press
+inoremap <silent> <Esc> <C-O>:stopinsert<CR>
+
" Don't get into insert mode after adding a line with o/O
nnoremap o o<Esc>
nnoremap O O<Esc>
@@ -6,36 +65,14 @@ nnoremap O O<Esc>
inoremap <C-h> <C-w>
inoremap <C-BS> <C-w>
-" Ctrl+s; Ctrl+c, Ctrl+v, Ctrl+x; Ctrl+z, Ctrl+r; Ctrl+a bindings that work on GUI applications
-" Partly taken from: https://gist.github.com/jshih/3423345
-imap <C-s> <Esc>:w<CR>i
-nmap <C-S> <Esc>:w<CR>
-"imap <C-S-z> <C-r> An impossible dream
-vmap <C-c> "+yi<Esc>
-vmap <C-v> c<ESC>"+P<Esc>
-imap <C-v> <ESC>"+Pi
-vmap <C-x> "+c<Esc>
-imap <C-z> <ESC>ui
-imap <C-r> <ESC><C-r>i
-map <C-a> ggVG
-
-" Show all buffers and be able to just type in the number of the buffer
-map <C-f> :set nomore<Bar>:ls<Bar>:set more<CR>:b<Space>
-
-" Move a line up and down with Alt+k and Alt-j
-execute "set <M-j>=\ej"
-nnoremap <M-j> <ESC>:m+1<CR>
-execute "set <M-k>=\ek"
-nnoremap <M-k> <ESC>:m-2<CR>
-vnoremap <A-j> :m '>+1<CR>gv=gv
-vnoremap <A-k> :m '<-2<CR>gv=gv
-
" Make session file
nnoremap <F1> <ESC>:mksession! .vim-session<CR>
+
" Show who edited the current line from git history
nnoremap <F8> :<C-u>call gitblame#echo()<CR>
+
" Open lazygit in a new tab with =
-nnoremap = :tab ter ++close lazygit<CR>
+nnoremap <silent> = :tab ter ++close lazygit<CR>
" Cyrillic (Bulgarian yawerty layout) support
ca в w
@@ -50,24 +87,3 @@ ca xa wa <bar> qa!
" Open a terminal vim tab with tt and open a blank tab with te
ca tt tab ter
ca te tabe
-
-" Omni completion {{{
- " Omni completion supports C, HTML, CSS, JavaScript, PHP, Python, Ruby, SQL, XML
- set omnifunc=syntaxcomplete#Complete " Completion for all supported languages
-
- " Do omni completion from Ctrl+Space
- inoremap <C-@> <C-X><C-O>
-
- " Thanks to: https://vim.fandom.com/wiki/Make_Vim_completion_popup_menu_work_just_like_in_an_IDE
- " set completeopt=longest,menuone
- " [ The following are disabled, because they conflict with delimitMate's autobracket feature ]
- " inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
- " inoremap <expr> <C-n> pumvisible() ? '<C-n>' : '<C-n><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>'
-
- " "Disables" arrow navigation in completion menu
- inoremap <expr> <up> pumvisible() ? '<c-y><up>' : '<up>'
- inoremap <expr> <down> pumvisible() ? '<c-y><down>' : '<down>'
-
- " Pressing tab goes from top to bottom
- let g:SuperTabContextDefaultCompletionType = "<c-n>"
-" }}}