xonecas.io
2780
D2

dotfiles-2014 / commit 04f1299

Base16 colors

sean2015-10-19 04f1299595277881b1bcc0f75535b1b6cd19370f parent 4f064e6

3 files changed

bashrc+2−1
@@ -167,7 +167,8 @@ function __info {
167167 COLOR1=$(tput setaf 1)
168168 COLOR2=$(tput setaf 2)
169169 COLOR3=$(tput setaf 3)
170+CLEAR=$(tput sgr0)
170171 #PS1="$COLOR3[$COLOR2\$(__info)$COLOR3] $COLOR1☠ $COLOR3($COLOR2\w$COLOR3) \$(tput setaf 7)"
171172 LINE1="\[$COLOR1\]┌─\[$COLOR3\][\[$COLOR2\]\$(__info)\[$COLOR3\]]\[$COLOR1\]──\[$COLOR3\](\[$COLOR2\]\w\[$COLOR3\])\n"
172-LINE2="\[$COLOR1\]└─> \[$COLOR3\]✪ \[\$(tput setaf 7)\]"
173+LINE2="\[$COLOR1\]└─> \[$COLOR3\]✭ \[\$CLEAR\]"
173174 PS1="$LINE1$LINE2"
vim_plugins.txt+3−2
@@ -1,3 +1,5 @@
1+https://github.com/airblade/vim-gitgutter.git
2+https://github.com/chriskempson/base16-vim.git
13 https://github.com/hynek/vim-python-pep8-indent.git
24 https://github.com/itchyny/lightline.vim.git
35 https://github.com/jelera/vim-javascript-syntax.git
@@ -5,8 +7,7 @@ https://github.com/kchmck/vim-coffee-script.git
57 https://github.com/kien/ctrlp.vim.git
68 https://github.com/pangloss/vim-javascript.git
79 https://github.com/scrooloose/nerdcommenter.git
10+https://github.com/scrooloose/nerdtree.git
811 https://github.com/scrooloose/syntastic.git
9-https://github.com/sjl/badwolf.git
1012 https://github.com/tpope/vim-fugitive.git
1113 https://github.com/tpope/vim-haml.git
12-https://github.com/airblade/vim-gitgutter.git
vimrc+4−84
@@ -20,7 +20,6 @@ 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
2423 set laststatus=2
2524 set list
2625 set lcs=tab:▸\ ,trail:·,eol:¬,nbsp:_
@@ -35,6 +34,8 @@ map j gj
3534 map k gk
3635 nmap ; :CtrlPBuffer<CR>
3736 nmap ' :CtrlPFile<CR>
37+nmap <leader>n :NERDTreeToggle<CR>
38+
3839 " I always work on 4 or 2 spaces indent files :)
3940 set autoindent
4041 set expandtab
@@ -51,17 +52,13 @@ command! W w
5152 set t_Co=256
5253 set t_ut=
5354 set background=dark
54-colorscheme badwolf
55-let g:badwolf_darkgutter = 1
56-let g:badwolf_html_link_underline = 0
57-let g:badwolf_css_props_highlight = 1
55+colorscheme base16-railscasts
5856
5957
6058 " Plugin stuff
6159 let g:syntastic_javascript_checkers = ['jshint']
6260 let g:syntastic_python_checkers = ['pep8']
6361 let g:syntastic_sass_checkers = ['scss_lint']
64-"let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend|min\.js|min\.css)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py|static_root'
6562
6663
6764 " The Silver Searcher
@@ -89,85 +86,8 @@ autocmd BufNewFile,BufRead *.js,*.scss :set ts=2 sw=2
8986 autocmd BufNewFile,BufRead *.json setfiletype json syntax=javascript
9087
9188
92-" lightline - badwolf
93-let s:red = '#ff2c4b'
94-let s:green = '#aeee00'
95-let s:blue = '#0a9dff'
96-let s:orange = '#ffa724'
97-let s:c_red = '196'
98-let s:c_green = '154'
99-let s:c_blue = '39'
100-let s:c_orange = '214'
101-let s:white = '#f8f6f2'
102-let s:c_white = '15'
103-let s:black1 = '#242321'
104-let s:black2 = '#35322d'
105-let s:black3 = '#45413b'
106-let s:black4 = '#857f78'
107-let s:c_black1 = '235'
108-let s:c_black2 = '236'
109-let s:c_black3 = '233'
110-let s:c_black4 = '243'
111-let s:p = {
112- \ 'normal':{},
113- \ 'inactive':{},
114- \ 'insert':{},
115- \ 'replace':{},
116- \ 'visual':{},
117- \ 'tabline':{}
118- \ }
119-let s:p.normal.middle = [
120- \ [s:white, s:black1, s:c_white, s:c_black1]
121- \ ]
122-let s:p.normal.left = [
123- \ [s:black1, s:green, s:c_black1, s:c_green],
124- \ [ s:white, s:black2, s:c_white, s:c_black2 ]
125- \ ]
126-let s:p.normal.right = [
127- \ [s:black4, s:white, s:c_black4, s:c_white],
128- \ [ s:white, s:black2, s:c_white, s:c_black2 ]
129- \ ]
130-let s:p.insert.left = [
131- \ [s:white, s:blue, s:c_white, s:c_blue],
132- \ [ s:white, s:black2, s:c_white, s:c_black2 ]
133- \ ]
134-let s:p.visual.left = [
135- \ [s:white, s:orange, s:c_white, s:c_orange],
136- \ [ s:white, s:black2, s:c_white, s:c_black2 ]
137- \ ]
138-let s:p.replace.left = [
139- \ [s:white, s:red, s:c_white, s:c_red],
140- \ [ s:white, s:black2, s:c_white, s:c_black2 ]
141- \ ]
142-let s:p.inactive.middle = [
143- \ [s:white, s:black2, s:c_white, s:c_black2]
144- \ ]
145-let s:p.inactive.right = [
146- \ s:p.inactive.middle[0],
147- \ s:p.inactive.middle[0]
148- \ ]
149-let s:p.inactive.left = [
150- \ s:p.inactive.middle[0],
151- \ s:p.inactive.middle[0]
152- \ ]
153-let s:p.tabline.middle = [
154- \ [s:white, s:black2, s:c_white, s:c_black2]
155- \ ]
156-let s:p.tabline.right = [
157- \ [s:white, s:black2, s:c_white, s:c_black2]
158- \ ]
159-let s:p.tabline.left = [
160- \ [s:black4, s:black2, s:c_black4, s:c_black2]
161- \ ]
162-" current tab
163-let s:p.tabline.tabsel = [
164- \ [s:black1, s:green, s:c_white, s:c_black4]
165- \ ]
166-let g:lightline#colorscheme#badwolf#palette = lightline#colorscheme#fill(s:p)
167-
168-
16989 let g:lightline = {
170- \ 'colorscheme': 'badwolf',
90+ \ 'colorscheme': 'base16',
17191 \ 'active': {
17292 \ 'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ], ['ctrlpmark'] ],
17393 \ 'right': [ [ 'syntastic', 'lineinfo' ], ['percent'], [ 'fileformat', 'fileencoding', 'filetype' ] ]