From bcdb805f70bbf349e3ec68f8226fa7fd184517d2 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Tue, 18 May 2021 13:47:07 +0200
Subject: [PATCH] stuff kinda works,... weirdly

---
 nvim/.config/nvim/fnl/init.fnl             |  6 ++----
 nvim/.config/nvim/fnl/macros.fnl           |  3 ++-
 nvim/.config/nvim/fnl/plugins.fnl          | 12 ++++++-----
 nvim/.config/nvim/fnl/plugins/gitsigns.fnl | 24 +++++++++++++---------
 nvim/.config/nvim/fnl/utils.fnl            |  6 +++---
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/nvim/.config/nvim/fnl/init.fnl b/nvim/.config/nvim/fnl/init.fnl
index 043e496..48835b6 100644
--- a/nvim/.config/nvim/fnl/init.fnl
+++ b/nvim/.config/nvim/fnl/init.fnl
@@ -1,10 +1,9 @@
 (module init 
-  {autoload {utils utils
+  {require  {utils utils
              nvim aniseed.nvim
              a aniseed.core
              str aniseed.string
-             colors colors
-             gehzu nvim-gehzu}
+             colors colors}
    require-macros [macros]})
 
 (macro make-errors-epic [f]
@@ -38,7 +37,6 @@
 (se showmode false)
 (se undodir (.. vim.env.HOME "/.vim/undo-dir"))
 (se undofile true)
-(set vim.bo.undofile true)
 (se shortmess (.. vim.o.shortmess "c")) ; Don't give completion messages like 'match 1 of 2' or 'The only match'
 (se hidden true)
 (se encoding "utf-8")
diff --git a/nvim/.config/nvim/fnl/macros.fnl b/nvim/.config/nvim/fnl/macros.fnl
index 1d71954..7a3c3cf 100644
--- a/nvim/.config/nvim/fnl/macros.fnl
+++ b/nvim/.config/nvim/fnl/macros.fnl
@@ -94,6 +94,7 @@
         (match scope
           :global `(tset vim.o ,str-name ,value)
           :win `(tset vim.wo ,str-name ,value)
-          :buf `(tset vim.bo ,str-name ,value)
+          :buf `(do (tset vim.bo ,str-name ,value)
+                    (tset vim.o ,str-name ,value))
           _ (print (.. "option " str-name " has unhandled scope " scope)))
         (print (.. "Unknown vim-option: " str-name)))))}
diff --git a/nvim/.config/nvim/fnl/plugins.fnl b/nvim/.config/nvim/fnl/plugins.fnl
index 2364ab5..42200e9 100644
--- a/nvim/.config/nvim/fnl/plugins.fnl
+++ b/nvim/.config/nvim/fnl/plugins.fnl
@@ -5,12 +5,14 @@
 (packer-use
   "/home/leon/coding/projects/nvim-gehzu" {}
   :elkowar/kmonad.vim {}
+
   :lifepillar/vim-gruvbox8 {:opt false
                             :config #(do (set vim.g.gruvbox_italics 0)
                                          (set vim.g.gruvbox_italicise_strings 0)
                                          (set vim.g.gruvbox_filetype_hi_groups 1)
-                                         (set vim.g.gruvbox_plugins_hi_groups 1)
+                                         (set vim.g.gruvbox_plugin_hi_groups 1)
                                          (vim.cmd "colorscheme gruvbox8"))}
+
   ;:gruvbox-community/gruvbox {:opt false
                               ;:config #(vim.cmd "colorscheme gruvbox")}
 
@@ -38,7 +40,7 @@
   :folke/which-key.nvim {}
 
   ; json query stuff
-  :gennaro-tedesco/nvim-jqx {:ft ["json"]}
+  ;:gennaro-tedesco/nvim-jqx {:ft ["json"]}
 
   :Olical/aniseed {:branch "develop"}; :tag "v3.16.0"}
   
@@ -64,7 +66,8 @@
 
   :junegunn/goyo.vim {:cmd "Goyo"}
   
-  :lewis6991/gitsigns.nvim {:mod "plugins.gitsigns"}
+  :lewis6991/gitsigns.nvim {:after ["vim-gruvbox8"]
+                            :mod "plugins.gitsigns"}
 
 
   :tpope/vim-fugitive {}
@@ -101,8 +104,7 @@
                                      :mod "plugins.compe"}
 
 
-  :glepnir/lspsaga.nvim {:mod "plugins.lspsaga"
-                         :event [:BufEnter]}
+  :glepnir/lspsaga.nvim {:mod "plugins.lspsaga"}
 
 
   :Olical/conjure {}
diff --git a/nvim/.config/nvim/fnl/plugins/gitsigns.fnl b/nvim/.config/nvim/fnl/plugins/gitsigns.fnl
index 0e03bf8..d167602 100644
--- a/nvim/.config/nvim/fnl/plugins/gitsigns.fnl
+++ b/nvim/.config/nvim/fnl/plugins/gitsigns.fnl
@@ -1,23 +1,27 @@
 (module plugins.gitsigns
-  {autoload {utils utils
-             colors colors
-             gitsigns gitsigns}})
+  {require {utils utils
+            colors colors
+            gitsigns gitsigns}})
 
 ; https://github.com/lewis6991/gitsigns.nvim
 (gitsigns.setup
-  {:signs {:add {:text "▍"}
-           :change {:text "▍"}
-           :delete {:text "▍"}
-           :topdelete {:text "▍"}
+  {:signs {:add          {:text "▍"}
+           :change       {:text "▍"}
+           :delete       {:text "▍"}
+           :topdelete    {:text "▍"}
            :changedelete {:text "▍"}}
    :keymaps {:noremap true 
              :buffer true}
    :current_line_blame false
    :update_debounce 100})
 
-(utils.highlight "GitSignsAdd"    {:bg "NONE" :fg colors.bright_aqua})
-(utils.highlight "GitSignsDelete" {:bg "NONE" :fg colors.neutral_red})
-(utils.highlight "GitSignsChange" {:bg "NONE" :fg colors.bright_blue})
+(utils.highlight :GitSignsAdd    {:bg "NONE" :fg colors.bright_aqua})
+(utils.highlight :GitSignsDelete {:bg "NONE" :fg colors.neutral_red})
+(utils.highlight :GitSignsChange {:bg "NONE" :fg colors.bright_blue})
+
+;(print "This is right before setting and then printing the highlight group")
+;(vim.cmd "highlight GitSignsAdd guibg='NONE' guifg='#ff2200'")
+;(vim.cmd "highlight GitSignsAdd")
 
 ; this no work, but https://github.com/lewis6991/gitsigns.nvim/blob/d89f88384567afc7a72b597e130008126fdb97f7/teal/gitsigns/highlight.tl#L19
 ; REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
diff --git a/nvim/.config/nvim/fnl/utils.fnl b/nvim/.config/nvim/fnl/utils.fnl
index 2252dc1..5e15909 100644
--- a/nvim/.config/nvim/fnl/utils.fnl
+++ b/nvim/.config/nvim/fnl/utils.fnl
@@ -1,7 +1,7 @@
 (module utils
-  {autoload {a aniseed.core
-             nvim aniseed.nvim
-             str aniseed.string}
+  {require {a aniseed.core
+            nvim aniseed.nvim
+            str aniseed.string}
    require-macros [macros]})
 
 (defn plugin-installed? [name]