Add useDefaultTerminalColors() to spectral

5 files changed, 48 insertions, 37 deletions

diff --git a/autoload/spectral.vim b/autoload/spectral.vim
index 0284d19..e2b6376 100644
--- a/autoload/spectral.vim
+++ b/autoload/spectral.vim
@@ -248,3 +248,41 @@ function! spectral#Finish()
   python3 spectral_finish()
   exec "source " . s:cache_file
 endfunction
+
+function! spectral#useDefaultTerminalColors() abort
+  if &bg == "dark"
+    let g:terminal_color_0="#282828"
+    let g:terminal_color_1="#cc241d"
+    let g:terminal_color_10="#b8bb26"
+    let g:terminal_color_11="#fabd2f"
+    let g:terminal_color_12="#83a598"
+    let g:terminal_color_13="#d3869b"
+    let g:terminal_color_14="#8ec07c"
+    let g:terminal_color_15="#ebdbb2"
+    let g:terminal_color_2="#98971a"
+    let g:terminal_color_3="#d79921"
+    let g:terminal_color_4="#458588"
+    let g:terminal_color_5="#b16286"
+    let g:terminal_color_6="#689d6a"
+    let g:terminal_color_7="#a89984"
+    let g:terminal_color_8="#928374"
+    let g:terminal_color_9="#fb4934"
+  else
+    let g:terminal_color_0="#dedede"
+    let g:terminal_color_1="#df3c2f"
+    let g:terminal_color_10="#2a3600"
+    let g:terminal_color_11="#3f1b00"
+    let g:terminal_color_12="#2a493e"
+    let g:terminal_color_13="#712d44"
+    let g:terminal_color_14="#003b00"
+    let g:terminal_color_15="#1e1600"
+    let g:terminal_color_2="#485300"
+    let g:terminal_color_3="#5c3400"
+    let g:terminal_color_4="#347073"
+    let g:terminal_color_5="#9a4c71"
+    let g:terminal_color_6="#215b2b"
+    let g:terminal_color_7="#4e4431"
+    let g:terminal_color_8="#65594b"
+    let g:terminal_color_9="#b30005"
+  endif
+endfunction
diff --git a/colors/cooldown.vim b/colors/cooldown.vim
index 20b05fe..62ae356 100644
--- a/colors/cooldown.vim
+++ b/colors/cooldown.vim
@@ -157,3 +157,5 @@ hi! link Operator Yellow1
 hi! link RadiationJavaClass Type
 hi! link RadiationJavaInterface RadiationProtoType
 hi! link Special Orange2
+
+call spectral#useDefaultTerminalColors()
diff --git a/colors/meltdown.vim b/colors/meltdown.vim
index dca7def..4edd316 100644
--- a/colors/meltdown.vim
+++ b/colors/meltdown.vim
@@ -191,3 +191,5 @@ hi! link PreProcEnjinTryVar EnjinCatchVar
 
 hi! link javaImportPackage Sage2
 hi! link javaPackage Sage2
+
+call spectral#useDefaultTerminalColors()
diff --git a/colors/poison.vim b/colors/poison.vim
index 6b14a08..a595b33 100644
--- a/colors/poison.vim
+++ b/colors/poison.vim
@@ -94,52 +94,19 @@ Hi DiagnosticVirtualTextWarn g:_sgold spectral#brighter(g:_sbackground,0.7) ["No
 Hi DiagnosticVirtualTextError #d52a2f spectral#brighter(g:_sbackground,0.7) ["None"] 
 Hi DiagnosticUnderlineWarn None None #ffaf00 ["undercurl"]
 Hi DiagnosticUnderlineError None None #ff0a00 ["undercurl"]
-Hi LineNr spectral#desaturate(g:_syellow,0.2) g:_ssigncol ["Bold"] 
+Hi LineNr g:_sred2 spectral#mix(g:_sbackground,g:_ssigncol) [] 
 Hi ColorColumn g:_ssigncol None 
 Hi SignColumn g:_ssigncol g:_ssigncol 
 Hi NonText g:_sred g:_ssigncol ["Bold","Italic"] 
-Hi VertSplit g:_svertsplit g:_svertsplit ["Bold","Italic"] 
+Hi VertSplit g:_svertsplit g:_svertsplit [] 
+Hi FloatBorder spectral#brighter(g:_snormal,0.6) g:_svertsplit ["Bold"] 
 Hi TabLineFill g:_ssigncol g:_ssigncol 
 Hi TabLine g:_snormal spectral#brighter(g:_ssigncol,1.3) 
 Hi TabLineSel g:_sred g:_sbackground g:_sgreen ["Bold"] 
 
 call spectral#Finish()
 
-if &background == "dark"
-  let g:terminal_color_0="#282828"
-  let g:terminal_color_1="#cc241d"
-  let g:terminal_color_2="#98971a"
-  let g:terminal_color_3="#d79921"
-  let g:terminal_color_4="#458588"
-  let g:terminal_color_5="#b16286"
-  let g:terminal_color_6="#689d6a"
-  let g:terminal_color_7="#a89984"
-  let g:terminal_color_8="#928374"
-  let g:terminal_color_9="#fb4934"
-  let g:terminal_color_10="#b8bb26"
-  let g:terminal_color_11="#fabd2f"
-  let g:terminal_color_12="#83a598"
-  let g:terminal_color_13="#d3869b"
-  let g:terminal_color_14="#8ec07c"
-  let g:terminal_color_15="#ebdbb2"
-else
-  let g:terminal_color_0="#dedede"
-  let g:terminal_color_1="#df3c2f"
-  let g:terminal_color_2="#485300"
-  let g:terminal_color_3="#5c3400"
-  let g:terminal_color_4="#347073"
-  let g:terminal_color_5="#9a4c71"
-  let g:terminal_color_6="#215b2b"
-  let g:terminal_color_7="#4e4431"
-  let g:terminal_color_8="#65594b"
-  let g:terminal_color_9="#b30005"
-  let g:terminal_color_10="#2a3600"
-  let g:terminal_color_11="#3f1b00"
-  let g:terminal_color_12="#2a493e"
-  let g:terminal_color_13="#712d44"
-  let g:terminal_color_14="#003b00"
-  let g:terminal_color_15="#1e1600"
-endif
+call spectral#useDefaultTerminalColors()
 
 hi! link Constant PreProc
 hi! link vimFunction Function
diff --git a/colors/royal.vim b/colors/royal.vim
index 15fafe8..d1bac40 100644
--- a/colors/royal.vim
+++ b/colors/royal.vim
@@ -102,3 +102,5 @@ hi Terminal guibg=#000000 guifg=#e0e0e0
 hi link CurosorLine CursorColumn
 hi link vimFunction Function
 hi link PreProcEnjinAnnotation PreProcEnjinInterface
+
+call spectral#useDefaultTerminalColors()