feat(colors): bg <-> bar

1 files changed, 18 insertions, 18 deletions

diff --git a/fnl/nvrc/colors.fnl b/fnl/nvrc/colors.fnl
index bfc3ebf..b080a5f 100644
--- a/fnl/nvrc/colors.fnl
+++ b/fnl/nvrc/colors.fnl
@@ -1,5 +1,5 @@
-(local colors {:bg "#202020"
-               :nvimbg "#151515"
+(local colors {:bg "#151515"
+               :bar "#202020"
                :fg "#cbc0ab"
                :white "#e8e8d3"
                :black "#181818"
@@ -26,20 +26,20 @@
   (vim.cmd (.. "colorscheme " colorscheme))
 
   ; Statusline
-  (highlight! :StatusLine {:fg (. colors :fg) :bg (. colors :bg)})
+  (highlight! :StatusLine {:fg (. colors :fg) :bg (. colors :bar)})
   (highlight! :StatusLineNC {:fg (. colors :grey) :bg (. colors :black) :underline true})
-  (highlight! :StatusLinePad {:fg (. colors :skyblue) :bg (. colors :bg)})
-  (highlight! :StatusLineAccent {:fg (. colors :green) :bg (. colors :bg)})
-  (highlight! :StatusLineInsertAccent {:fg (. colors :red) :bg (. colors :bg)})
-  (highlight! :StatusLineVisualAccent {:fg (. colors :yellow) :bg (. colors :bg)})
-  (highlight! :StatusLineReplaceAccent {:fg (. colors :violet) :bg (. colors :bg)})
-  (highlight! :StatusLineCmdLineAccent {:fg (. colors :green) :bg (. colors :bg)})
-  (highlight! :StatusLineTerminalAccent {:fg (. colors :skyblue) :bg (. colors :bg)})
-  (highlight! :StatusLineFile {:fg (. colors :orange) :bg (. colors :bg) :bold true})
-  (highlight! :StatusLineFileData {:fg (. colors :magenta) :bg (. colors :bg) :bold true})
+  (highlight! :StatusLinePad {:fg (. colors :skyblue) :bg (. colors :bar)})
+  (highlight! :StatusLineAccent {:fg (. colors :green) :bg (. colors :bar)})
+  (highlight! :StatusLineInsertAccent {:fg (. colors :red) :bg (. colors :bar)})
+  (highlight! :StatusLineVisualAccent {:fg (. colors :yellow) :bg (. colors :bar)})
+  (highlight! :StatusLineReplaceAccent {:fg (. colors :violet) :bg (. colors :bar)})
+  (highlight! :StatusLineCmdLineAccent {:fg (. colors :green) :bg (. colors :bar)})
+  (highlight! :StatusLineTerminalAccent {:fg (. colors :skyblue) :bg (. colors :bar)})
+  (highlight! :StatusLineFile {:fg (. colors :orange) :bg (. colors :bar) :bold true})
+  (highlight! :StatusLineFileData {:fg (. colors :magenta) :bg (. colors :bar) :bold true})
 
   ; Buffer
-  (highlight! :EndOfBuffer {:fg (. colors :bg)})
+  (highlight! :EndOfBuffer {:fg (. colors :bar)})
   (highlight! :FloatBorder {:fg (. colors :blue)})
   (highlight! :NormalFloat {:bg (. colors :bblack)})
 
@@ -58,10 +58,10 @@
   (highlight! :DiagnosticWarn {:fg (. colors :yellow)})
   (highlight! :DiagnosticInfo {:fg (. colors :green)})
   (highlight! :DiagnosticHint {:fg (. colors :grey)})
-  (highlight! :DiagnosticSignError {:fg (. colors :red) :bg (. colors :bg)})
-  (highlight! :DiagnosticSignWarn {:fg (. colors :yellow) :bg (. colors :bg)})
-  (highlight! :DiagnosticSignInfo {:fg (. colors :green) :bg (. colors :bg)})
-  (highlight! :DiagnosticSignHint {:fg (. colors :grey) :bg (. colors :bg)})
+  (highlight! :DiagnosticSignError {:fg (. colors :red) :bg (. colors :bar)})
+  (highlight! :DiagnosticSignWarn {:fg (. colors :yellow) :bg (. colors :bar)})
+  (highlight! :DiagnosticSignInfo {:fg (. colors :green) :bg (. colors :bar)})
+  (highlight! :DiagnosticSignHint {:fg (. colors :grey) :bg (. colors :bar)})
   (highlight! :LspReferenceRead {:underline true})
   (highlight! :LspReferenceText {:underline true})
   (highlight! :LspReferenceWrite {:underline true})
@@ -81,7 +81,7 @@
 
   ; Misc
   (highlight! :TabLine {:fg (. colors :fg) :bg (. colors :mgrey)})
-  (highlight! :TabLineFill {:fg (. colors :fg) :bg (. colors :bg)})
+  (highlight! :TabLineFill {:fg (. colors :fg) :bg (. colors :bar)})
   (highlight! :TabLineSel {:fg (. colors :fg) :bg (. colors :grey2)})
   (highlight! :LineNr {:fg (. colors :grey)})
   (highlight! :NvimInternalError {:fg (. colors :red)})