actually fix stuff

nvim/.config/nvim/fnl/dots/colors.fnl

@@ -1,4 +1,4 @@
-(module colors
+(module dots.colors
   {}
   {:dark0_hard "#1d2021"
    :dark0 "#282828"

nvim/.config/nvim/fnl/dots/help-thingy.fnl

@@ -1,5 +1,5 @@
-(module help-thingy
+(module dots.help-thingy
-  {autoload {utils utils
+  {autoload {utils dots.utils
              a aniseed.core
              str aniseed.string
              popup popup

nvim/.config/nvim/fnl/dots/keybinds.fnl

@@ -1,7 +1,7 @@
-(module keybinds
+(module dots.keybinds
   {autoload {a aniseed.core
              nvim aniseed.nvim
-             utils utils
+             utils dots.utils
              wk which-key
              treesitter-selection nvim-treesitter.incremental_selection}
    require-macros [macros]})

nvim/.config/nvim/fnl/dots/plugins.fnl

@@ -1,7 +1,6 @@
-(module plugins
+(module dots.plugins
   {require-macros [macros]})
 
-
 (packer-use
   "/home/leon/coding/projects/nvim-gehzu" {}
   :elkowar/kmonad.vim {}
@@ -13,16 +12,13 @@
                                          (set vim.g.gruvbox_plugin_hi_groups 1)
                                          (vim.cmd "colorscheme gruvbox8"))}
 
-  ;:gruvbox-community/gruvbox {:opt false
+  :nvim-telescope/telescope.nvim {:mod "dots.plugins.telescope"
-                              ;:config #(vim.cmd "colorscheme gruvbox")}
-
-  :nvim-telescope/telescope.nvim {:mod "plugins.telescope"
                                   :cmd ["Telescope"]
                                   :requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim]}
 
   :kyazdani42/nvim-web-devicons {}
 
-  :nvim-treesitter/nvim-treesitter {:mod "plugins.treesitter" 
+  :nvim-treesitter/nvim-treesitter {:mod "dots.plugins.treesitter" 
                                     :event ["BufEnter"]
                                     :run ":TSUpdate"}
   :JoosepAlviste/nvim-ts-context-commentstring {:event ["BufEnter"]
@@ -35,39 +31,31 @@
 
   :jiangmiao/auto-pairs {}
 
-  ; :code-biscuits/nvim-biscuits {} ; show opening line after closing curly
-
   :folke/which-key.nvim {}
 
   ; json query stuff
   ;:gennaro-tedesco/nvim-jqx {:ft ["json"]}
 
   :Olical/aniseed {:branch "develop"}; :tag "v3.16.0"}
+  ;:Olical/aniseed {}; :tag "v3.16.0"}
   
   ; general purpose lua wrappers for nvim stuff
   :norcalli/nvim.lua {}
 
-  ;:glepnir/galaxyline.nvim {:mod "plugins.galaxyline"
+  :Famiu/feline.nvim {:mod "dots.plugins.feline"}
-                            ;:after "gruvbox"}
 
-  :Famiu/feline.nvim {:mod "plugins.feline"}
+  :akinsho/nvim-bufferline.lua {:mod "dots.plugins.bufferline"}
-                      ;:after "gruvbox"}
+  ;:romgrk/barbar.nvim {:mod "dots.plugins.barbar"}
-
-  ;:gwimm/lililine.nvim {:after "gruvbox"
-                        ;:mod "plugins.lililine"}
-
-  :akinsho/nvim-bufferline.lua {:mod "plugins.bufferline"}
-  ;:romgrk/barbar.nvim {:mod "plugins.barbar"}
 
   :sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"]
-                           :mod "plugins.diffview"}
+                           :mod "dots.plugins.diffview"}
   :tweekmonster/startuptime.vim {:cmd ["StartupTime"]}
   :tpope/vim-repeat {}
 
   :junegunn/goyo.vim {:cmd "Goyo"}
   
   :lewis6991/gitsigns.nvim {:after ["vim-gruvbox8"]
-                            :mod "plugins.gitsigns"}
+                            :mod "dots.plugins.gitsigns"}
 
 
   :tpope/vim-fugitive {}
@@ -86,7 +74,7 @@
   :iamcco/markdown-preview.nvim {:run vim.fn.mkdp#util#install}
 
   ;:mfussenegger/nvim-dap {:opt true
-                          ;:mod "plugins.nvim-dap"}
+                          ;:mod "dots.plugins.nvim-dap"}
   ;:nvim-telescope/telescope-dap.nvim {:opt true
                                       ;:requires [:mfussenegger/nvim-dap
                                                  ;:nvim-telescope/telescope.nvim]}
@@ -94,25 +82,27 @@
   ; code-related ----------------------------------------- <<<
 
   :ray-x/lsp_signature.nvim {:events [:BufEnter]}
-  :folke/lsp-trouble.nvim {:mod "plugins.trouble"
+  :folke/lsp-trouble.nvim {:mod "dots.plugins.trouble"
                            :cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]}
-  :simrat39/symbols-outline.nvim {:mod "plugins.symbols-outline"}
+  :simrat39/symbols-outline.nvim {:mod "dots.plugins.symbols-outline"}
   :neovim/nvim-lspconfig {}
 
-  ;:hrsh7th/nvim-compe {:mod "plugins.compe"}
+  ;:hrsh7th/nvim-compe {:mod "dots.plugins.compe"}
   :/home/leon/coding/prs/nvim-compe {:event [:BufEnter]
-                                     :mod "plugins.compe"}
+                                     :mod "dots.plugins.compe"}
 
 
-  :glepnir/lspsaga.nvim {:mod "plugins.lspsaga"}
+
+  :glepnir/lspsaga.nvim {:after "vim-gruvbox8"
+                         :mod "dots.plugins.lspsaga"}
 
 
   :Olical/conjure {}
   :tami5/compe-conjure {:requires [:Olical/conjure]}
 
-  :ciaranm/detectindent {:mod "plugins.detect-indent"}
+  :ciaranm/detectindent {:mod "dots.plugins.detect-indent"}
   :pechorin/any-jump.vim {}
-  :justinmk/vim-sneak {:mod "plugins.sneak"}
+  :justinmk/vim-sneak {:mod "dots.plugins.sneak"}
   :psliwka/vim-smoothie {}
   :editorconfig/editorconfig-vim {}
   :tommcdo/vim-exchange {}
@@ -128,14 +118,14 @@
 
   :kevinoid/vim-jsonc {}
 
-  :norcalli/nvim-colorizer.lua {:mod "plugins.nvim-colorizer"}
+  :norcalli/nvim-colorizer.lua {:mod "dots.plugins.nvim-colorizer"}
   :pangloss/vim-javascript {} ; syntax highlighting JS
   :ianks/vim-tsx {}
   :leafgarland/typescript-vim {}
   ;:sheerun/vim-polyglot {:event [:BufEnter]}    ; Syntax highlighting for most languages
   :HerringtonDarkholme/yats.vim {} ; typescript syntax highlighting
   :mxw/vim-jsx {}
-  :mattn/emmet-vim {:mod "plugins.emmet"}
+  :mattn/emmet-vim {:mod "dots.plugins.emmet"}
 
   :purescript-contrib/purescript-vim {}
 

nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl

@@ -1,9 +1,9 @@
-(module plugins.bufferline
+(module dots.plugins.bufferline
   {autoload {a aniseed.core
              nvim aniseed.nvim 
-             utils utils
+             utils dots.utils
-             bufferline bufferline
+             colors dots.colors
-             colors colors}})
+             bufferline bufferline}})
 
 ; :h bufferline-lua-highlights
 (let [selected {:gui "" :guibg colors.neutral_aqua :guifg colors.dark0}

nvim/.config/nvim/fnl/dots/plugins/compe.fnl

@@ -1,5 +1,5 @@
-(module plugins.compe
+(module dots.plugins.compe
-  {autoload {utils utils
+  {autoload {utils dots.utils
              compe compe}})
             
 

nvim/.config/nvim/fnl/dots/plugins/detect-indent.fnl

@@ -1,4 +1,5 @@
-(module plugins.detect-indent)
+(module dots.plugins.detect-indent 
+        {})
 
 (vim.cmd "autocmd! BufReadPost * :DetectIndent")
 (set vim.g.detectindent_preferred_expandtab 1)

nvim/.config/nvim/fnl/dots/plugins/diffview.fnl

@@ -1,4 +1,4 @@
-(module plugins.diffview
+(module dots.plugins.diffview
   {autoload {diffview diffview
              cb diffview.config}})
 

nvim/.config/nvim/fnl/dots/plugins/emmet.fnl

@@ -1,4 +1,4 @@
-(module plugins.emmet)
+(module dots.plugins.emmet {})
 
 (set vim.g.user_emmet_mode "n")
 (set vim.g.user_emmet_leader_key "<leader>e")

nvim/.config/nvim/fnl/dots/plugins/feline.fnl

@@ -1,14 +1,14 @@
-(module utils
+(module dots.plugins.feline
-        {autoload {a aniseed.core
+  {autoload {a aniseed.core
-                   nvim aniseed.nvim
+             nvim aniseed.nvim
-                   utils utils
+             utils dots.utils
-                   str aniseed.string
+             str aniseed.string
-                   colors colors
+             colors dots.colors
-                   view aniseed.view
+             view aniseed.view
-                   feline feline
+             feline feline
-                   feline-git feline.providers.git
+             feline-git feline.providers.git
-                   feline-lsp feline.providers.lsp}
+             feline-lsp feline.providers.lsp}
-         require-macros [macros]})
+   require-macros [macros]})
 
 
 (local modes 

nvim/.config/nvim/fnl/dots/plugins/galaxyline.fnl

@@ -1,9 +1,9 @@
-(module plugins.galaxyline
+(module dots.plugins.galaxyline
   {autoload {a aniseed.core
              str aniseed.string
              nvim aniseed.nvim 
-             utils utils
+             utils dots.utils
-             colors colors
+             colors dots.colors
             
              galaxyline galaxyline 
              gl-condition galaxyline.condition 

nvim/.config/nvim/fnl/dots/plugins/gitsigns.fnl

@@ -1,7 +1,7 @@
-(module plugins.gitsigns
+(module dots.plugins.gitsigns
-  {require {utils utils
+  {autoload {utils dots.utils
-            colors colors
+             colors dots.colors
-            gitsigns gitsigns}})
+             gitsigns gitsigns}})
 
 ; https://github.com/lewis6991/gitsigns.nvim
 (gitsigns.setup 
@@ -15,9 +15,19 @@
    :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})
+(vim.cmd
-(utils.highlight :GitSignsChange {:bg "NONE" :fg colors.bright_blue})
+  (..
+    "
+    augroup gitsignsHighlight
+    autocmd ColorScheme * :hi! GitSignsAdd    gui='NONE' guibg='NONE' guifg='" colors.bright_aqua "'
+    autocmd ColorScheme * :hi! GitSignsDelete gui='NONE' guibg='NONE' guifg='" colors.neutral_red "'
+    autocmd ColorScheme * :hi! GitSignsChange gui='NONE' guibg='NONE' guifg='" colors.bright_blue "'
+    augroup END
+    "))
+;(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'")

nvim/.config/nvim/fnl/dots/plugins/lililine.fnl

@@ -1,9 +1,9 @@
-(module plugins.lililine
+(module dots.plugins.lililine
         {autoload {a aniseed.core
                    str aniseed.string
                    nvim aniseed.nvim 
-                   utils utils
+                   utils dots.utils
-                   colors colors
+                   colors dots.colors
                    line lililine}
 
          require-macros [macros]})

nvim/.config/nvim/fnl/dots/plugins/lsp.fnl

@@ -1,8 +1,8 @@
-(module plugins.lsp
+(module dots.plugins.lsp
   {autoload {a aniseed.core
              lsp lspconfig 
              lsp-configs lspconfig.configs
-             utils utils}
+             utils dots.utils}
 
    require-macros [macros]})
 

nvim/.config/nvim/fnl/dots/plugins/lspsaga.fnl

@@ -1,8 +1,8 @@
-(module plugins.lspsaga
+(module dots.plugins.lspsaga
-  {autoload {utils utils
+  {autoload {utils dots.utils
-             colors colors
+             colors dots.colors}
 
-             saga lspsaga}})
+   require {saga lspsaga}})
 
 
 (saga.init_lsp_saga 

nvim/.config/nvim/fnl/dots/plugins/nvim-colorizer.fnl

@@ -1,4 +1,4 @@
-(module plugins.nvim-colorizer
+(module dots.plugins.nvim-colorizer
   {autoload {colorizer colorizer}})
 
 

nvim/.config/nvim/fnl/dots/plugins/nvim-dap.fnl

@@ -1,7 +1,7 @@
-(module plugins.nvim-dap
+(module dots.plugins.nvim-dap
-   {:require {a aniseed.core
+  {autoload {a aniseed.core
-              utils utils
+             utils dots.utils
-              dap dap}})
+             dap dap}})
               
 
 (set dap.adapters.cpp

nvim/.config/nvim/fnl/dots/plugins/sneak.fnl

@@ -1,5 +1,5 @@
-(module plugins.sneak
+(module dots.plugins.sneak
-  {require {utils utils}})
+  {autoload {utils dots.utils}})
 
 
 (set vim.g.sneak#label 1)

nvim/.config/nvim/fnl/dots/plugins/symbols-outline.fnl

@@ -1,4 +1,4 @@
-(module plugins.symbols-outline
+(module dots.plugins.symbols-outline
   {require {symbols-outline symbols-outline}})
 
 (symbols-outline.setup {:highlight_hovered_item true :show_guides true})

nvim/.config/nvim/fnl/dots/plugins/telescope.fnl

@@ -1,5 +1,5 @@
-(module plugins.telescope
+(module dots.plugins.telescope
-  {autoload {utils utils
+  {autoload {utils dots.utils
              telescope telescope
              actions telescope.actions}})
 

nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl

@@ -1,5 +1,6 @@
-(module plugins.treesitter
+(module dots.plugins.treesitter
-  {autoload {a aniseed.core}
+  {autoload {utils dots.utils
+             a aniseed.core}
    require {configs nvim-treesitter.configs}
    require-macros [macros]})
 

nvim/.config/nvim/fnl/dots/plugins/trouble.fnl

@@ -1,6 +1,6 @@
-(module plugins.trouble
+(module dots.plugins.trouble
-  {autoload {utils utils
+  {autoload {utils dots.utils
-             colors colors}
+             colors dots.colors}
    require {trouble trouble}})
 
 (trouble.setup

nvim/.config/nvim/fnl/dots/smart-compe-conjure.fnl

@@ -1,11 +1,11 @@
-(module smart-compe-conjure
+(module dots.smart-compe-conjure
-  {autoload {utils utils
+  {autoload {utils dots.utils
              a aniseed.core
              str aniseed.string
              view aniseed.view
              popup popup
              compe compe
-             help help-thingy}
+             help dots.help-thingy}
    require-macros [macros]})
 
 

nvim/.config/nvim/fnl/dots/utils.fnl

@@ -1,7 +1,7 @@
-(module utils
+(module dots.utils
-  {require {a aniseed.core
+  {autoload {a aniseed.core
-            nvim aniseed.nvim
+             nvim aniseed.nvim
-            str aniseed.string}
+             str aniseed.string}
    require-macros [macros]})
 
 (defn plugin-installed? [name]
@@ -104,6 +104,10 @@
           (surround-if-present " gui='"colset.gui"'")))))
 
 
+
+
+
+
 (defn shorten-path [path seg-length shorten-after]
   "shorten a filepath by truncating the segments to n characters, if the path exceeds a given length"
   (let [segments (str.split path "/")]

nvim/.config/nvim/fnl/init.fnl

@@ -1,9 +1,9 @@
 (module init 
-  {require  {utils utils
+  {autoload {utils dots.utils
              nvim aniseed.nvim
              a aniseed.core
              str aniseed.string
-             colors colors}
+             colors dots.colors}
    require-macros [macros]})
 
 (macro make-errors-epic [f]
@@ -13,11 +13,10 @@
 (when (vim.fn.has "termguicolors")
   (se termguicolors true))
 
+(make-errors-epic (require "dots.plugins"))
 
-(make-errors-epic (require "plugins"))
+(make-errors-epic (require "dots.plugins.lsp"))
-
+(make-errors-epic (require "dots.keybinds"))
-(make-errors-epic (require "plugins.lsp"))
-(make-errors-epic (require "keybinds"))
 
 
 ;(se runtimepath (.. vim.o.runtimepath ",/home/leon/coding/projects/kbd-vim"))
@@ -165,8 +164,6 @@
 
 ; foldend
 
-
-
 (vim.cmd
   "command! -nargs=1 L :lua print(vim.inspect(<args>))")