From d0257e5b13b6d30a3a74a183d08a766540b62a74 Mon Sep 17 00:00:00 2001
From: amelia squires <ameliasquires@disroot.org>
Date: Tue, 4 Mar 2025 20:51:17 -0600
Subject: theming

---
 fnl/defaults.fnl        |  2 +-
 fnl/opt.fnl             | 19 +++++++------------
 fnl/plugins/lualine.fnl |  5 +----
 fnl/settings-ui.fnl     |  2 +-
 init.fnl                |  1 +
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/fnl/defaults.fnl b/fnl/defaults.fnl
index 71dac80..202ac98 100644
--- a/fnl/defaults.fnl
+++ b/fnl/defaults.fnl
@@ -3,7 +3,7 @@
 
 (global defaults (lambda [force]
   (default :layout "" force)
-  (default :colorscheme :oxocarbon force)
+  (default :colorscheme :carbonfox force)
   (default :lsp "pyright,lua_ls,clangd,zls,csharp_ls,ts_ls,rust_analyzer" force)))
 
 (defaults false)
diff --git a/fnl/opt.fnl b/fnl/opt.fnl
index 2925595..d3ff660 100644
--- a/fnl/opt.fnl
+++ b/fnl/opt.fnl
@@ -16,18 +16,13 @@
 (local color_change (fn [] 
       ;havent found how to make toggleterm to work, it wont switch until you select the window
       ;possible bug with toggleterm?
-      (vim.api.nvim_set_hl 0 :Normal {:bg :none :fg :none})
-      (vim.api.nvim_set_hl 0 :SignColumn {:bg :none})
-      (vim.api.nvim_set_hl 0 :EndOfBuffer {:bg :none})
-      (vim.api.nvim_set_hl 0 :NormalFloat {:bg :none})
-      (vim.api.nvim_set_hl 0 :FloatBorder {:bg :none})
-      (vim.api.nvim_set_hl 0 :NvimTreeNormal {:bg :none})
-      (vim.api.nvim_set_hl 0 :NormalNC {:bg :none})
-      (vim.api.nvim_set_hl 0 :TermCursor {:bg :none})
-      (vim.api.nvim_set_hl 0 :TermCursorNC {:bg :none})
-      (vim.api.nvim_set_hl 0 :VertSplit {:bg :none})
-      (vim.api.nvim_set_hl 0 :LineNr {:bg :none})
-      (vim.api.nvim_set_hl 0 :StatusLine {:bg :none})))
+      (local groups [:Normal :NormalNC :Comment :Constant :Special :Identifier
+                  :Statement :PreProc :Type :Underlined :Todo :String :Function
+                  :Conditional :Repeat :Operator :Structure :LineNr :NonText
+                  :SignColumn :CursorLine :CursorLineNr :StatusLine :StatusLineNC
+                  :EndOfBuffer :NormalFloat :FloatBorder :NvimTreeNormal :TermCursor :TermCursorNC])
+      (each [_ v (pairs groups)]
+        (vim.api.nvim_set_hl 0 v {:bg :none :fg :none}))))
 
 (global _trans_ false)
 
diff --git a/fnl/plugins/lualine.fnl b/fnl/plugins/lualine.fnl
index 9cda2ef..ef79a5a 100644
--- a/fnl/plugins/lualine.fnl
+++ b/fnl/plugins/lualine.fnl
@@ -66,10 +66,7 @@
 
 (_G.util.setup! :lualine {
   :options {
-    :theme {
-      :normal { :c {:bg colors.bg}} 
-      :inactive { :c {:bg colors.fade-bg}} 
-    }
+    :theme :auto
     :component_separators { :left "" :right "" }                         
     :section_separators { :left "" :right  "" }
   }
diff --git a/fnl/settings-ui.fnl b/fnl/settings-ui.fnl
index 1f74868..1a748f9 100644
--- a/fnl/settings-ui.fnl
+++ b/fnl/settings-ui.fnl
@@ -3,7 +3,7 @@
   (when (and (not= new "") (not= new "none")) ((. (require (.. :layouts. new)) :enable))))
 
 (local options {
-  :colorscheme {:array false :options [:oxocarbon :monochrome :doom-one] :update (fn [color] (vim.cmd (.. "colorscheme " color)))}
+  :colorscheme {:array false :options [:oxocarbon :monochrome :doom-one :dayfox :nightfox :carbonfox :duskfox] :update (fn [color] (vim.cmd (.. "colorscheme " color)))}
   :lsp {:array true}
   :layout {:array false :options [:ide :quiet] :update (fn [layout] (update-layout layout _G.settings.layout))}
   :trans {:array false :options [:enable :disable] :update (fn [en] ((. _G.opt (.. :trans- en))))}})
diff --git a/init.fnl b/init.fnl
index 74a18b6..5fd8313 100644
--- a/init.fnl
+++ b/init.fnl
@@ -88,4 +88,5 @@
   (use! :kdheepak/monochrome.nvim)
   (use! :nyoom-engineering/oxocarbon.nvim)
   (use! :NTBBloodbath/doom-one.nvim)
+  (use! :EdenEast/nightfox.nvim)
 )
-- 
cgit v1.2.3