@@ -13,6 +13,8 @@ source ~/.vim/funcs.vim
13
13
Bundle ' JazzCore/vundle'
14
14
Bundle ' JazzCore/ctrlp-cmatcher'
15
15
Bundle ' JazzCore/ultisnips-snippets'
16
+ Bundle ' JazzCore/mustang-vim'
17
+ Bundle ' JazzCore/vim-hybrid'
16
18
Bundle ' tpope/vim-fugitive'
17
19
Bundle ' tpope/vim-surround'
18
20
Bundle ' tpope/vim-endwise'
@@ -32,7 +34,6 @@ Bundle 'kien/ctrlp.vim'
32
34
Bundle ' tacahiroy/ctrlp-funky'
33
35
Bundle ' mileszs/ack.vim'
34
36
Bundle ' Raimondi/delimitMate'
35
- Bundle ' croaker/mustang-vim'
36
37
Bundle ' telamon/vim-color-github'
37
38
Bundle ' alfredodeza/pytest.vim'
38
39
Bundle ' mbbill/undotree'
@@ -41,7 +42,7 @@ Bundle 'Spaceghost/vim-matchit'
41
42
Bundle ' gregsexton/gitv'
42
43
Bundle ' xolox/vim-session'
43
44
Bundle " myusuf3/numbers.vim"
44
- Bundle " klen/python-mode"
45
+ " Bundle "klen/python-mode"
45
46
Bundle ' Decho'
46
47
Bundle ' bufexplorer.zip'
47
48
" Check it
@@ -132,7 +133,8 @@ set foldopen=block,hor,mark,percent,quickfix,tag " what movements open folds
132
133
133
134
set shortmess += filmnrxoOtT " Abbrev. of messages (avoids 'hit enter')
134
135
135
- colorscheme mustang
136
+ " colorscheme mustang
137
+ colorscheme hybrid
136
138
set background = dark " Assume a dark background
137
139
138
140
highlight clear SignColumn " SignColumn should match background for things like vim-gitgutter
@@ -194,10 +196,23 @@ endif
194
196
set tags = ./tags;/
195
197
196
198
" Set the status line
197
- set stl = % f \ % m \ % r % {fugitive#statusline ()}\ Line:% l /% L[% p %% ]\ Col: % v \ Buf :#% n \ [% b ][0 x% B]
199
+ set statusline = % <% F " File path
200
+ set statusline += \ % 2 *% {&ro ?' RO' :' ' }%*% 4 *% {&mod ?' +' :' ' }% <%* " RO and modification flags. %2 - red, %4 - green
201
+ set statusline += % 3 * \ % {matchstr (fugitive#statusline (),' (\\zs.*\\ze)' )}%* " Fugitive flag. %3 - orange
202
+ set statusline += % = \ % {&fileformat }\ \| " Remaining items are right-aligned. File format
203
+ set statusline += % {&fileencoding }\ \| " Encoding
204
+ set statusline += % {&filetype }\ \| " filetype
205
+ set statusline += % p %% \ \| " % of document
206
+ set statusline += % l: % c \ " Line num and col
207
+
198
208
" tell VIM to always put a status line in, even if there is only one window
199
209
set laststatus = 2
200
210
211
+ " We need to update this colors to match stl background color of the new theme
212
+ autocmd ColorScheme * silent ! call g: SetSTLColors ()
213
+
214
+ call g: SetSTLColors ()
215
+
201
216
" Highlight trailing whitespace (but not in insert mode)
202
217
highlight ExtraWhitespace ctermbg= red guibg= red
203
218
match ExtraWhitespace /\s\+$/
@@ -378,3 +393,5 @@ let g:jedi#auto_initialization = 1
378
393
let g: jedi #goto_command = " <leader>g"
379
394
let g: jedi #get_definition_command = " <leader>d"
380
395
let g: jedi #use_tabs_not_buffers = 0
396
+
397
+ let python_highlight_all= 1
0 commit comments