deleted sbt, vim-color-solorized, set zsh path according to OS
This commit is contained in:
parent
e3086e95db
commit
f2aad6a9b3
@ -1,4 +1,9 @@
|
|||||||
" Set the shell to bash so we inherit its path, to make sure
|
" Set the shell to bash so we inherit its path, to make sure
|
||||||
" we inherit its path. This affects :Rtags finding the right
|
" we inherit its path. This affects :Rtags finding the right
|
||||||
" path to homebrewed ctags rather than the XCode version of ctags
|
" path to homebrewed ctags rather than the XCode version of ctags
|
||||||
set shell=/usr/bin/zsh\ -l
|
if has('win32')
|
||||||
|
elseif has('mac')
|
||||||
|
set shell=/usr/local/bin/zsh\ -l
|
||||||
|
elseif has('unix')
|
||||||
|
set shell=/usr/bin/zsh\ -l
|
||||||
|
endif
|
||||||
|
@ -1,31 +1,31 @@
|
|||||||
" Make it beautiful - colors and fonts
|
"" Make it beautiful - colors and fonts
|
||||||
|
|
||||||
if has("gui_running")
|
"if has("gui_running")
|
||||||
"tell the term has 256 colors
|
""tell the term has 256 colors
|
||||||
set t_Co=256
|
"set t_Co=256
|
||||||
|
|
||||||
" Show tab number (useful for Cmd-1, Cmd-2.. mapping)
|
"" Show tab number (useful for Cmd-1, Cmd-2.. mapping)
|
||||||
" For some reason this doesn't work as a regular set command,
|
"" For some reason this doesn't work as a regular set command,
|
||||||
" (the numbers don't show up) so I made it a VimEnter event
|
"" (the numbers don't show up) so I made it a VimEnter event
|
||||||
autocmd VimEnter * set guitablabel=%N:\ %t\ %M
|
"autocmd VimEnter * set guitablabel=%N:\ %t\ %M
|
||||||
|
|
||||||
set lines=60
|
"set lines=60
|
||||||
set columns=190
|
"set columns=190
|
||||||
|
|
||||||
if has("gui_gtk2")
|
"if has("gui_gtk2")
|
||||||
set guifont=Inconsolata\ XL\ 12,Inconsolata\ 15,Monaco\ 12
|
"set guifont=Inconsolata\ XL\ 12,Inconsolata\ 15,Monaco\ 12
|
||||||
else
|
"else
|
||||||
set guifont=Inconsolata\ XL:h17,Inconsolata:h20,Monaco:h17
|
"set guifont=Inconsolata\ XL:h17,Inconsolata:h20,Monaco:h17
|
||||||
end
|
"end
|
||||||
else
|
"else
|
||||||
let g:CSApprox_loaded = 1
|
"let g:CSApprox_loaded = 1
|
||||||
|
|
||||||
" For people using a terminal that is not Solarized
|
"" For people using a terminal that is not Solarized
|
||||||
if exists("g:yadr_using_unsolarized_terminal")
|
"if exists("g:yadr_using_unsolarized_terminal")
|
||||||
let g:solarized_termcolors=256
|
"let g:solarized_termcolors=256
|
||||||
let g:solarized_termtrans=1
|
"let g:solarized_termtrans=1
|
||||||
end
|
"end
|
||||||
endif
|
"endif
|
||||||
|
|
||||||
colorscheme solarized
|
"colorscheme solarized
|
||||||
set background=dark
|
"set background=dark
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
Bundle "chrisbra/color_highlight.git"
|
Bundle "chrisbra/color_highlight.git"
|
||||||
Bundle "skwp/vim-colors-solarized"
|
|
||||||
Bundle "itchyny/lightline.vim"
|
Bundle "itchyny/lightline.vim"
|
||||||
Bundle "jby/tmux.vim.git"
|
Bundle "jby/tmux.vim.git"
|
||||||
Bundle "morhetz/gruvbox"
|
Bundle "morhetz/gruvbox"
|
||||||
|
@ -9,6 +9,5 @@ Bundle 'plasticboy/vim-markdown'
|
|||||||
Bundle 'suan/vim-instant-markdown'
|
Bundle 'suan/vim-instant-markdown'
|
||||||
Bundle 'evanmiller/nginx-vim-syntax'
|
Bundle 'evanmiller/nginx-vim-syntax'
|
||||||
Bundle 'derekwyatt/vim-scala'
|
Bundle 'derekwyatt/vim-scala'
|
||||||
Bundle 'ktvoelker/sbt-vim'
|
|
||||||
Bundle 'scrooloose/nerdcommenter'
|
Bundle 'scrooloose/nerdcommenter'
|
||||||
Bundle 'klen/python-mode'
|
Bundle 'klen/python-mode'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user