Browse Source

Modified .vimrc and added solarized colorscheme
Changes to be committed:
modified: .gitmodules
modified: .vimrc
new file: bundle/solarized

wreed4 11 years ago
parent
commit
3e5c5f0198
3 changed files with 28 additions and 5 deletions
  1. 3 0
      .gitmodules
  2. 24 5
      .vimrc
  3. 1 0
      bundle/solarized

+ 3 - 0
.gitmodules

@@ -40,3 +40,6 @@
 [submodule "bundle/tagbar"]
 [submodule "bundle/tagbar"]
 	path = bundle/tagbar
 	path = bundle/tagbar
 	url = https://github.com/majutsushi/tagbar.git
 	url = https://github.com/majutsushi/tagbar.git
+[submodule "bundle/solarized"]
+	path = bundle/solarized
+	url = https://github.com/altercation/vim-colors-solarized.git

+ 24 - 5
.vimrc

@@ -41,14 +41,20 @@ set autoread
 " turn ruler on
 " turn ruler on
 set ruler
 set ruler
 " set incremental search
 " set incremental search
+set hlsearch
 set incsearch
 set incsearch
 " set status line always on
 " set status line always on
 set laststatus=2
 set laststatus=2
 
 
+"turn omnicomplete on
+filetype plugin on
+set omnifunc=syntaxcomplete#Complete
+
 " }}}
 " }}}
 
 
 "{{{ ***** VISUALS ***** "
 "{{{ ***** VISUALS ***** "
 " set number
 " set number
+set number
 set relativenumber
 set relativenumber
 set foldmethod=syntax
 set foldmethod=syntax
 set foldcolumn=3
 set foldcolumn=3
@@ -61,7 +67,12 @@ set smartindent
 set cindent
 set cindent
 filetype plugin indent on
 filetype plugin indent on
 
 
-colorscheme carvedwoodcool
+"colorscheme carvedwoodcool
+colorscheme wombat256
+"colorscheme devbox-dark-256
+"set background=light
+"colorscheme solarized
+
 syntax on
 syntax on
 
 
 set showcmd
 set showcmd
@@ -75,8 +86,9 @@ set whichwrap+=<,>,h,l
 
 
 set pastetoggle=<F2>
 set pastetoggle=<F2>
 nmap <F12> :mks!<CR>
 nmap <F12> :mks!<CR>
-nnoremap <F3> :make! build release 
-nnoremap <F4> :make! build debug 
+nnoremap <F3> :MakeRelease<CR><CR>
+nnoremap <F4> :MakeDebug<CR><CR>
+nnoremap <F5> :so ~/.vimrc<CR>
 
 
 " look up things in opengrok
 " look up things in opengrok
 noremap <leader>K :call OpenGrok()<CR>
 noremap <leader>K :call OpenGrok()<CR>
@@ -94,7 +106,10 @@ map <C-l> <C-W>l
 "{{{ ***** PROJECTS ***** "
 "{{{ ***** PROJECTS ***** "
 
 
 " set default project options
 " set default project options
-set makeprg=rakefds 
+set makeprg=rfds 
+
+command! -nargs=* MakeRelease Make build release
+command! -nargs=* MakeDebug Make build debug
 " }}}
 " }}}
 
 
 
 
@@ -109,4 +124,8 @@ endfunction
 
 
 "{{{ ***** COMMANDS ***** " 
 "{{{ ***** COMMANDS ***** " 
 " make todo list
 " make todo list
-command -nargs=* -complete=file Todos vimgrep /asdf:/gj *|cw
+command! -nargs=* -complete=file Todos vimgrep /asdf:/gj *|cw
+
+"Wrapper for make sequence
+command! -nargs=* Make execute '!clear' | make! <args> | cw
+" }}}

+ 1 - 0
bundle/solarized

@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21