Skip to content

Commit 4538568

Browse files
tuxcanflytuxcanfly
committed
update
1 parent 65f5c8e commit 4538568

File tree

5 files changed

+195
-254
lines changed

5 files changed

+195
-254
lines changed

‎.vim/.vimrc

+15-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ Plug 'joshdick/onedark.vim'
2525
Plug 'Chiel92/vim-autoformat'
2626
Plug 'skwp/greplace.vim'
2727
Plug 'chriskempson/base16-vim'
28+
Plug 'pangloss/vim-javascript'
29+
Plug 'mxw/vim-jsx'
30+
Plug 'ternjs/tern_for_vim'
31+
Plug 'leshill/vim-json'
32+
Plug 'jpalardy/vim-slime'
2833
Plug 'junegunn/vim-easy-align'
2934
Plug 'junegunn/goyo.vim'
3035
Plug 'junegunn/fzf.vim'
@@ -79,8 +84,17 @@ let g:go_snippet_engine = "neosnippet"
7984
let g:go_doc_keywordprg_enabled = 0
8085
let g:airline_powerline_fonts = 1
8186
let g:go_fmt_command = "goimports"
87+
let g:javascript_plugin_flow = 1
88+
let g:jsx_ext_required = 0
89+
let g:slime_target = "tmux"
90+
if exists("$TMUX")
91+
let g:slime_default_config = {"socket_name": split($TMUX, ",")[0], "target_pane": ":.2"}
92+
endif
93+
let g:jedi#goto_command = "gd"
94+
let g:tern_map_keys = 1
95+
let g:tern_show_argument_hints = "on_hold"
8296

83-
colorscheme gruvbox
97+
colorscheme spacegray
8498

8599
autocmd FileType go setlocal noexpandtab
86100

‎.vim/colors/spacegray.vim

