36 files changed, 18 insertions, 12 deletions
diff --git a/fnl/plugins/hotpot.fnl b/fnl/plugins/compiler/hotpot.fnl
index 9c2dbce..eba8083 100644
--- a/fnl/plugins/hotpot.fnl
+++ b/fnl/plugins/compiler/hotpot.fnl
@@ -1,2 +1,3 @@
 ;; Transpiler for fnl.
+
 {1 :rktjmp/hotpot.nvim}
diff --git a/fnl/plugins/lazy.fnl b/fnl/plugins/core/lazy.fnl
index f7b8371..f7b8371 100644
--- a/fnl/plugins/lazy.fnl
+++ b/fnl/plugins/core/lazy.fnl
diff --git a/fnl/plugins/autopairs.fnl b/fnl/plugins/editor/autopairs.fnl
index d1aabf6..d1aabf6 100644
--- a/fnl/plugins/autopairs.fnl
+++ b/fnl/plugins/editor/autopairs.fnl
diff --git a/fnl/plugins/better-escape.fnl b/fnl/plugins/editor/better-escape.fnl
index cde61bc..cde61bc 100644
--- a/fnl/plugins/better-escape.fnl
+++ b/fnl/plugins/editor/better-escape.fnl
diff --git a/fnl/plugins/bufdel.fnl b/fnl/plugins/editor/bufdel.fnl
index 4719a53..4719a53 100644
--- a/fnl/plugins/bufdel.fnl
+++ b/fnl/plugins/editor/bufdel.fnl
diff --git a/fnl/plugins/cmp.fnl b/fnl/plugins/editor/cmp.fnl
index a062d92..a062d92 100644
--- a/fnl/plugins/cmp.fnl
+++ b/fnl/plugins/editor/cmp.fnl
diff --git a/fnl/plugins/colorizer.fnl b/fnl/plugins/editor/colorizer.fnl
index 553024b..553024b 100644
--- a/fnl/plugins/colorizer.fnl
+++ b/fnl/plugins/editor/colorizer.fnl
diff --git a/fnl/plugins/colorscheme.fnl b/fnl/plugins/editor/colorscheme.fnl
index 40802a6..40802a6 100644
--- a/fnl/plugins/colorscheme.fnl
+++ b/fnl/plugins/editor/colorscheme.fnl
diff --git a/fnl/plugins/comment.fnl b/fnl/plugins/editor/comment.fnl
index 63401a0..63401a0 100644
--- a/fnl/plugins/comment.fnl
+++ b/fnl/plugins/editor/comment.fnl
diff --git a/fnl/plugins/gitsigns.fnl b/fnl/plugins/editor/gitsigns.fnl
index 1ef8cbc..1ef8cbc 100644
--- a/fnl/plugins/gitsigns.fnl
+++ b/fnl/plugins/editor/gitsigns.fnl
diff --git a/fnl/plugins/harpoon.fnl b/fnl/plugins/editor/harpoon.fnl
index 7674f0b..7674f0b 100644
--- a/fnl/plugins/harpoon.fnl
+++ b/fnl/plugins/editor/harpoon.fnl
diff --git a/fnl/plugins/leap.fnl b/fnl/plugins/editor/leap.fnl
index 6c2eb53..6c2eb53 100644
--- a/fnl/plugins/leap.fnl
+++ b/fnl/plugins/editor/leap.fnl
diff --git a/fnl/plugins/lir.fnl b/fnl/plugins/editor/lir.fnl
index 8caa8e4..8caa8e4 100644
--- a/fnl/plugins/lir.fnl
+++ b/fnl/plugins/editor/lir.fnl
diff --git a/fnl/plugins/persistence.fnl b/fnl/plugins/editor/persistence.fnl
index 4cde73e..4cde73e 100644
--- a/fnl/plugins/persistence.fnl
+++ b/fnl/plugins/editor/persistence.fnl
diff --git a/fnl/plugins/spectre.fnl b/fnl/plugins/editor/spectre.fnl
index 92a33ba..92a33ba 100644
--- a/fnl/plugins/spectre.fnl
+++ b/fnl/plugins/editor/spectre.fnl
diff --git a/fnl/plugins/stay-in-place.fnl b/fnl/plugins/editor/stay-in-place.fnl
index b264a05..b264a05 100644
--- a/fnl/plugins/stay-in-place.fnl
+++ b/fnl/plugins/editor/stay-in-place.fnl
diff --git a/fnl/plugins/surround.fnl b/fnl/plugins/editor/surround.fnl
index e8fda32..e8fda32 100644
--- a/fnl/plugins/surround.fnl
+++ b/fnl/plugins/editor/surround.fnl
diff --git a/fnl/plugins/symbols-outline.fnl b/fnl/plugins/editor/symbols-outline.fnl
index 4195de0..4195de0 100644
--- a/fnl/plugins/symbols-outline.fnl
+++ b/fnl/plugins/editor/symbols-outline.fnl
diff --git a/fnl/plugins/telescope.fnl b/fnl/plugins/editor/telescope.fnl
index df8c031..df8c031 100644
--- a/fnl/plugins/telescope.fnl
+++ b/fnl/plugins/editor/telescope.fnl
diff --git a/fnl/plugins/toggleterm.fnl b/fnl/plugins/editor/toggleterm.fnl
index d75aea1..d75aea1 100644
--- a/fnl/plugins/toggleterm.fnl
+++ b/fnl/plugins/editor/toggleterm.fnl
diff --git a/fnl/plugins/treesitter.fnl b/fnl/plugins/editor/treesitter.fnl
index 1d96a13..1d96a13 100644
--- a/fnl/plugins/treesitter.fnl
+++ b/fnl/plugins/editor/treesitter.fnl
diff --git a/fnl/plugins/trim.fnl b/fnl/plugins/editor/trim.fnl
index 7f224bc..7f224bc 100644
--- a/fnl/plugins/trim.fnl
+++ b/fnl/plugins/editor/trim.fnl
diff --git a/fnl/plugins/trouble.fnl b/fnl/plugins/editor/trouble.fnl
index 3f736bb..3f736bb 100644
--- a/fnl/plugins/trouble.fnl
+++ b/fnl/plugins/editor/trouble.fnl
diff --git a/fnl/plugins/undotree.fnl b/fnl/plugins/editor/undotree.fnl
index 9aa8114..9aa8114 100644
--- a/fnl/plugins/undotree.fnl
+++ b/fnl/plugins/editor/undotree.fnl
diff --git a/fnl/plugins/vim-slash.fnl b/fnl/plugins/editor/vim-slash.fnl
index 6f50ae4..6f50ae4 100644
--- a/fnl/plugins/vim-slash.fnl
+++ b/fnl/plugins/editor/vim-slash.fnl
diff --git a/fnl/plugins/which-key.fnl b/fnl/plugins/editor/which-key.fnl
index 0b6389c..0b6389c 100644
--- a/fnl/plugins/which-key.fnl
+++ b/fnl/plugins/editor/which-key.fnl
diff --git a/fnl/plugins/window-picker.fnl b/fnl/plugins/editor/window-picker.fnl
index 2820409..2820409 100644
--- a/fnl/plugins/window-picker.fnl
+++ b/fnl/plugins/editor/window-picker.fnl
diff --git a/fnl/plugins/zen.fnl b/fnl/plugins/editor/zen.fnl
index 6e9bee7..6e9bee7 100644
--- a/fnl/plugins/zen.fnl
+++ b/fnl/plugins/editor/zen.fnl
diff --git a/fnl/plugins/init.fnl b/fnl/plugins/init.fnl
index 6b0bde8..00be90b 100644
--- a/fnl/plugins/init.fnl
+++ b/fnl/plugins/init.fnl
@@ -1,16 +1,21 @@
 ;; Load all plugins.
 
