From adc8895c5391e9972e1e1075c9905aff1ff39dbb Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Fri, 25 Jul 2014 10:18:03 -0400
Subject: [PATCH] Pulled lightline theme out of the darkcloud theme and into
 into plugins.vim so the darkcloud theme can be used without requiring
 lightline, and set the colorscheme before loading the user config so it can
 be overridden

---
 vim/colors/darkcloud.vim | 37 -------------------------------------
 vim/config/plugins.vim   | 36 ++++++++++++++++++++++++++++++++++++
 vimrc                    |  6 +++---
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/vim/colors/darkcloud.vim b/vim/colors/darkcloud.vim
index f331eb2..f5426d1 100644
--- a/vim/colors/darkcloud.vim
+++ b/vim/colors/darkcloud.vim
@@ -537,7 +537,6 @@ hi! link SyntasticWarningSign SyntasticWarning
 hi! link qfSeparator Delimiter
 hi! link qfLineNr SyntasticError
 
-"COLOR DEFINITIONS:
 "delete functions {{{
     delf s:X
     delf s:rgb
@@ -549,39 +548,3 @@ hi! link qfLineNr SyntasticError
     delf s:grey_level
     delf s:grey_number
 "}}}
-
-"colour presets (used with lightline) {{{
-    let s:base3 = '#eaeaea'
-    let s:base23 = '#d0d0d0'
-    let s:base2 = '#c6c6c6'
-    let s:base1 = '#b2b2b2'
-    let s:base0 = '#949494'
-    let s:base00 = '#767676'
-    let s:base01 = '#606060'
-    let s:base02 = '#4e4e4e'
-    let s:base023 = '#303030'
-    let s:darkblue = '#005fff'
-    let s:red = '#d75f5f'
-    let s:orange = '#ffaf00'
-    let s:yellow = '#ffd787'
-    let s:green = '#5faf00'
-    let s:cyan = '#d7ffff'
-    let s:blue = '#87d7ff'
-    let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-    let s:p.normal.left = [ [ s:base023, s:blue ], [ s:base3, s:base01 ] ]
-    let s:p.normal.right = [ [ s:base02, s:base1 ], [ s:base2, s:base01 ] ]
-    let s:p.inactive.right = [ [ s:base02, s:base0 ], [ s:base1, s:base01 ] ]
-    let s:p.inactive.left =  [ [ s:base02, s:base0 ], [ s:base00, s:darkblue ] ]
-    let s:p.insert.left = [ [ s:base023, s:red ], [ s:base3, s:base01 ] ]
-    let s:p.replace.left = [ [ s:base023, s:orange ], [ s:base3, s:base01 ] ]
-    let s:p.visual.left = [ [ s:base023, s:yellow ], [ s:base3, s:base01 ] ]
-    let s:p.normal.middle = [ [ s:base1, s:base02 ] ]
-    let s:p.inactive.abmiddle = [ [ s:base0, s:base02 ] ]
-    let s:p.tabline.left = [ [ s:base2, s:base01 ] ]
-    let s:p.tabline.tabsel = [ [ s:base2, s:base023 ] ]
-    let s:p.tabline.middle = [ [ s:base01, s:base1 ] ]
-    let s:p.tabline.right = copy(s:p.normal.right)
-    let s:p.normal.error = [ [ s:red, s:base023 ] ]
-    let s:p.normal.warning = [ [ s:yellow, s:base02 ] ]
-    let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p)
-"}}}
diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim
index c24ec1d..0b26203 100644
--- a/vim/config/plugins.vim
+++ b/vim/config/plugins.vim
@@ -342,4 +342,40 @@
         \   },
         \ }
     endif
+
+    "ligtline theme {{{
+        let s:base3 = '#eaeaea'
+        let s:base23 = '#d0d0d0'
+        let s:base2 = '#c6c6c6'
+        let s:base1 = '#b2b2b2'
+        let s:base0 = '#949494'
+        let s:base00 = '#767676'
+        let s:base01 = '#606060'
+        let s:base02 = '#4e4e4e'
+        let s:base023 = '#303030'
+        let s:darkblue = '#005fff'
+        let s:red = '#d75f5f'
+        let s:orange = '#ffaf00'
+        let s:yellow = '#ffd787'
+        let s:green = '#5faf00'
+        let s:cyan = '#d7ffff'
+        let s:blue = '#87d7ff'
+        let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
+        let s:p.normal.left = [ [ s:base023, s:blue ], [ s:base3, s:base01 ] ]
+        let s:p.normal.right = [ [ s:base02, s:base1 ], [ s:base2, s:base01 ] ]
+        let s:p.inactive.right = [ [ s:base02, s:base0 ], [ s:base1, s:base01 ] ]
+        let s:p.inactive.left =  [ [ s:base02, s:base0 ], [ s:base00, s:darkblue ] ]
+        let s:p.insert.left = [ [ s:base023, s:red ], [ s:base3, s:base01 ] ]
+        let s:p.replace.left = [ [ s:base023, s:orange ], [ s:base3, s:base01 ] ]
+        let s:p.visual.left = [ [ s:base023, s:yellow ], [ s:base3, s:base01 ] ]
+        let s:p.normal.middle = [ [ s:base1, s:base02 ] ]
+        let s:p.inactive.abmiddle = [ [ s:base0, s:base02 ] ]
+        let s:p.tabline.left = [ [ s:base2, s:base01 ] ]
+        let s:p.tabline.tabsel = [ [ s:base2, s:base023 ] ]
+        let s:p.tabline.middle = [ [ s:base01, s:base1 ] ]
+        let s:p.tabline.right = copy(s:p.normal.right)
+        let s:p.normal.error = [ [ s:red, s:base023 ] ]
+        let s:p.normal.warning = [ [ s:yellow, s:base02 ] ]
+        let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p)
+    "}}}
 "}}}
diff --git a/vimrc b/vimrc
index 137b442..55c3d5d 100644
--- a/vimrc
+++ b/vimrc
@@ -37,6 +37,9 @@
     "Load Keymappings:
     runtime config/keyboard.vim
 
+    "Load Colour Scheme:
+    colorscheme darkcloud
+
     "Load User Config:
     runtime vimrc.user
 
@@ -45,7 +48,4 @@
 
     "Load After Config:
     runtime config/after.vim
-
-    "Load Colour Scheme:
-    colorscheme darkcloud
 "}}}