about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--fnl/nvrc/colors.fnl21
-rw-r--r--fnl/nvrc/pack.fnl2
2 files changed, 15 insertions, 8 deletions
diff --git a/fnl/nvrc/colors.fnl b/fnl/nvrc/colors.fnl
index bac9140..db0e973 100644
--- a/fnl/nvrc/colors.fnl
+++ b/fnl/nvrc/colors.fnl
@@ -1,12 +1,13 @@
 (import-macros {: setv!} :nvrc.macro.set)
 
-(local colors {:bg "#232323"
-               :light_bg "#363636"
-               :graphite "#717171"
-               :red "#ff668c"
-               :yellow "#fac661"
-               :green "#a8d2a9"
-               :accent "#c2d6f0"})
+(local colors {:bg "#151515"
+               :light_bg "#333333"
+               :graphite "#888888"
+               :fg "#e8e8d3"
+               :red "#cf6a4c"
+               :yellow "#fad07a"
+               :green "#99ad6a"
+               :accent "#8fbfdc"})
 
 
 (lambda colors.apply [colorscheme]
@@ -15,11 +16,17 @@
   (vim.cmd (.. "colorscheme " colorscheme))
 
   ; Statusline
+  (highlight! :StatusLine {:fg (. colors :fg) :bg (. colors :light_bg)})
   (highlight! :StatusLineNC {:fg (. colors :graphite) :bg (. colors :bg) :underline true})
   (highlight! :StatusLineAccent {:fg (. colors :accent) :bg (. colors :light_bg)})
   (highlight! :StatusLineAccentBold {:fg (. colors :accent) :bg (. colors :light_bg) :bold true})
 
   ; LSP
+  (highlight! :DiagnosticError {:fg (. colors :red)})
+  (highlight! :DiagnosticWarn {:fg (. colors :yellow)})
+  (highlight! :DiagnosticInfo {:fg (. colors :green)})
+  (highlight! :DiagnosticHint {:fg (. colors :graphite)})
+
   (highlight! :DiagnosticSignError {:fg (. colors :red) :bg (. colors :light_bg)})
   (highlight! :DiagnosticSignWarn {:fg (. colors :yellow) :bg (. colors :light_bg)})
   (highlight! :DiagnosticSignInfo {:fg (. colors :green) :bg (. colors :light_bg)})
diff --git a/fnl/nvrc/pack.fnl b/fnl/nvrc/pack.fnl
index e9310c3..c54fb01 100644
--- a/fnl/nvrc/pack.fnl
+++ b/fnl/nvrc/pack.fnl
@@ -4,7 +4,7 @@
 (pack! :rktjmp/hotpot.nvim)
 (pack! :lewis6991/impatient.nvim)
 
-(pack! :boppyt/avalanche {:config "require('nvrc.colors').apply('avalanche')"})
+(pack! :nanotech/jellybeans.vim {:config "require('nvrc.colors').apply('jellybeans')"})
 (pack! :nvim-treesitter/nvim-treesitter {:req :treesitter
                                          :requires [(pack :nvim-treesitter/nvim-treesitter-refactor {:after :nvim-treesitter})
                                                     (pack :nvim-treesitter/nvim-treesitter-textobjects {:after :nvim-treesitter})]})