summaryrefslogtreecommitdiff
path: root/.vim
diff options
context:
space:
mode:
authorBlubber <f2005278@mvrht.com>2016-10-10 00:29:44 +0200
committerBlubber <f2005278@mvrht.com>2016-10-10 00:29:44 +0200
commit3c2961a0d7c16407428b1f8bdae3f9810ebf2049 (patch)
tree71d330aedb719f91e8a8864b7288b8ebdf0d50dc /.vim
parent7b109147f6652c22bd7410619475e8b8b80f812f (diff)
downloaddotfiles-3c2961a0d7c16407428b1f8bdae3f9810ebf2049.tar.gz
dotfiles-3c2961a0d7c16407428b1f8bdae3f9810ebf2049.zip
tmux changes prefix to C-s; vim changed leader to 'S' (capital s)
Diffstat (limited to '.vim')
-rw-r--r--.vim/vimrc_files/keymaps.vim31
-rw-r--r--.vim/vimrc_files/vundle.vim2
2 files changed, 21 insertions, 12 deletions
diff --git a/.vim/vimrc_files/keymaps.vim b/.vim/vimrc_files/keymaps.vim
index f61663f..d520ad7 100644
--- a/.vim/vimrc_files/keymaps.vim
+++ b/.vim/vimrc_files/keymaps.vim
@@ -2,7 +2,8 @@
" author: johannst
" set leader key
-let mapleader=","
+"execute "set <M-s>=\es"
+let mapleader="S"
" re-source .vimrc
map <leader>v :source ~/.vimrc<CR>
@@ -20,33 +21,39 @@ noremap <leader>q :q<CR>
map <leader>f mzgg=G`z
" navigate between different splits
-map <C-Down> <c-w>j
-map <C-Up> <c-w>k
-map <C-Right> <c-w>l
-map <C-Left> <c-w>h
+map <C-Down> <C-w>j
+map <C-Up> <C-w>k
+map <C-Right> <C-w>l
+map <C-Left> <C-w>h
+map <C-j> <C-w>j
+map <C-k> <C-w>k
+map <C-l> <C-w>l
+map <C-h> <C-w>h
" resize splits
-map <C-j> <C-w>5-
-map <C-k> <C-w>5+
-map <C-l> <C-w>5<
-map <C-h> <C-w>5>
+"map <C-j> <C-w>5-
+"map <C-k> <C-w>5+
+"map <C-l> <C-w>5<
+"map <C-h> <C-w>5>
" navigate between different buffers
nnoremap <S-Left> :bprevious<CR>
nnoremap <S-Right> :bnext<CR>
+nnoremap <S-h> :bprevious<CR>
+nnoremap <S-l> :bnext<CR>
" ctrl-ae jump to line start/end
nnoremap <C-a> 0
nnoremap <C-e> $
-inoremap <C-a> <c-o>0
-inoremap <C-e> <c-o>$
+inoremap <C-a> <C-o>0
+inoremap <C-e> <C-o>$
vnoremap <C-a> 0
vnoremap <C-e> $
cnoremap <C-a> <Home>
cnoremap <C-e> <End>
" Shortcut to toggle relative numbering mode
-nnoremap <c-n> :call ToggleRelativeNumber()<CR>
+nnoremap <C-n> :call ToggleRelativeNumber()<CR>
" add a marker fold snippet (for C/C++)
nnoremap <C-f> o//{{{ <Esc>o//}}}<Esc><Up>A
diff --git a/.vim/vimrc_files/vundle.vim b/.vim/vimrc_files/vundle.vim
index eb568ef..6b8b21a 100644
--- a/.vim/vimrc_files/vundle.vim
+++ b/.vim/vimrc_files/vundle.vim
@@ -18,6 +18,8 @@ Plugin 'vim-airline/vim-airline-themes'
Plugin 'majutsushi/tagbar'
+Plugin 'kien/ctrlp.vim'
+
" c++ modifief headers: http://www.vim.org/scripts/script.php?script_id=2358
"Plugin 'vim-scripts/OmniCppComplete'