38 files changed, 24 insertions, 17 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
diff --git a/fnl/settings/options.fnl b/fnl/settings/options.fnl
index cb86307..df71c8c 100644
--- a/fnl/settings/options.fnl
+++ b/fnl/settings/options.fnl
@@ -91,3 +91,4 @@
 (apply-opts opts)
 (set vim.g.mapleader " ")
 (set vim.g.maplocalleader " ")
+(set vim.g.markdown_recommended_style 0)
diff --git a/lazy-lock.json b/lazy-lock.json
index bc51320..a897397 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -10,7 +10,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "diffview.nvim": { "branch": "main", "commit": "168c8fc1e5729a00b7dd0317d393e6acf21faad7" },
+  "diffview.nvim": { "branch": "main", "commit": "5bbcf162d03287296fe393f88da6065db3cf9fd0" },
   "flit.nvim": { "branch": "main", "commit": "be110f9814a45788d10537fd59b3c76d956bb7ad" },
   "friendly-snippets": { "branch": "main", "commit": "7ab483b355613ef4f74189c7789278d765724d12" },
   "gitsigns.nvim": { "branch": "main", "commit": "addd6e174a85fc1c4007ab0b65d77e6555b417bf" },
@@ -18,13 +18,13 @@
   "hotpot.nvim": { "branch": "master", "commit": "1002bcdea7af06c5a7bfce0536d96bc4b03ab42e" },
   "lazy.nvim": { "branch": "main", "commit": "6ac67d46dc19aa4c9b72c0e9d716bcae9e122204" },
   "leap.nvim": { "branch": "main", "commit": "a968ab4250840dc879e805f918b4f3b892310a12" },
-  "lir.nvim": { "branch": "master", "commit": "2143a2d0a5b595824de945dcf17d2b780f81f177" },
+  "lir.nvim": { "branch": "master", "commit": "937e882c169d572a8a73dfcb71137a264c6369b2" },
   "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
   "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
   "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "43c7f402cb9822b61b5dc05bf0b385928df256a6" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "07335008824788725bfa2095e18ddbb527002d63" },
-  "mason.nvim": { "branch": "main", "commit": "18c1846d3fcba81750b8462bbda41ad636984718" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "c17051e61c41c569e5088185889cde537535b465" },
+  "mason.nvim": { "branch": "main", "commit": "6eb540dc055cdf32ebeae020c51c7d792d7247bc" },
   "minibar.nvim": { "branch": "master", "commit": "353ca4efaf7fff1566bb02e0d7cb51133c41f660" },
   "neogit": { "branch": "master", "commit": "981207efd10425fef82ca09fa8bd22c3ac3e622d" },
   "no-clown-fiesta.nvim": { "branch": "master", "commit": "8d4f03c8211a7b5528cd9fa8212d8f1e7baea485" },
@@ -37,7 +37,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "8ebe6894dddaeb1459e1397c865f54fa5ecaac80" },
   "nvim-spectre": { "branch": "master", "commit": "24275beae382e6bd0180b3064cf5729548641a02" },
   "nvim-surround": { "branch": "main", "commit": "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e" },
-  "nvim-treesitter": { "branch": "master", "commit": "5e9c6b6ba079a90a2545e651e3740b655b9ff035" },
+  "nvim-treesitter": { "branch": "master", "commit": "1c89f9b5bc885ff0e2b1cdb7ff40847784b1436b" },
   "nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
   "nvim-window-picker": { "branch": "main", "commit": "5902827d0e338890a22849e2f18dc80d1cc1a8db" },
   "orgmode": { "branch": "master", "commit": "dadf56334d2be7d9e8ad1e22c697a6e75f0164b7" },