xonecas.io
2780
D2

dotfiles-2014 / commit 9867926

Trying out badwolf + lightline

* Needs a lot more work.

sean2015-10-06 98679265b612ee9fadadaf34823c98df9058843e parent 8ac1b50

2 files changed

vim_plugins.txt+3−2
@@ -1,10 +1,11 @@
1-https://github.com/bling/vim-airline.git
1+https://github.com/hynek/vim-python-pep8-indent.git
2+https://github.com/itchyny/lightline.vim.git
23 https://github.com/jelera/vim-javascript-syntax.git
34 https://github.com/kchmck/vim-coffee-script.git
45 https://github.com/kien/ctrlp.vim.git
56 https://github.com/pangloss/vim-javascript.git
67 https://github.com/scrooloose/nerdcommenter.git
78 https://github.com/scrooloose/syntastic.git
9+https://github.com/sjl/badwolf.git
810 https://github.com/tpope/vim-fugitive.git
911 https://github.com/tpope/vim-haml.git
10-https://github.com/altercation/vim-colors-solarized.git
vimrc+211−6
@@ -20,7 +20,7 @@ set autoread
2020 set hidden
2121 set wildmenu
2222 set wildmode=list:longest,full
23-set wildignore=*.class,*.o,*~,*.pyc,.git,third_party,node_modules,bower_components,static_root
23+"set wildignore=*.class,*.o,*~,*.pyc,.git,third_party,node_modules,bower_components,static_root
2424 set laststatus=2
2525 set list
2626 set lcs=tab:▸\ ,trail:·,eol:¬,nbsp:_
@@ -50,17 +50,15 @@ command! W w
5050 " Colors
5151 set t_Co=256
5252 set t_ut=
53-set background=light
54-colorscheme solarized
53+set background=dark
54+colorscheme badwolf
5555
5656
5757 " Plugin stuff
58-let g:airline_theme="solarized"
59-let g:airline_powerline_fonts = 1
6058 let g:syntastic_javascript_checkers = ['jshint']
6159 let g:syntastic_python_checkers = ['pep8']
6260 let g:syntastic_sass_checkers = ['scss_lint']
63-let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend|min\.js|min\.css)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py|static_root'
61+"let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend|min\.js|min\.css)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py|static_root'
6462
6563
6664 " The Silver Searcher
@@ -86,3 +84,210 @@ autocmd BufNewFile,BufRead *.py :set ts=4 sw=4
8684 autocmd BufNewFile,BufRead *.html :set ts=2 sw=2 filetype=htmldjango
8785 autocmd BufNewFile,BufRead *.js,*.scss :set ts=2 sw=2
8886 autocmd BufNewFile,BufRead *.json setfiletype json syntax=javascript
87+
88+
89+" lightline - badwolf
90+let s:red = '#ff2c4b'
91+let s:green = '#aeee00'
92+let s:blue = '#0a9dff'
93+let s:orange = '#ffa724'
94+let s:c_red = '196'
95+let s:c_green = '154'
96+let s:c_blue = '39'
97+let s:c_orange = '214'
98+let s:white = '#f8f6f2'
99+let s:c_white = '15'
100+let s:black1 = '#242321'
101+let s:black2 = '#35322d'
102+let s:black3 = '#45413b'
103+let s:black4 = '#857f78'
104+let s:c_black1 = '235'
105+let s:c_black2 = '236'
106+let s:c_black3 = '233'
107+let s:c_black4 = '243'
108+let s:p = {
109+ \ 'normal':{},
110+ \ 'inactive':{},
111+ \ 'insert':{},
112+ \ 'replace':{},
113+ \ 'visual':{},
114+ \ 'tabline':{}
115+ \ }
116+let s:p.normal.middle = [
117+ \ [s:white, s:black1, s:c_white, s:c_black1]
118+ \ ]
119+let s:p.normal.left = [
120+ \ [s:black1, s:green, s:c_black1, s:c_green],
121+ \ [ s:white, s:black2, s:c_white, s:c_black2 ]
122+ \ ]
123+let s:p.normal.right = [
124+ \ [s:black4, s:white, s:c_black4, s:c_white],
125+ \ [ s:white, s:black2, s:c_white, s:c_black2 ]
126+ \ ]
127+let s:p.insert.left = [
128+ \ [s:white, s:blue, s:c_white, s:c_blue],
129+ \ [ s:white, s:black2, s:c_white, s:c_black2 ]
130+ \ ]
131+let s:p.visual.left = [
132+ \ [s:white, s:orange, s:c_white, s:c_orange],
133+ \ [ s:white, s:black2, s:c_white, s:c_black2 ]
134+ \ ]
135+let s:p.replace.left = [
136+ \ [s:white, s:red, s:c_white, s:c_red],
137+ \ [ s:white, s:black2, s:c_white, s:c_black2 ]
138+ \ ]
139+let s:p.inactive.middle = [
140+ \ [s:white, s:black2, s:c_white, s:c_black2]
141+ \ ]
142+let s:p.inactive.right = [
143+ \ s:p.inactive.middle[0],
144+ \ s:p.inactive.middle[0]
145+ \ ]
146+let s:p.inactive.left = [
147+ \ s:p.inactive.middle[0],
148+ \ s:p.inactive.middle[0]
149+ \ ]
150+let s:p.tabline.middle = [
151+ \ [s:white, s:black2, s:c_white, s:c_black2]
152+ \ ]
153+let s:p.tabline.right = [
154+ \ [s:white, s:black2, s:c_white, s:c_black2]
155+ \ ]
156+let s:p.tabline.left = [
157+ \ [s:black4, s:black2, s:c_black4, s:c_black2]
158+ \ ]
159+" current tab
160+let s:p.tabline.tabsel = [
161+ \ [s:black1, s:green, s:c_white, s:c_black4]
162+ \ ]
163+let g:lightline#colorscheme#badwolf#palette = lightline#colorscheme#fill(s:p)
164+
165+
166+let g:lightline = {
167+ \ 'colorscheme': 'badwolf',
168+ \ 'active': {
169+ \ 'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ], ['ctrlpmark'] ],
170+ \ 'right': [ [ 'syntastic', 'lineinfo' ], ['percent'], [ 'fileformat', 'fileencoding', 'filetype' ] ]
171+ \ },
172+ \ 'component_function': {
173+ \ 'fugitive': 'LightLineFugitive',
174+ \ 'filename': 'LightLineFilename',
175+ \ 'fileformat': 'LightLineFileformat',
176+ \ 'filetype': 'LightLineFiletype',
177+ \ 'fileencoding': 'LightLineFileencoding',
178+ \ 'mode': 'LightLineMode',
179+ \ 'ctrlpmark': 'CtrlPMark',
180+ \ },
181+ \ 'component_expand': {
182+ \ 'syntastic': 'SyntasticStatuslineFlag',
183+ \ },
184+ \ 'component_type': {
185+ \ 'syntastic': 'error',
186+ \ },
187+ \ 'subseparator': { 'left': '|', 'right': '|' }
188+ \ }
189+
190+function! LightLineModified()
191+ return &ft =~ 'help' ? '' : &modified ? '+' : &modifiable ? '' : '-'
192+endfunction
193+
194+function! LightLineReadonly()
195+ return &ft !~? 'help' && &readonly ? 'RO' : ''
196+endfunction
197+
198+function! LightLineFilename()
199+ let fname = expand('%:t')
200+ return fname == 'ControlP' ? g:lightline.ctrlp_item :
201+ \ fname == '__Tagbar__' ? g:lightline.fname :
202+ \ fname =~ '__Gundo\|NERD_tree' ? '' :
203+ \ &ft == 'vimfiler' ? vimfiler#get_status_string() :
204+ \ &ft == 'unite' ? unite#get_status_string() :
205+ \ &ft == 'vimshell' ? vimshell#get_status_string() :
206+ \ ('' != LightLineReadonly() ? LightLineReadonly() . ' ' : '') .
207+ \ ('' != fname ? fname : '[No Name]') .
208+ \ ('' != LightLineModified() ? ' ' . LightLineModified() : '')
209+endfunction
210+
211+function! LightLineFugitive()
212+ try
213+ if expand('%:t') !~? 'Tagbar\|Gundo\|NERD' && &ft !~? 'vimfiler' && exists('*fugitive#head')
214+ let mark = '' " edit here for cool mark
215+ let _ = fugitive#head()
216+ return strlen(_) ? mark._ : ''
217+ endif
218+ catch
219+ endtry
220+ return ''
221+endfunction
222+
223+function! LightLineFileformat()
224+ return winwidth(0) > 70 ? &fileformat : ''
225+endfunction
226+
227+function! LightLineFiletype()
228+ return winwidth(0) > 70 ? (strlen(&filetype) ? &filetype : 'no ft') : ''
229+endfunction
230+
231+function! LightLineFileencoding()
232+ return winwidth(0) > 70 ? (strlen(&fenc) ? &fenc : &enc) : ''
233+endfunction
234+
235+function! LightLineMode()
236+ let fname = expand('%:t')
237+ return fname == '__Tagbar__' ? 'Tagbar' :
238+ \ fname == 'ControlP' ? 'CtrlP' :
239+ \ fname == '__Gundo__' ? 'Gundo' :
240+ \ fname == '__Gundo_Preview__' ? 'Gundo Preview' :
241+ \ fname =~ 'NERD_tree' ? 'NERDTree' :
242+ \ &ft == 'unite' ? 'Unite' :
243+ \ &ft == 'vimfiler' ? 'VimFiler' :
244+ \ &ft == 'vimshell' ? 'VimShell' :
245+ \ winwidth(0) > 60 ? lightline#mode() : ''
246+endfunction
247+
248+function! CtrlPMark()
249+ if expand('%:t') =~ 'ControlP'
250+ call lightline#link('iR'[g:lightline.ctrlp_regex])
251+ return lightline#concatenate([g:lightline.ctrlp_prev, g:lightline.ctrlp_item
252+ \ , g:lightline.ctrlp_next], 0)
253+ else
254+ return ''
255+ endif
256+endfunction
257+
258+let g:ctrlp_status_func = {
259+ \ 'main': 'CtrlPStatusFunc_1',
260+ \ 'prog': 'CtrlPStatusFunc_2',
261+ \ }
262+
263+function! CtrlPStatusFunc_1(focus, byfname, regex, prev, item, next, marked)
264+ let g:lightline.ctrlp_regex = a:regex
265+ let g:lightline.ctrlp_prev = a:prev
266+ let g:lightline.ctrlp_item = a:item
267+ let g:lightline.ctrlp_next = a:next
268+ return lightline#statusline(0)
269+endfunction
270+
271+function! CtrlPStatusFunc_2(str)
272+ return lightline#statusline(0)
273+endfunction
274+
275+let g:tagbar_status_func = 'TagbarStatusFunc'
276+
277+function! TagbarStatusFunc(current, sort, fname, ...) abort
278+ let g:lightline.fname = a:fname
279+ return lightline#statusline(0)
280+endfunction
281+
282+augroup AutoSyntastic
283+ autocmd!
284+ autocmd BufWritePost *.c,*.cpp call s:syntastic()
285+augroup END
286+function! s:syntastic()
287+ SyntasticCheck
288+ call lightline#update()
289+endfunction
290+
291+let g:unite_force_overwrite_statusline = 0
292+let g:vimfiler_force_overwrite_statusline = 0
293+let g:vimshell_force_overwrite_statusline = 0