Debloat loading of plugins

11 files changed, 12 insertions, 19 deletions

diff --git a/fnl/plugins/compiler/hotpot.fnl b/fnl/plugins/core/hotpot.fnl
index eba8083..eba8083 100644
--- a/fnl/plugins/compiler/hotpot.fnl
+++ b/fnl/plugins/core/hotpot.fnl
diff --git a/fnl/plugins/ui/alpha.fnl b/fnl/plugins/editor/alpha.fnl
index c9dce50..c9dce50 100644
--- a/fnl/plugins/ui/alpha.fnl
+++ b/fnl/plugins/editor/alpha.fnl
diff --git a/fnl/plugins/ui/bqf.fnl b/fnl/plugins/editor/bqf.fnl
index e2b0791..e2b0791 100644
--- a/fnl/plugins/ui/bqf.fnl
+++ b/fnl/plugins/editor/bqf.fnl
diff --git a/fnl/plugins/tools/diffview.fnl b/fnl/plugins/editor/diffview.fnl
index c004199..c004199 100644
--- a/fnl/plugins/tools/diffview.fnl
+++ b/fnl/plugins/editor/diffview.fnl
diff --git a/fnl/plugins/ui/easyread.fnl b/fnl/plugins/editor/easyread.fnl
index c456726..c456726 100644
--- a/fnl/plugins/ui/easyread.fnl
+++ b/fnl/plugins/editor/easyread.fnl
diff --git a/fnl/plugins/ui/lualine.fnl b/fnl/plugins/editor/lualine.fnl
index 80adf55..80adf55 100644
--- a/fnl/plugins/ui/lualine.fnl
+++ b/fnl/plugins/editor/lualine.fnl
diff --git a/fnl/plugins/ui/minibar.fnl b/fnl/plugins/editor/minibar.fnl
index ed80330..ed80330 100644
--- a/fnl/plugins/ui/minibar.fnl
+++ b/fnl/plugins/editor/minibar.fnl
diff --git a/fnl/plugins/tools/neogit.fnl b/fnl/plugins/editor/neogit.fnl
index e9c6235..e9c6235 100644
--- a/fnl/plugins/tools/neogit.fnl
+++ b/fnl/plugins/editor/neogit.fnl
diff --git a/fnl/plugins/tools/orgmode.fnl b/fnl/plugins/editor/orgmode.fnl
index bb67b88..bb67b88 100644
--- a/fnl/plugins/tools/orgmode.fnl
+++ b/fnl/plugins/editor/orgmode.fnl
diff --git a/fnl/plugins/init.fnl b/fnl/plugins/init.fnl
index 00be90b..2ab9d99 100644
--- a/fnl/plugins/init.fnl
+++ b/fnl/plugins/init.fnl
@@ -1,21 +1,14 @@
 ;; Load all plugins.
 
-(fn get-plugins [...]
+(fn get-plugins []
   (let [plugins []
-        path (.. (vim.fn.stdpath :config) :/fnl/plugins)]
-    (each [_ m (ipairs [...])]
-      (let [module-path (.. path "/" m)]
-        (if (vim.loop.fs_stat module-path)
-            (do
-              (if (= :lsp m)
-                  (table.insert plugins (require (.. :plugins. m)))
-                  (each [fname (vim.fs.dir module-path)]
-                    (let [fname (fname:match "^(.*)%.fnl$")]
-                      (table.insert plugins
-                                    (require (.. :plugins. m "." fname))))))))))
-    (vim.tbl_flatten plugins)
+        path (.. (vim.fn.stdpath :config) :/fnl/plugins/editor)]
+    (each [fname (vim.fs.dir path)]
+      (let [fname (fname:match "^(.*)%.fnl$")]
+        (table.insert plugins (require (.. :plugins.editor. fname)))))
+    (table.insert plugins (require :plugins.lsp))
     plugins))
 
-(let [lazy (require :plugins.core.lazy)
-      plugins (get-plugins :compiler :editor :lsp :tools :ui)]
-  (lazy.setup plugins))
+(let [_ (require :plugins.core.hotpot)
+      lazy (require :plugins.core.lazy)]
+  (lazy.setup (get-plugins)))
diff --git a/fnl/util/cursorline.fnl b/fnl/util/cursorline.fnl
index e094a4a..cec76f2 100644
--- a/fnl/util/cursorline.fnl
+++ b/fnl/util/cursorline.fnl
@@ -1,12 +1,12 @@
-;; Functions for showing and hiding the cursorline.
+;; Shows (hides) the cursorline in the (un)focused window.
 
-(local ignore-filetypes [:neo-tree])
+(local ignored [:neo-tree])
 
 (fn filetype []
   vim.bo.filetype)
 
 (fn ignore []
-  (vim.tbl_contains ignore-filetypes (filetype)))
+  (vim.tbl_contains ignored (filetype)))
 
 (fn show []
   (let [(ok cl) (pcall vim.api.nvim_win_get_var 0 :auto-cursorline)]