+159
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
" SpaceGray.vim -- Vim colorscheme.
2+
" Maintainer: Akshay Hegde (github.com/ajh17)
3+
" Version: 1.4
4+
" A colorscheme loosely modeled after the spacegray theme for Xcode.
5+
" This colorscheme is 256color and up only.
6+
7+
" Setup {{{1
8+
hi clear
9+
10+
if exists('syntax_on')
11+
syntax reset
12+
endif
13+
14+
if !exists('g:spacegray_underline_search')
15+
let g:spacegray_underline_search = 0
16+
endif
17+
18+
if !exists('g:spacegray_italicize_comments')
19+
let g:spacegray_italicize_comments = 0
20+
endif
21+
22+
set background=dark
23+
let colors_name = 'spacegray'
24+
25+
" Colorscheme definitions {{{1
26+
hi Normal ctermbg=233 ctermfg=250 guibg=#111314 guifg=#B3B8C4 cterm=NONE gui=NONE
27+
hi Conceal ctermbg=NONE ctermfg=250 guibg=NONE guifg=#B3B8C4 cterm=NONE gui=NONE
28+
29+
if g:spacegray_italicize_comments
30+
hi Comment ctermbg=NONE ctermfg=59 guibg=NONE guifg=#515F6A cterm=italic gui=italic
31+
else
32+
hi Comment ctermbg=NONE ctermfg=59 guibg=NONE guifg=#515F6A cterm=NONE gui=NONE
33+
endif
34+
hi NonText ctermbg=NONE ctermfg=8 guibg=NONE guifg=#3E4853 cterm=NONE gui=NONE
35+
hi Title ctermbg=NONE ctermfg=231 guibg=NONE guifg=#FFFFFF cterm=NONE gui=NONE
36+
37+
hi Constant ctermbg=NONE ctermfg=130 guibg=NONE guifg=#C5735E cterm=NONE gui=NONE
38+
hi Function ctermbg=NONE ctermfg=9 guibg=NONE guifg=#CC6666 cterm=NONE gui=NONE
39+
hi Identifier ctermbg=NONE ctermfg=179 guibg=NONE guifg=#E5C078 cterm=NONE gui=NONE
40+
hi PreProc ctermbg=NONE ctermfg=109 guibg=NONE guifg=#85A7A5 cterm=NONE gui=NONE
41+
hi Special ctermbg=NONE ctermfg=103 guibg=NONE guifg=#7D8FA3 cterm=NONE gui=NONE
42+
hi SpecialKey ctermbg=NONE ctermfg=59 guibg=NONE guifg=#4C5966 cterm=NONE gui=NONE
43+
hi Statement ctermbg=NONE ctermfg=13 guibg=NONE guifg=#A57A9E cterm=NONE gui=NONE
44+
hi String ctermbg=NONE ctermfg=107 guibg=NONE guifg=#95B47B cterm=NONE gui=NONE
45+
hi Type ctermbg=NONE ctermfg=179 guibg=NONE guifg=#E5C078 cterm=NONE gui=NONE
46+
47+
hi Cursor ctermbg=NONE ctermfg=NONE guibg=#6C6C6C guifg=NONE cterm=NONE gui=NONE
48+
hi CursorColumn ctermbg=0 ctermfg=NONE guibg=#303030 guifg=NONE cterm=NONE gui=NONE
49+
hi CursorLine ctermbg=0 ctermfg=NONE guibg=#303030 guifg=NONE cterm=NONE gui=NONE
50+
hi ColorColumn ctermbg=235 ctermfg=NONE guibg=#303537 guifg=NONE cterm=NONE gui=NONE
51+
hi SignColumn ctermbg=233 ctermfg=250 guibg=#141617 guifg=#B3B8C4 cterm=NONE gui=NONE
52+
53+
hi Todo ctermbg=NONE ctermfg=NONE guibg=NONE guifg=NONE cterm=reverse gui=reverse
54+
hi Error ctermbg=52 ctermfg=12 guibg=NONE guifg=#AF5F5F cterm=underline gui=reverse
55+
hi ErrorMsg ctermbg=NONE ctermfg=9 guibg=NONE guifg=#C5735E cterm=NONE gui=NONE
56+
hi Question ctermbg=NONE ctermfg=214 guibg=NONE guifg=#FFAF00 cterm=NONE gui=NONE
57+
hi ModeMsg ctermbg=NONE ctermfg=249 guibg=NONE guifg=#808080 cterm=NONE gui=NONE
58+
hi MoreMsg ctermbg=NONE ctermfg=249 guibg=NONE guifg=#808080 cterm=NONE gui=NONE
59+
hi WarningMsg ctermbg=NONE ctermfg=12 guibg=NONE guifg=#7D8FA3 cterm=NONE gui=NONE
60+
61+
hi DiffAdd ctermbg=65 ctermfg=232 guibg=#5F875F guifg=#080808 cterm=NONE gui=NONE
62+
hi DiffChange ctermbg=237 ctermfg=NONE guibg=#3A3A3A guifg=NONE cterm=NONE gui=NONE
63+
hi DiffDelete ctermbg=234 ctermfg=9 guibg=NONE guifg=#CC6666 cterm=NONE gui=NONE
64+
hi DiffText ctermbg=60 ctermfg=251 guibg=#5F5F87 guifg=#D0D0D0 cterm=NONE gui=NONE
65+
66+
hi helpLeadBlank ctermbg=NONE ctermfg=NONE guibg=NONE guifg=NONE cterm=NONE gui=NONE
67+
hi helpNormal ctermbg=NONE ctermfg=NONE guibg=NONE guifg=NONE cterm=NONE gui=NONE
68+
69+
hi LineNr ctermbg=NONE ctermfg=8 guibg=#111314 guifg=#3E4853 cterm=NONE gui=NONE
70+
hi CursorLineNr ctermbg=NONE ctermfg=243 guibg=NONE guifg=#808080 cterm=NONE gui=NONE
71+
72+
hi Pmenu ctermbg=233 ctermfg=137 guibg=#171717 guifg=#E8A973 cterm=none gui=NONE
73+
hi PmenuSel ctermbg=234 ctermfg=196 guibg=#252525 guifg=#FF2A1F cterm=bold gui=bold
74+
hi PmenuSbar ctermbg=233 ctermfg=000 guibg=#333233 guifg=#000000 cterm=NONE gui=none
75+
hi PmenuThumb ctermbg=235 ctermfg=137 guibg=NONE guifg=#171717 cterm=none gui=none
76+
77+
hi WildMenu ctermbg=110 ctermfg=235 guibg=#8FAFD7 guifg=#141617 cterm=bold gui=bold
78+
79+
hi StatusLine ctermbg=235 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
80+
hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=italic
81+
82+
hi Underlined ctermbg=NONE ctermfg=66 guibg=NONE guifg=#5F8787 cterm=NONE gui=NONE
83+
hi Ignore ctermbg=NONE ctermfg=250 guibg=NONE guifg=#BCBCBC cterm=NONE gui=NONE
84+
85+
hi Visual ctermbg=236 ctermfg=NONE guibg=#404040 guifg=NONE cterm=NONE gui=NONE
86+
hi VisualNOS ctermbg=8 ctermfg=NONE guibg=NONE guifg=NONE cterm=bold gui=bold
87+
88+
hi FoldColumn ctermbg=NONE ctermfg=242 guibg=#1C1C1C guifg=#6C6C6C cterm=NONE gui=NONE
89+
hi Folded ctermbg=NONE ctermfg=242 guibg=#1C1C1C guifg=#6C6C6C cterm=NONE gui=NONE
90+
hi VertSplit ctermbg=238 ctermfg=238 guibg=#444444 guifg=#444444 cterm=NONE gui=NONE
91+
92+
hi IncSearch ctermbg=9 ctermfg=0 guibg=#AF5F5F guifg=#141617 cterm=NONE gui=NONE
93+
if g:spacegray_underline_search
94+
hi Search ctermbg=NONE ctermfg=NONE guibg=NONE guifg=NONE cterm=underline,bold gui=underline,bold
95+
else
96+
hi Search ctermbg=2 ctermfg=232 guibg=#919652 guifg=#141617 cterm=NONE gui=NONE
97+
endif
98+
99+
hi TabLine ctermbg=232 ctermfg=249 guibg=#141617 guifg=#B3B8C4 cterm=NONE gui=NONE
100+
hi TabLineFill ctermbg=235 ctermfg=239 guibg=#303537 guifg=#303537 cterm=NONE gui=NONE
101+
hi TabLineSel ctermbg=145 ctermfg=0 guibg=#7D8FA3 guifg=#111314 cterm=NONE gui=NONE
102+
103+
hi Directory ctermbg=NONE ctermfg=24 guibg=NONE guifg=#5FAFAF cterm=NONE gui=NONE
104+
hi MatchParen ctermbg=NONE ctermfg=11 guibg=NONE guifg=#E5C078 cterm=bold gui=bold
105+
106+
hi SpellBad ctermbg=52 ctermfg=9 guibg=#5F0000 guifg=#CC6666 cterm=NONE gui=NONE
107+
hi SpellRare ctermbg=53 ctermfg=13 guibg=#5F005F guifg=#B294BB cterm=NONE gui=NONE
108+
hi SpellCap ctermbg=17 ctermfg=12 guibg=#00005F guifg=#81A2BE cterm=NONE gui=NONE
109+
hi SpellLocal ctermbg=24 ctermfg=14 guibg=#005F5F guifg=#8ABEB7 cterm=NONE gui=NONE
110+
111+
" Highlight Links {{{1
112+
" Most of the links are mercilessly stolen from romainl's amazing Apprentice
113+
" theme. (https://github.com/romainl/Apprentice)
114+
hi link Boolean Constant
115+
hi link Character Constant
116+
hi link Number Constant
117+
118+
hi link Float Number
119+
120+
hi link Define Preproc
121+
hi link Include Preproc
122+
hi link Macro Preproc
123+
hi link PreCondit PreProc
124+
125+
hi link Conditional Statement
126+
hi link Exception Statement
127+
hi link HelpCommand Statement
128+
hi link HelpExample Statement
129+
hi link Keyword Statement
130+
hi link Label Statement
131+
hi link Operator Statement
132+
hi link Repeat Statement
133+
134+
hi link StorageClass Type
135+
hi link Structure Type
136+
hi link Typedef Type
137+
138+
hi link Debug Special
139+
hi link Delimiter Special
140+
hi link SpecialChar Special
141+
hi link SpecialComment Special
142+
hi link Tag Special
143+
144+
" HTML
145+
hi link htmlEndTag htmlTagName
146+
hi link htmlLink Function
147+
hi link htmlSpecialTagName htmlTagName
148+
hi link htmlTag htmlTagName
149+
150+
" Rails
151+
hi link rubyRailsARAssociationMethod Statement
152+
hi link rubyRailsARValidationMethod Statement
153+
hi link rubyRailsARMethod Statement
154+
hi link rubyRailsARCallbackMethod Statement
155+
hi link rubyRailsARClassMethod Statement
156+
157+
" Diff
158+
hi link diffAdded String
159+
hi link diffRemoved Function

‎.vimperatorrc

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"3.16.0 (created: 2017/02/01 00:55:15)
2+
3+
map J :tabprevious<Return>
4+
map K :tabnext<Return>
5+
set hintchars=asdfg;lkjh
6+
set gui+=nonavigation
7+
8+
" vim: set ft=vimperator:

‎.zplug.sh

-166
This file was deleted.

0 commit comments

Comments
 (0)