From f2aad6a9b3538c46648ca03d09903afefc584c53 Mon Sep 17 00:00:00 2001
From: Jie Feng <j@rallets.com>
Date: Sun, 26 Mar 2017 03:10:07 +0800
Subject: [PATCH] deleted sbt, vim-color-solorized, set zsh path according to
 OS

---
 vim/settings/path.vim            |  7 ++++-
 vim/settings/yadr-appearance.vim | 50 ++++++++++++++++----------------
 vim/vundles/appearance.vundle    |  1 -
 vim/vundles/languages.vundle     |  1 -
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/vim/settings/path.vim b/vim/settings/path.vim
index 1ca1161..867c31e 100644
--- a/vim/settings/path.vim
+++ b/vim/settings/path.vim
@@ -1,4 +1,9 @@
 " Set the shell to bash so we inherit its path, to make sure
 " we inherit its path. This affects :Rtags finding the right
 " 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
diff --git a/vim/settings/yadr-appearance.vim b/vim/settings/yadr-appearance.vim
index ccf0ab5..02a0d5a 100644
--- a/vim/settings/yadr-appearance.vim
+++ b/vim/settings/yadr-appearance.vim
@@ -1,31 +1,31 @@
-" Make it beautiful - colors and fonts
+"" Make it beautiful - colors and fonts
 
-if has("gui_running")
-  "tell the term has 256 colors
-  set t_Co=256
+"if has("gui_running")
+  ""tell the term has 256 colors
+  "set t_Co=256
 
-  " Show tab number (useful for Cmd-1, Cmd-2.. mapping)
-  " 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
-  autocmd VimEnter * set guitablabel=%N:\ %t\ %M
+  "" Show tab number (useful for Cmd-1, Cmd-2.. mapping)
+  "" 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
+  "autocmd VimEnter * set guitablabel=%N:\ %t\ %M
 
-  set lines=60
-  set columns=190
+  "set lines=60
+  "set columns=190
 
-  if has("gui_gtk2")
-    set guifont=Inconsolata\ XL\ 12,Inconsolata\ 15,Monaco\ 12
-  else
-    set guifont=Inconsolata\ XL:h17,Inconsolata:h20,Monaco:h17
-  end
-else
-  let g:CSApprox_loaded = 1
+  "if has("gui_gtk2")
+    "set guifont=Inconsolata\ XL\ 12,Inconsolata\ 15,Monaco\ 12
+  "else
+    "set guifont=Inconsolata\ XL:h17,Inconsolata:h20,Monaco:h17
+  "end
+"else
+  "let g:CSApprox_loaded = 1
 
-  " For people using a terminal that is not Solarized
-  if exists("g:yadr_using_unsolarized_terminal")
-    let g:solarized_termcolors=256
-    let g:solarized_termtrans=1
-  end
-endif
+  "" For people using a terminal that is not Solarized
+  "if exists("g:yadr_using_unsolarized_terminal")
+    "let g:solarized_termcolors=256
+    "let g:solarized_termtrans=1
+  "end
+"endif
 
-colorscheme solarized
-set background=dark
+"colorscheme solarized
+"set background=dark
diff --git a/vim/vundles/appearance.vundle b/vim/vundles/appearance.vundle
index e2b706c..e1cbd5f 100644
--- a/vim/vundles/appearance.vundle
+++ b/vim/vundles/appearance.vundle
@@ -1,5 +1,4 @@
 Bundle "chrisbra/color_highlight.git"
-Bundle "skwp/vim-colors-solarized"
 Bundle "itchyny/lightline.vim"
 Bundle "jby/tmux.vim.git"
 Bundle "morhetz/gruvbox"
diff --git a/vim/vundles/languages.vundle b/vim/vundles/languages.vundle
index e2d574b..263c4c2 100644
--- a/vim/vundles/languages.vundle
+++ b/vim/vundles/languages.vundle
@@ -9,6 +9,5 @@ Bundle 'plasticboy/vim-markdown'
 Bundle 'suan/vim-instant-markdown'
 Bundle 'evanmiller/nginx-vim-syntax'
 Bundle 'derekwyatt/vim-scala'
-Bundle 'ktvoelker/sbt-vim'
 Bundle 'scrooloose/nerdcommenter'
 Bundle 'klen/python-mode'