lsp and oil changes!!HEADmain

3 files changed, 21 insertions, 4 deletions

diff --git a/fnl/opt.fnl b/fnl/opt.fnl
index d3ff660..61c9625 100644
--- a/fnl/opt.fnl
+++ b/fnl/opt.fnl
@@ -16,9 +16,7 @@
 (local color_change (fn [] 
       ;havent found how to make toggleterm to work, it wont switch until you select the window
       ;possible bug with toggleterm?
-      (local groups [:Normal :NormalNC :Comment :Constant :Special :Identifier
-                  :Statement :PreProc :Type :Underlined :Todo :String :Function
-                  :Conditional :Repeat :Operator :Structure :LineNr :NonText
+      (local groups [:Normal :NormalNC :PreProc :Repeat :LineNr :NonText
                   :SignColumn :CursorLine :CursorLineNr :StatusLine :StatusLineNC
                   :EndOfBuffer :NormalFloat :FloatBorder :NvimTreeNormal :TermCursor :TermCursorNC])
       (each [_ v (pairs groups)]
diff --git a/fnl/plugins/oil.fnl b/fnl/plugins/oil.fnl
new file mode 100644
index 0000000..fa1e69d
--- /dev/null
+++ b/fnl/plugins/oil.fnl
@@ -0,0 +1,19 @@
+(local oil (_G.util.require! :oil))
+;maybe use other one so dirs can show status
+(local oil-git (_G.util.require! :oil-git))
+(local oil-gitignore (require "lua.oil-gitignore"))
+
+(oil.setup {
+  :view_options {
+                        ;heh, get it?
+    :is_hidden_file (fn [en by]
+      (local dir (oil.get_current_dir by))
+      (. oil-gitignore.git_status dir :ignored en)
+    )
+  }
+
+  :float {
+    :padding 7
+  }
+})
+(oil-git.setup)
diff --git a/fnl/settings-ui.fnl b/fnl/settings-ui.fnl
index 1a748f9..743d1c0 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 :dayfox :nightfox :carbonfox :duskfox] :update (fn [color] (vim.cmd (.. "colorscheme " color)))}
+  :colorscheme {:array false :options [:sakura :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))))}})