zsh: update motd

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 7010d5fe058b9ed3bf3b223f4a10ed5795f80b33..7d8d9e31c7f09ddbf19ea7ab443449a22e6ee7cf 100644 (file)
--- 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'
@@ -68,6 +70,9 @@ Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'alx741/vinfo'
 Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'derekwyatt/vim-protodef'
+Plugin 'rdnetto/ycm-generator'
+" needs editing colorscheme
+" Plugin 'jeaye/color_coded'
 
 " remove entries first
 set runtimepath -=$HOME/.vim
@@ -82,12 +87,9 @@ filetype plugin indent on
 
 " colorscheme {{{1
 syntax on
-colorscheme badwolf
+colorscheme badfox
 
 " options {{{1
-" put $ and the end of text to be replaced with 'cw' and the likes
-set cpoptions+=$
-
 " moving around, searching and patterns {{{2
 set incsearch           " show match for partly typed search command
 set ignorecase          " ignore case when using a search pattern
@@ -324,8 +326,8 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 map <space> <leader>
 
 " make
-nnoremap <leader>r :make<cr>
-nnoremap <leader><cr> :make<cr>
+nnoremap <leader>r :make!<cr>
+nnoremap <leader><cr> :make!<cr>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>
@@ -485,8 +487,10 @@ inoremap <C-C> <Esc>gUiwgi
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " 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 <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>
+nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
 command! -nargs=1 Ag Unite grep -input=<args>
 
 " unite-file_rec {{{3