feat(colors): jellybeans-nvim -> gruvbox-material

1 files changed, 26 insertions, 23 deletions

diff --git a/fnl/nvrc/colors.fnl b/fnl/nvrc/colors.fnl
index b080a5f..9ba8742 100644
--- a/fnl/nvrc/colors.fnl
+++ b/fnl/nvrc/colors.fnl
@@ -1,28 +1,31 @@
-(local colors {:bg "#151515"
-               :bar "#202020"
-               :fg "#cbc0ab"
-               :white "#e8e8d3"
-               :black "#181818"
-               :black2 "#101010"
-               :bblack "#252525"
-               :dgrey "#333333"
-               :mgrey "#444444"
-               :grey2 "#666666"
-               :grey "#888888"
-               :bgrey "#999999"
-               :red "#cf6a4c"
-               :orange "#fabb6e"
-               :yellow "#fad07a"
-               :lyellow "#ffe2a9"
-               :green "#99ad6a"
-               :skyblue "#8fbfdc"
-               :blue "#8197bf"
-               :violet "#c6b6ee"
-               :magenta "#f0a0c0"})
+(import-macros {: setv!} :nvrc.macro.set)
+
+(local colors {:bg "#1d2021"
+               :bar "#32302f"
+               :fg "#d4be98"
+               :white "#e4be98"
+               :black "#1d2021"
+               :bblack "#3c3836"
+               :dgrey "#282828"
+               :mgrey "#504945"
+               :grey "#928374"
+               :red "#ea6962"
+               :orange "#e79a42"
+               :yellow "#d8a657"
+               :green "#a9b665"
+               :skyblue "#89b482"
+               :blue "#7daea3"
+               :violet "#d3869b"})
 
 
 (lambda colors.apply [colorscheme]
   (import-macros {: highlight! : link!} :nvrc.macro.color)
+
+  ; FIXME: introduces unused variables when using other themes
+  (setv! background :dark)
+  (setv! gruvbox_material_background :hard)
+  (setv! gruvbox_material_sign_column_background :none)
+  (setv! gruvbox_material_menu_selection_background :aqua)
   (vim.cmd (.. "colorscheme " colorscheme))
 
   ; Statusline
@@ -36,7 +39,7 @@
   (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})
+  (highlight! :StatusLineFileData {:fg (. colors :violet) :bg (. colors :bar) :bold true})
 
   ; Buffer
   (highlight! :EndOfBuffer {:fg (. colors :bar)})
@@ -82,7 +85,7 @@
   ; Misc
   (highlight! :TabLine {:fg (. colors :fg) :bg (. colors :mgrey)})
   (highlight! :TabLineFill {:fg (. colors :fg) :bg (. colors :bar)})
-  (highlight! :TabLineSel {:fg (. colors :fg) :bg (. colors :grey2)})
+  (highlight! :TabLineSel {:fg (. colors :fg) :bg (. colors :dgrey)})
   (highlight! :LineNr {:fg (. colors :grey)})
   (highlight! :NvimInternalError {:fg (. colors :red)})
   (highlight! :VertSplit {:fg (. colors :grey2)}))