-(local plugins (let [plugins (require :plugins.lsp)
-                     path (.. (vim.fn.stdpath :config) :/fnl/plugins)]
-                 (if (vim.loop.fs_stat path)
-                     (do
-                       (each [fname (vim.fs.dir path)]
-                         (let [fname (fname:match "^(.*)%.fnl$")]
-                           (if (and (not= fname nil) (not= fname :init)
-                                    (not= fname :lazy))
-                               (table.insert plugins
-                                             (require (.. :plugins. fname))))))))
-                 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)
+    plugins))
 
-(let [lazy (require :plugins.lazy)]
+(let [lazy (require :plugins.core.lazy)
+      plugins (get-plugins :compiler :editor :lsp :tools :ui)]
   (lazy.setup plugins))
diff --git a/fnl/plugins/diffview.fnl b/fnl/plugins/tools/diffview.fnl
index 9978c2e..9978c2e 100644
--- a/fnl/plugins/diffview.fnl
+++ b/fnl/plugins/tools/diffview.fnl
diff --git a/fnl/plugins/neogit.fnl b/fnl/plugins/tools/neogit.fnl
index b7c1633..b7c1633 100644
--- a/fnl/plugins/neogit.fnl
+++ b/fnl/plugins/tools/neogit.fnl
diff --git a/fnl/plugins/orgmode.fnl b/fnl/plugins/tools/orgmode.fnl
index 99e55be..99e55be 100644
--- a/fnl/plugins/orgmode.fnl
+++ b/fnl/plugins/tools/orgmode.fnl
diff --git a/fnl/plugins/alpha.fnl b/fnl/plugins/ui/alpha.fnl
index 87c45e0..87c45e0 100644
--- a/fnl/plugins/alpha.fnl
+++ b/fnl/plugins/ui/alpha.fnl
diff --git a/fnl/plugins/bqf.fnl b/fnl/plugins/ui/bqf.fnl
index e2b0791..e2b0791 100644
--- a/fnl/plugins/bqf.fnl
+++ b/fnl/plugins/ui/bqf.fnl
diff --git a/fnl/plugins/lualine.fnl b/fnl/plugins/ui/lualine.fnl
index 7373704..7373704 100644
--- a/fnl/plugins/lualine.fnl
+++ b/fnl/plugins/ui/lualine.fnl
diff --git a/fnl/plugins/minibar.fnl b/fnl/plugins/ui/minibar.fnl
index 0dff6d6..0dff6d6 100644
--- a/fnl/plugins/minibar.fnl
+++ b/fnl/plugins/ui/minibar.fnl