Skip to content

Commit 59849e3

Browse files
committed
use nvim
1 parent 0a443da commit 59849e3

File tree

4 files changed

+325
-9
lines changed

4 files changed

+325
-9
lines changed

.vim/colors/molokai.vim

+276
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,276 @@
1+
" Vim color file
2+
"
3+
" Author: Tomas Restrepo <[email protected]>
4+
" https://github.com/tomasr/molokai
5+
"
6+
" Note: Based on the Monokai theme for TextMate
7+
" by Wimer Hazenberg and its darker variant
8+
" by Hamish Stuart Macpherson
9+
"
10+
11+
hi clear
12+
13+
if version > 580
14+
" no guarantees for version 5.8 and below, but this makes it stop
15+
" complaining
16+
hi clear
17+
if exists("syntax_on")
18+
syntax reset
19+
endif
20+
endif
21+
let g:colors_name="molokai"
22+
23+
if exists("g:molokai_original")
24+
let s:molokai_original = g:molokai_original
25+
else
26+
let s:molokai_original = 0
27+
endif
28+
29+
30+
hi Boolean guifg=#AE81FF
31+
hi Character guifg=#E6DB74
32+
hi Number guifg=#AE81FF
33+
hi String guifg=#E6DB74
34+
hi Conditional guifg=#F92672 gui=bold
35+
hi Constant guifg=#AE81FF gui=bold
36+
hi Cursor guifg=#000000 guibg=#F8F8F0
37+
hi iCursor guifg=#000000 guibg=#F8F8F0
38+
hi Debug guifg=#BCA3A3 gui=bold
39+
hi Define guifg=#66D9EF
40+
hi Delimiter guifg=#8F8F8F
41+
hi DiffAdd guibg=#13354A
42+
hi DiffChange guifg=#89807D guibg=#4C4745
43+
hi DiffDelete guifg=#960050 guibg=#1E0010
44+
hi DiffText guibg=#4C4745 gui=italic,bold
45+
46+
hi Directory guifg=#A6E22E gui=bold
47+
hi Error guifg=#E6DB74 guibg=#1E0010
48+
hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold
49+
hi Exception guifg=#A6E22E gui=bold
50+
hi Float guifg=#AE81FF
51+
hi FoldColumn guifg=#465457 guibg=#000000
52+
hi Folded guifg=#465457 guibg=#000000
53+
hi Function guifg=#A6E22E
54+
hi Identifier guifg=#FD971F
55+
hi Ignore guifg=#808080 guibg=bg
56+
hi IncSearch guifg=#C4BE89 guibg=#000000
57+
58+
hi Keyword guifg=#F92672 gui=bold
59+
hi Label guifg=#E6DB74 gui=none
60+
hi Macro guifg=#C4BE89 gui=italic
61+
hi SpecialKey guifg=#66D9EF gui=italic
62+
63+
hi MatchParen guifg=#000000 guibg=#FD971F gui=bold
64+
hi ModeMsg guifg=#E6DB74
65+
hi MoreMsg guifg=#E6DB74
66+
hi Operator guifg=#F92672
67+
68+
" complete menu
69+
hi Pmenu guifg=#66D9EF guibg=#000000
70+
hi PmenuSel guibg=#808080
71+
hi PmenuSbar guibg=#080808
72+
hi PmenuThumb guifg=#66D9EF
73+
74+
hi PreCondit guifg=#A6E22E gui=bold
75+
hi PreProc guifg=#A6E22E
76+
hi Question guifg=#66D9EF
77+
hi Repeat guifg=#F92672 gui=bold
78+
hi Search guifg=#000000 guibg=#FFE792
79+
" marks
80+
hi SignColumn guifg=#A6E22E guibg=#232526
81+
hi SpecialChar guifg=#F92672 gui=bold
82+
hi SpecialComment guifg=#7E8E91 gui=bold
83+
hi Special guifg=#66D9EF guibg=bg gui=italic
84+
if has("spell")
85+
hi SpellBad guisp=#FF0000 gui=undercurl
86+
hi SpellCap guisp=#7070F0 gui=undercurl
87+
hi SpellLocal guisp=#70F0F0 gui=undercurl
88+
hi SpellRare guisp=#FFFFFF gui=undercurl
89+
endif
90+
hi Statement guifg=#F92672 gui=bold
91+
hi StatusLine guifg=#455354 guibg=fg
92+
hi StatusLineNC guifg=#808080 guibg=#080808
93+
hi StorageClass guifg=#FD971F gui=italic
94+
hi Structure guifg=#66D9EF
95+
hi Tag guifg=#F92672 gui=italic
96+
hi Title guifg=#ef5939
97+
hi Todo guifg=#FFFFFF guibg=bg gui=bold
98+
99+
hi Typedef guifg=#66D9EF
100+
hi Type guifg=#66D9EF gui=none
101+
hi Underlined guifg=#808080 gui=underline
102+
103+
hi VertSplit guifg=#808080 guibg=#080808 gui=bold
104+
hi VisualNOS guibg=#403D3D
105+
hi Visual guibg=#403D3D
106+
hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold
107+
hi WildMenu guifg=#66D9EF guibg=#000000
108+
109+
hi TabLineFill guifg=#1B1D1E guibg=#1B1D1E
110+
hi TabLine guibg=#1B1D1E guifg=#808080 gui=none
111+
112+
if s:molokai_original == 1
113+
hi Normal guifg=#F8F8F2 guibg=#272822
114+
hi Comment guifg=#75715E
115+
hi CursorLine guibg=#3E3D32
116+
hi CursorLineNr guifg=#FD971F gui=none
117+
hi CursorColumn guibg=#3E3D32
118+
hi ColorColumn guibg=#3B3A32
119+
hi LineNr guifg=#BCBCBC guibg=#3B3A32
120+
hi NonText guifg=#75715E
121+
hi SpecialKey guifg=#75715E
122+
else
123+
hi Normal guifg=#F8F8F2 guibg=#1B1D1E
124+
hi Comment guifg=#7E8E91
125+
hi CursorLine guibg=#293739
126+
hi CursorLineNr guifg=#FD971F gui=none
127+
hi CursorColumn guibg=#293739
128+
hi ColorColumn guibg=#232526
129+
hi LineNr guifg=#465457 guibg=#232526
130+
hi NonText guifg=#465457
131+
hi SpecialKey guifg=#465457
132+
end
133+
134+
"
135+
" Support for 256-color terminal
136+
"
137+
if &t_Co > 255
138+
if s:molokai_original == 1
139+
hi Normal ctermbg=234
140+
hi CursorLine ctermbg=235 cterm=none
141+
hi CursorLineNr ctermfg=208 cterm=none
142+
else
143+
hi Normal ctermfg=252 ctermbg=233
144+
hi CursorLine ctermbg=234 cterm=none
145+
hi CursorLineNr ctermfg=208 cterm=none
146+
endif
147+
hi Boolean ctermfg=135
148+
hi Character ctermfg=144
149+
hi Number ctermfg=135
150+
hi String ctermfg=144
151+
hi Conditional ctermfg=161 cterm=bold
152+
hi Constant ctermfg=135 cterm=bold
153+
hi Cursor ctermfg=16 ctermbg=253
154+
hi Debug ctermfg=225 cterm=bold
155+
hi Define ctermfg=81
156+
hi Delimiter ctermfg=241
157+
158+
hi DiffAdd ctermbg=24
159+
hi DiffChange ctermfg=181 ctermbg=239
160+
hi DiffDelete ctermfg=162 ctermbg=53
161+
hi DiffText ctermbg=102 cterm=bold
162+
163+
hi Directory ctermfg=118 cterm=bold
164+
hi Error ctermfg=219 ctermbg=89
165+
hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold
166+
hi Exception ctermfg=118 cterm=bold
167+
hi Float ctermfg=135
168+
hi FoldColumn ctermfg=67 ctermbg=16
169+
hi Folded ctermfg=67 ctermbg=16
170+
hi Function ctermfg=118
171+
hi Identifier ctermfg=208 cterm=none
172+
hi Ignore ctermfg=244 ctermbg=232
173+
hi IncSearch ctermfg=193 ctermbg=16
174+
175+
hi keyword ctermfg=161 cterm=bold
176+
hi Label ctermfg=229 cterm=none
177+
hi Macro ctermfg=193
178+
hi SpecialKey ctermfg=81
179+
180+
hi MatchParen ctermfg=233 ctermbg=208 cterm=bold
181+
hi ModeMsg ctermfg=229
182+
hi MoreMsg ctermfg=229
183+
hi Operator ctermfg=161
184+
185+
" complete menu
186+
hi Pmenu ctermfg=81 ctermbg=16
187+
hi PmenuSel ctermfg=255 ctermbg=242
188+
hi PmenuSbar ctermbg=232
189+
hi PmenuThumb ctermfg=81
190+
191+
hi PreCondit ctermfg=118 cterm=bold
192+
hi PreProc ctermfg=118
193+
hi Question ctermfg=81
194+
hi Repeat ctermfg=161 cterm=bold
195+
hi Search ctermfg=0 ctermbg=222 cterm=NONE
196+
197+
" marks column
198+
hi SignColumn ctermfg=118 ctermbg=235
199+
hi SpecialChar ctermfg=161 cterm=bold
200+
hi SpecialComment ctermfg=245 cterm=bold
201+
hi Special ctermfg=81
202+
if has("spell")
203+
hi SpellBad ctermbg=52
204+
hi SpellCap ctermbg=17
205+
hi SpellLocal ctermbg=17
206+
hi SpellRare ctermfg=none ctermbg=none cterm=reverse
207+
endif
208+
hi Statement ctermfg=161 cterm=bold
209+
hi StatusLine ctermfg=238 ctermbg=253
210+
hi StatusLineNC ctermfg=244 ctermbg=232
211+
hi StorageClass ctermfg=208
212+
hi Structure ctermfg=81
213+
hi Tag ctermfg=161
214+
hi Title ctermfg=166
215+
hi Todo ctermfg=231 ctermbg=232 cterm=bold
216+
217+
hi Typedef ctermfg=81
218+
hi Type ctermfg=81 cterm=none
219+
hi Underlined ctermfg=244 cterm=underline
220+
221+
hi VertSplit ctermfg=244 ctermbg=232 cterm=bold
222+
hi VisualNOS ctermbg=238
223+
hi Visual ctermbg=235
224+
hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold
225+
hi WildMenu ctermfg=81 ctermbg=16
226+
227+
hi Comment ctermfg=59
228+
hi CursorColumn ctermbg=236
229+
hi ColorColumn ctermbg=236
230+
hi LineNr ctermfg=250 ctermbg=236
231+
hi NonText ctermfg=59
232+
233+
hi SpecialKey ctermfg=59
234+
235+
if exists("g:rehash256") && g:rehash256 == 1
236+
hi Normal ctermfg=252 ctermbg=234
237+
hi CursorLine ctermbg=236 cterm=none
238+
hi CursorLineNr ctermfg=208 cterm=none
239+
240+
hi Boolean ctermfg=141
241+
hi Character ctermfg=222
242+
hi Number ctermfg=141
243+
hi String ctermfg=222
244+
hi Conditional ctermfg=197 cterm=bold
245+
hi Constant ctermfg=141 cterm=bold
246+
247+
hi DiffDelete ctermfg=125 ctermbg=233
248+
249+
hi Directory ctermfg=154 cterm=bold
250+
hi Error ctermfg=222 ctermbg=233
251+
hi Exception ctermfg=154 cterm=bold
252+
hi Float ctermfg=141
253+
hi Function ctermfg=154
254+
hi Identifier ctermfg=208
255+
256+
hi Keyword ctermfg=197 cterm=bold
257+
hi Operator ctermfg=197
258+
hi PreCondit ctermfg=154 cterm=bold
259+
hi PreProc ctermfg=154
260+
hi Repeat ctermfg=197 cterm=bold
261+
262+
hi Statement ctermfg=197 cterm=bold
263+
hi Tag ctermfg=197
264+
hi Title ctermfg=203
265+
hi Visual ctermbg=238
266+
267+
hi Comment ctermfg=244
268+
hi LineNr ctermfg=239 ctermbg=235
269+
hi NonText ctermfg=239
270+
hi SpecialKey ctermfg=239
271+
endif
272+
end
273+
274+
" Must be at the end, because of ctermbg=234 bug.
275+
" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
276+
set background=dark

