From c798b1ee8985ca4d2bb2765a3bcd393f42b713da Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Mon, 13 May 2013 10:07:22 -0500
Subject: [PATCH] Revert "Externalizing color scheme configs outside plugin
 folder" - screwed up command line vim

This reverts commit 20d884b842e60b66bb35ecebcc9c3478707dbcf3.
---
 .../settings/powerline.vim}                   |  0
 .../settings}/solarized.vim                   |  4 ++++
 vim/plugin/settings/yadr-appearance.vim       | 19 +------------------
 3 files changed, 5 insertions(+), 18 deletions(-)
 rename vim/{colors-settings/solarized-powerline.vim => plugin/settings/powerline.vim} (100%)
 rename vim/{colors-settings => plugin/settings}/solarized.vim (95%)

diff --git a/vim/colors-settings/solarized-powerline.vim b/vim/plugin/settings/powerline.vim
similarity index 100%
rename from vim/colors-settings/solarized-powerline.vim
rename to vim/plugin/settings/powerline.vim
diff --git a/vim/colors-settings/solarized.vim b/vim/plugin/settings/solarized.vim
similarity index 95%
rename from vim/colors-settings/solarized.vim
rename to vim/plugin/settings/solarized.vim
index f88e60c7..44098b95 100644
--- a/vim/colors-settings/solarized.vim
+++ b/vim/plugin/settings/solarized.vim
@@ -62,3 +62,7 @@ hi! link htmlLink Include
 hi! CursorLine cterm=NONE gui=NONE
 hi! Visual ctermbg=233
 hi! Type gui=bold
+
+
+" Enforce the colors set here
+au VimEnter * so ~/.vim/plugin/settings/solarized.vim
diff --git a/vim/plugin/settings/yadr-appearance.vim b/vim/plugin/settings/yadr-appearance.vim
index 94ac9b21..15a00c86 100644
--- a/vim/plugin/settings/yadr-appearance.vim
+++ b/vim/plugin/settings/yadr-appearance.vim
@@ -1,24 +1,7 @@
 " Make it beautiful - colors and fonts
 
 " http://ethanschoonover.com/solarized/vim-colors-solarized
-let s:myTheme='solarized'
-exec 'colorscheme ' . s:myTheme
-
-" If there's a custom powerline theme too, load it. Otherwise load the
-" solarized one just so it won't look very bad.
-let s:powerlineCustom="~/.vim/colors-settings/" . s:myTheme . "-powerline.vim"
-if filereadable(expand(s:powerlineCustom))
-  exec "au VimEnter * so " . s:powerlineCustom
-else
-  exec "au VimEnter * so ~/.vim/colors-settings/solarized-powerline.vim"
-endif
-
-let s:colorSchemeCustom="~/.vim/colors-settings/" . s:myTheme . ".vim"
-if filereadable(expand(s:colorSchemeCustom))
-  exec "au VimEnter * so " . s:colorSchemeCustom
-endif
-
-
+colorscheme solarized
 set background=dark
 
 if has("gui_running")