Update how lsp, snippets and plugins are loaded

1 files changed, 8 insertions, 9 deletions

diff --git a/fnl/aktersnurra.fnl b/fnl/aktersnurra.fnl
index f86c2a2..898c454 100644
--- a/fnl/aktersnurra.fnl
+++ b/fnl/aktersnurra.fnl
@@ -1,17 +1,16 @@
 ;; Load plugins with lazy.
 
-(local plugins (let [plugins []
-                     path (.. (vim.fn.stdpath :config) :/fnl/plugins)]
-                 (each [fname (vim.fs.dir path)]
-                   (let [fname (fname:match "^(.*)%.fnl$")]
-                     (if (not= fname nil)
-                         (table.insert plugins (require (.. :plugins. fname))))))
-                 (table.insert plugins (require :plugins.lsp))
-                 (table.insert plugins (require :plugins.snippets))
-                 plugins))
+(λ load-plugin [tbl name]
+  (table.insert tbl (require (.. :plugins. name))))
 
 (local icons (require :settings.icons))
 
+(local {: load-and-apply} (require :util.load))
+
+(local plugins (let [tbl {}]
+                 (load-and-apply :/fnl/plugins (partial load-plugin tbl))
+                 tbl))
+
 (local opts {:install {:colorscheme [:no-clown-fiesta]}
              :debug false
              :defaults {:lazy false}