.vimrc

+44-8
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,26 @@ endif
1414
call plug#begin('~/.vim/plugged')
1515

1616
" My Plugs here:
17+
Plug 'tomasr/molokai'
18+
19+
Plug 'majutsushi/tagbar'
20+
21+
Plug 'Shougo/denite.nvim'
1722

1823
Plug 'junegunn/vim-easy-align'
1924

25+
" Autocomplete
2026
" Group dependencies, vim-snippets depends on ultisnips
21-
Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
27+
Plug 'SirVer/ultisnips'
28+
Plug 'honza/vim-snippets'
29+
30+
if has('nvim')
31+
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
32+
else
33+
Plug 'Shougo/deoplete.nvim'
34+
Plug 'roxma/nvim-yarp'
35+
Plug 'roxma/vim-hug-neovim-rpc'
36+
endif
2237

2338
" Lang
2439
Plug 'elixir-lang/vim-elixir'
@@ -35,8 +50,10 @@ Plug 'pekepeke/titanium-vim'
3550
Plug 'pangloss/vim-javascript'
3651
Plug 'tpope/vim-rails'
3752
Plug 'vim-ruby/vim-ruby'
38-
Plug 'tpope/vim-markdown'
3953

54+
" Markdown
55+
Plug 'godlygeek/tabular',{'for': ['markdown']}
56+
Plug 'plasticboy/vim-markdown',{'for': ['markdown']}
4057

