X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/4339f7b2ba8e0349873b304930c302f2ba2e148c..18311c485f1824c7d88650b1516dd15570892bc5:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 9f4588e..7d8d9e3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -19,7 +19,6 @@ Plugin 'bling/vim-airline' Plugin 'derekwyatt/vim-fswitch' Plugin 'elzr/vim-json' Plugin 'firef0x/pkgbuild.vim' -Plugin 'flazz/vim-colorschemes' Plugin 'junegunn/vim-easy-align' Plugin 'justinmk/vim-sneak' Plugin 'klen/python-mode' @@ -42,6 +41,9 @@ Plugin 'valloric/youcompleteme' Plugin 'vim-scripts/replacewithregister' Plugin 'vim-scripts/yankring.vim' +" colorschemes +Plugin 'flazz/vim-colorschemes' + " snippets Plugin 'sirver/ultisnips' Plugin 'honza/vim-snippets' @@ -85,7 +87,7 @@ filetype plugin indent on " colorscheme {{{1 syntax on -colorscheme badwolf +colorscheme badfox " options {{{1 " moving around, searching and patterns {{{2 @@ -324,8 +326,8 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | map " make -nnoremap r :make -nnoremap :make +nnoremap r :make! +nnoremap :make! " unhighlight search nnoremap / :silent nohl @@ -485,8 +487,10 @@ inoremap gUiwgi nmap qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" " commands {{{1 -command! Cd lcd %:h -command! Cr execute('lcd ' . FindGitDirOrHome()) +command! Cd cd %:h +command! Cr execute('cd ' . FindGitDirOrHome()) +command! LCd lcd %:h +command! LCr execute('lcd ' . FindGitDirOrHome()) " plugins options {{{1 " airline {{{2 @@ -614,7 +618,7 @@ if executable('ag') let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' let g:unite_source_grep_recursive_opt = '' end -nnoremap [unite]a :Unite grep -input= +nnoremap [unite]a :Unite grep:.:: command! -nargs=1 Ag Unite grep -input= " unite-file_rec {{{3