diff options
-rw-r--r-- | .vim/colors/coderonline.vim | 38 | ||||
-rw-r--r-- | .vim/vimrc | 12 |
2 files changed, 47 insertions, 3 deletions
diff --git a/.vim/colors/coderonline.vim b/.vim/colors/coderonline.vim index eb8baa6..ce58bed 100644 --- a/.vim/colors/coderonline.vim +++ b/.vim/colors/coderonline.vim | |||
@@ -140,3 +140,41 @@ highlight! link SpellRare Todo | |||
140 | " *hl-SpellBad* | 140 | " *hl-SpellBad* |
141 | 141 | ||
142 | 142 | ||
143 | " ====================== Important bits ====================== | ||
144 | "exe 'hi Normal guifg='.s:white .' guibg='.s:darkgrey | ||
145 | "exe 'hi String guifg='.s:green .' guibg='.s:darkgrey .' gui=bold' | ||
146 | "exe 'hi Function guifg='.s:violet .' guibg='.s:darkgrey .' gui=none' | ||
147 | "exe 'hi Operator guifg='.s:light_orange .' guibg='.s:darkgrey .' gui=none' | ||
148 | "exe 'hi Type guifg='.s:yellow .' guibg='.s:darkgrey .' gui=bold' | ||
149 | "exe 'hi Number guifg='.s:orange .' guibg='.s:darkgrey .' gui=none' | ||
150 | "exe 'hi Constant guifg='.s:red .' guibg='.s:darkgrey .' gui=none' | ||
151 | "exe 'hi Macro guifg='.s:magenta .' guibg='.s:darkgrey .' gui=none' | ||
152 | "exe 'hi PreProc guifg='.s:grey_blue .' guibg='.s:darkgrey .' gui=none' | ||
153 | "exe 'hi Keyword guifg='.s:light_orange .' guibg='.s:darkgrey .' gui=none' | ||
154 | "exe 'hi Comment guifg='.s:white .' guibg='.s:darkgrey .' gui=italic' | ||
155 | "exe 'hi TODO guifg='.s:grey_blue .' guibg='.s:darkgrey .' gui=italic,bold' | ||
156 | " Lay out our palette | ||
157 | let s:grey_blue = '#8a9597' | ||
158 | let s:light_grey_blue = '#a0a8b0' | ||
159 | let s:dark_grey_blue = '#34383c' | ||
160 | let s:mid_grey_blue = '#64686c' | ||
161 | let s:beige = '#ceb67f' | ||
162 | let s:light_orange = '#ebc471' | ||
163 | let s:yellow = '#e3d796' | ||
164 | let s:violet = '#a982c8' | ||
165 | let s:magenta = '#a933ac' | ||
166 | let s:green = '#e0a96f' | ||
167 | let s:lightgreen = '#c2c98f' | ||
168 | let s:red = '#d08356' | ||
169 | let s:cyan = '#74dad9' | ||
170 | let s:darkgrey = '#1a1a1a' | ||
171 | let s:grey = '#303030' | ||
172 | let s:lightgrey = '#605958' | ||
173 | let s:white = '#fffedc' | ||
174 | let s:orange = '#d08356' | ||
175 | |||
176 | " ~~~ These are specific to color_coded ~~~ | ||
177 | exe 'hi Member guifg=#0000aa gui=italic' | ||
178 | exe 'hi Variable guifg=#8800aa gui=none' | ||
179 | exe 'hi Namespace guifg=#aa0000 gui=none' | ||
180 | exe 'hi EnumConstant guifg=#00aaaa gui=none' | ||
@@ -11,6 +11,8 @@ Plugin 'VundleVim/Vundle.vim' | " Vundle itself (require | |||
11 | Plugin 'cscope_plus.vim' | " run cscope -R -b in project folder then use | 11 | Plugin 'cscope_plus.vim' | " run cscope -R -b in project folder then use |
12 | Plugin 'autoload_cscope.vim' | " CTRL+\ s searches word under cursor, CTRL+T back | 12 | Plugin 'autoload_cscope.vim' | " CTRL+\ s searches word under cursor, CTRL+T back |
13 | Plugin 'tpope/vim-fugitive' | " the most complete GIT integration plugin | 13 | Plugin 'tpope/vim-fugitive' | " the most complete GIT integration plugin |
14 | Plugin 'jeaye/color_coded' | " semantic highlighting with vim | ||
15 | Plugin 'terryma/vim-multiple-cursors' | " displays visual block mode as cursors | ||
14 | 16 | ||
15 | Plugin 'taglist-plus' | " quick code navigator | 17 | Plugin 'taglist-plus' | " quick code navigator |
16 | let Tlist_Compact_Format = 1 | " | 18 | let Tlist_Compact_Format = 1 | " |
@@ -18,7 +20,7 @@ let Tlist_GainFocus_On_ToggleOpen = 1 | " | |||
18 | let Tlist_Close_On_Select = 1 | " | 20 | let Tlist_Close_On_Select = 1 | " |
19 | 21 | ||
20 | Plugin 'Valloric/YouCompleteMe' | " syntax checker and code completion | 22 | Plugin 'Valloric/YouCompleteMe' | " syntax checker and code completion |
21 | let g:ycm_global_ycm_extra_conf = '' | " fallback, right one should be in the applications path | 23 | let g:ycm_global_ycm_extra_conf = '~/.vim/ycm_extra_conf.py' | " fallback, right one should be in the applications path |
22 | let g:ycm_confirm_extra_conf = 0 | " disable 'do you really want to execute .py?' | 24 | let g:ycm_confirm_extra_conf = 0 | " disable 'do you really want to execute .py?' |
23 | let g:ycm_key_select_completion = '<Tab>' | " key completion key | 25 | let g:ycm_key_select_completion = '<Tab>' | " key completion key |
24 | let g:ycm_error_symbol = '✖' | " insert this as an error symbol in the gutter bar | 26 | let g:ycm_error_symbol = '✖' | " insert this as an error symbol in the gutter bar |
@@ -32,7 +34,6 @@ let html_use_css = 1 | " when using :TOhtml no | |||
32 | 34 | ||
33 | call vundle#end() | " required by Vundle | 35 | call vundle#end() | " required by Vundle |
34 | filetype plugin indent on | " required by Vundle | 36 | filetype plugin indent on | " required by Vundle |
35 | behave mswin | ||
36 | "================================================================================ | 37 | "================================================================================ |
37 | " custom config | 38 | " custom config |
38 | colorscheme coderonline | 39 | colorscheme coderonline |
@@ -179,6 +180,11 @@ noremap <silent> <Home> :call ExtendedHome()<CR> | |||
179 | nnoremap <C-z> u | 180 | nnoremap <C-z> u |
180 | 181 | ||
181 | 182 | ||
183 | "map <C-Right> el | ||
184 | "map <C-left> hgel | ||
185 | "vnoremap <C-S-Right> e | ||
186 | "vnoremap <C-S-left> b | ||
187 | |||
182 | 188 | ||
183 | " plugin hotkeys | 189 | " plugin hotkeys |
184 | map <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L | 190 | map <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L |
@@ -215,9 +221,9 @@ nnoremap <F5> :!make<CR>| " classic key binding: press F5 to compil | |||
215 | "nnoremap <C-Tab> <C-PageDown> | 221 | "nnoremap <C-Tab> <C-PageDown> |
216 | "nnoremap <C-S-Tab> <C-PageUp> | 222 | "nnoremap <C-S-Tab> <C-PageUp> |
217 | ":inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>" | 223 | ":inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>" |
218 | "map <Esc>OA k|map <Esc>OB j|map <Esc>OC l|map <Esc>OD h| " allow cursor keys in insert mode | ||
219 | "inoremap <expr> <Esc> pumvisible() ? "\<C-e>" : "\<Esc>" " breaks cursor keys! | 224 | "inoremap <expr> <Esc> pumvisible() ? "\<C-e>" : "\<Esc>" " breaks cursor keys! |
220 | " binding ESC can easily break cursor key movement on the console (tricky, because gvim works) | 225 | " binding ESC can easily break cursor key movement on the console (tricky, because gvim works) |
221 | "inoremap <C-Space> <C-x><C-o> | 226 | "inoremap <C-Space> <C-x><C-o> |
222 | "inoremap <C-@> <C-Space> | 227 | "inoremap <C-@> <C-Space> |
223 | " | 228 | " |
229 | "map <Esc>OA k|map <Esc>OB j|map <Esc>OC l|map <Esc>OD h| " allow cursor keys in insert mode | ||