4158
" Fuzzy search
4259
Plug 'Shougo/unite.vim'
@@ -48,7 +65,6 @@ Plug 'mileszs/ack.vim'
4865

4966
" Code completion
5067
Plug 'ervandew/supertab'
51-
Plug 'Shougo/neocomplcache.vim'
5268

5369
" Shell
5470
Plug 'thinca/vim-quickrun'
@@ -84,7 +100,7 @@ call plug#end()
84100
set guifont=Droid\ Sans\ Mono\ 12
85101

86102
" 使用面板
87-
colorscheme lanox
103+
colorscheme molokai
88104

89105
" 256 色
90106
set t_Co=256
@@ -100,7 +116,6 @@ set nocompatible
100116

101117
" Set mouse
102118
set mouse=a
103-
set ttymouse=xterm
104119

105120
" 打開語法效果
106121
syntax on
@@ -265,17 +280,26 @@ endif
265280
" Plugin Settings
266281
"=================
267282

283+
" color molokai
284+
let g:molokai_original = 1
285+
let g:rehash256 = 1
268286

269287
"Emmet settings"
270288
let g:user_emmet_expandabbr_key = '<c-e>'
271289
let g:use_emmet_complete_tag = 1
272290

273-
" neocomplcache
274-
let g:neocomplcache_enable_at_startup = 1
275-
276291
" airline
277292
let g:airline#extensions#tabline#enabled = 1
278293

294+
" tagbar
295+
let g:tagbar_show_linenumbers = 1
296+
297+
" deoplete
298+
let g:deoplete#enable_at_startup = 1
299+
300+
" ctrlp
301+
let g:ctrlp_map = '<c-p>'
302+
let g:ctrlp_cmd = 'CtrlP'
279303

280304
" Snippets
281305
let g:UltiSnipsExpandTrigger="<tab>"
@@ -285,3 +309,15 @@ let g:UltiSnipsJumpBackwardTrigger="<c-z>"
285309
" React.js
286310
let g:jsx_ext_required = 0
287311

312+
" nvim
313+
if !has('nvim')
314+
set ttymouse=xterm2
315+
endif
316+
317+
if exists(':tnoremap')
318+
tnoremap <Esc> <C-\><C-n>
319+
endif
320+
321+
if exists(':tnoremap')
322+
tnoremap <Esc> <C-\><C-n>
323+
endif

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#vimrc-core
1+
#vimrc-core (use neovim)
22

33
###One Step Install (Do you trust me?)
44
command:

0 commit comments

Comments
 (0)