vim settings

LEI · Mar 26, 2016 · 61723db · 61723db
1 parent 2653d47
commit 61723db
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 9 deletions.
diff --git a/vim/settings.vim → vim/plugin/settings.vim b/vim/settings.vim → vim/plugin/settings.vim
@@ -2,7 +2,7 @@
 
 " github.com/skwp/dotfiles/blob/master/vim/settings.vim
 
-let vimsettings = '~/.vim/settings'
+let vimsettings = '~/.vim/plugin/settings'
 "let uname = system("uname -s")
 
 for fpath in split(globpath(vimsettings, '*.vim'), '\n')

diff --git a/vim/settings/airline.vim → vim/plugin/settings/airline.vim b/vim/settings/airline.vim → vim/plugin/settings/airline.vim
diff --git a/vim/settings/colorcolumn.vim → vim/plugin/settings/colorcolumn.vim b/vim/settings/colorcolumn.vim → vim/plugin/settings/colorcolumn.vim
diff --git a/vim/settings/ctrlp.vim → vim/plugin/settings/ctrlp.vim b/vim/settings/ctrlp.vim → vim/plugin/settings/ctrlp.vim
diff --git a/vim/settings/endwise.vim → vim/plugin/settings/endwise.vim b/vim/settings/endwise.vim → vim/plugin/settings/endwise.vim
diff --git a/vim/settings/fugitive.vim → vim/plugin/settings/fugitive.vim b/vim/settings/fugitive.vim → vim/plugin/settings/fugitive.vim
diff --git a/vim/settings/gitgutter.vim → vim/plugin/settings/gitgutter.vim b/vim/settings/gitgutter.vim → vim/plugin/settings/gitgutter.vim
diff --git a/vim/settings/indentline.vim → vim/plugin/settings/indentline.vim b/vim/settings/indentline.vim → vim/plugin/settings/indentline.vim
diff --git a/vim/settings/syntastic.vim → vim/plugin/settings/syntastic.vim b/vim/settings/syntastic.vim → vim/plugin/settings/syntastic.vim
diff --git a/vim/settings/tabular.vim → vim/plugin/settings/tabular.vim b/vim/settings/tabular.vim → vim/plugin/settings/tabular.vim
diff --git a/vim/settings/ultisnips.vim → vim/plugin/settings/ultisnips.vim b/vim/settings/ultisnips.vim → vim/plugin/settings/ultisnips.vim
diff --git a/vim/settings/unimpaired.vim → vim/plugin/settings/unimpaired.vim b/vim/settings/unimpaired.vim → vim/plugin/settings/unimpaired.vim
diff --git a/vim/vimrc b/vim/vimrc
@@ -521,8 +521,8 @@ command! Fr set spelllang=fr
 " Allow backspace in insert mode
 set backspace=indent,eol,start
 
-" Change leader to a comma instead of backslash
-let g:mapleader=","
+" Change leader
+let g:mapleader="\<Space>"
 
 " Nope
 nnoremap <up> <nop>
@@ -534,7 +534,7 @@ inoremap <down> <nop>
 inoremap <left> <nop>
 inoremap <right> <nop>
 
-" Move by screen lines (use virtual columns)
+" Move vertically on wrapped lines
 nnoremap j gj
 nnoremap k gk
 
@@ -544,9 +544,6 @@ nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
 nnoremap <C-l> <C-w>l
 
-" Clear highlighted search results
-map <leader><Space> :noh<CR>
-
 " Edit in the same directory as the current file
 cnoremap %% <C-R>=fnameescape(expand('%:h')).'/'<cr>
 " Edit in window
@@ -558,9 +555,16 @@ map <leader>ev :vsp %%
 " Edit in tab
 map <leader>et :tabe %%
 
-" Save a file as root (,W)
+" Quicker quit
+noremap <leader>q :q<CR>
+" Save a file
+noremap <leader>w :w<CR>
+" Save as root (,W)
 noremap <leader>W :w !sudo tee % > /dev/null<CR>
 
+" Clear highlighted search results
+map <leader><Space> :noh<CR>
+
 " Git shortcuts
 map <leader>b :Gblame<cr>
 map <leader>l :!clear && git log -p %<CR>
@@ -578,4 +582,4 @@ nnoremap <leader>rc <C-w><C-v><C-l>:e $MYVIMRC<CR>
 " Runtime {{{1
 
 " Load custom settings
-runtime settings.vim
+" runtime plugin/settings.vim