48 files changed, 32 insertions, 47 deletions
diff --git a/fnl/plugins/core/lazy.fnl b/fnl/core/init.fnl
index 30903f5..df07743 100644
--- a/fnl/plugins/core/lazy.fnl
+++ b/fnl/core/init.fnl
@@ -1,6 +1,6 @@
-;; Lazy opts.
+;; Load plugins with lazy.
 
-(local icons (require :plugins.icons))
+(local icons (require :icons))
 
 (local opts {:install {:colorscheme [:no-clown-fiesta]}
              :debug false
@@ -34,9 +34,8 @@
                                  (.. (. icons :star) " ")
                                  (.. (. icons :line) " ")]}}})
 
-(fn setup [plugins]
-  (let [lazy (require :lazy)]
-    (vim.keymap.set :n :<leader>y "<cmd>Lazy home<cr>" {:desc :Home})
-    (lazy.setup plugins opts)))
-
-{: setup}
+(let [lazy (require :lazy)]
+  (vim.keymap.set :n :<leader>y "<cmd>Lazy home<cr>" {:desc :Home})
+  (lazy.setup {:spec [{:import :plugins}
+                      {:import :plugins.lsp.lspconfig}
+                      {:import :plugins.lsp.mason}]} opts))
diff --git a/fnl/plugins/icons.fnl b/fnl/icons.fnl
index b1115cb..b1115cb 100644
--- a/fnl/plugins/icons.fnl
+++ b/fnl/icons.fnl
diff --git a/fnl/plugins/editor/alpha.fnl b/fnl/plugins/alpha.fnl
index c933a99..89cfc2a 100644
--- a/fnl/plugins/editor/alpha.fnl
+++ b/fnl/plugins/alpha.fnl
@@ -1,6 +1,6 @@
 ;; A customizable greeter.
 
-(local icons (require :plugins.icons))
+(local icons (require :icons))
 
 (local ascii-art ["     ##############..... ############## "
                   "   ##############......##############   "
diff --git a/fnl/plugins/editor/autopairs.fnl b/fnl/plugins/autopairs.fnl
index 36e8ba5..36e8ba5 100644
--- a/fnl/plugins/editor/autopairs.fnl
+++ b/fnl/plugins/autopairs.fnl
diff --git a/fnl/plugins/editor/better-escape.fnl b/fnl/plugins/better-escape.fnl
index 5bd9b0c..5bd9b0c 100644
--- a/fnl/plugins/editor/better-escape.fnl
+++ b/fnl/plugins/better-escape.fnl
diff --git a/fnl/plugins/editor/bqf.fnl b/fnl/plugins/bqf.fnl
index 387ae19..387ae19 100644
--- a/fnl/plugins/editor/bqf.fnl
+++ b/fnl/plugins/bqf.fnl
diff --git a/fnl/plugins/editor/bufdel.fnl b/fnl/plugins/bufdel.fnl
index e14287e..e14287e 100644
--- a/fnl/plugins/editor/bufdel.fnl
+++ b/fnl/plugins/bufdel.fnl
diff --git a/fnl/plugins/editor/cmp.fnl b/fnl/plugins/cmp.fnl
index ca09329..ca09329 100644
--- a/fnl/plugins/editor/cmp.fnl
+++ b/fnl/plugins/cmp.fnl
diff --git a/fnl/plugins/editor/colorizer.fnl b/fnl/plugins/colorizer.fnl
index a61b3e5..a61b3e5 100644
--- a/fnl/plugins/editor/colorizer.fnl
+++ b/fnl/plugins/colorizer.fnl
diff --git a/fnl/plugins/editor/colorscheme.fnl b/fnl/plugins/colorscheme.fnl
index 85c83fd..85c83fd 100644
--- a/fnl/plugins/editor/colorscheme.fnl
+++ b/fnl/plugins/colorscheme.fnl
diff --git a/fnl/plugins/editor/comment.fnl b/fnl/plugins/comment.fnl
index 66abb33..66abb33 100644
--- a/fnl/plugins/editor/comment.fnl
+++ b/fnl/plugins/comment.fnl
diff --git a/fnl/plugins/editor/conform.fnl b/fnl/plugins/conform.fnl
index 511f695..511f695 100644
--- a/fnl/plugins/editor/conform.fnl
+++ b/fnl/plugins/conform.fnl
diff --git a/fnl/plugins/editor/dadbod.fnl b/fnl/plugins/dadbod.fnl
index c5ca5ec..c5ca5ec 100644
--- a/fnl/plugins/editor/dadbod.fnl
+++ b/fnl/plugins/dadbod.fnl
diff --git a/fnl/plugins/editor/dial.fnl b/fnl/plugins/dial.fnl
index 7a888eb..7a888eb 100644
--- a/fnl/plugins/editor/dial.fnl
+++ b/fnl/plugins/dial.fnl
diff --git a/fnl/plugins/editor/diffview.fnl b/fnl/plugins/diffview.fnl
index f041ab6..f041ab6 100644
--- a/fnl/plugins/editor/diffview.fnl
+++ b/fnl/plugins/diffview.fnl
diff --git a/fnl/plugins/editor/dressing.fnl b/fnl/plugins/dressing.fnl
index 60da1b0..60da1b0 100644
--- a/fnl/plugins/editor/dressing.fnl
+++ b/fnl/plugins/dressing.fnl
diff --git a/fnl/plugins/editor/easyread.fnl b/fnl/plugins/easyread.fnl
index 2652203..2652203 100644
--- a/fnl/plugins/editor/easyread.fnl
+++ b/fnl/plugins/easyread.fnl
diff --git a/fnl/plugins/editor/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl
index 4a4583b..4a4583b 100644
--- a/fnl/plugins/editor/git-conflicts.fnl
+++ b/fnl/plugins/git-conflicts.fnl
diff --git a/fnl/plugins/editor/git-worktree.fnl b/fnl/plugins/git-worktree.fnl
index 8812859..8812859 100644
--- a/fnl/plugins/editor/git-worktree.fnl
+++ b/fnl/plugins/git-worktree.fnl
diff --git a/fnl/plugins/editor/gitsigns.fnl b/fnl/plugins/gitsigns.fnl
index 8150f98..a194f3c 100644
--- a/fnl/plugins/editor/gitsigns.fnl
+++ b/fnl/plugins/gitsigns.fnl
@@ -41,7 +41,7 @@
               :mode [:o :x]
               :desc "GitSigns Select Hunk"}])
 
-(local icons (require :plugins.icons))
+(local icons (require :icons))
 
 (local signs {:add {:text (. icons :git-add)}
               :change {:text (. icons :git-add)}
diff --git a/fnl/plugins/editor/harpoon.fnl b/fnl/plugins/harpoon.fnl
index 0791f98..0791f98 100644
--- a/fnl/plugins/editor/harpoon.fnl
+++ b/fnl/plugins/harpoon.fnl
diff --git a/fnl/plugins/core/hotpot.fnl b/fnl/plugins/hotpot.fnl
index eba8083..eba8083 100644
--- a/fnl/plugins/core/hotpot.fnl
+++ b/fnl/plugins/hotpot.fnl
diff --git a/fnl/plugins/init.fnl b/fnl/plugins/init.fnl
deleted file mode 100644
index f451fc9..0000000
--- a/fnl/plugins/init.fnl
+++ /dev/null
@@ -1,18 +0,0 @@
-;; Load all plugins.
-
-(local editor-plugins (let [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)))))
-                        plugins))
-
-(local plugins (let [plugins editor-plugins]
-                 (table.insert plugins (require :plugins.lsp))
-                 (table.insert plugins (require :plugins.core.hotpot))
-                 plugins))
-
-(let [lazy (require :plugins.core.lazy)]
-  (lazy.setup plugins))
diff --git a/fnl/plugins/editor/leap.fnl b/fnl/plugins/leap.fnl
index c5b700d..c5b700d 100644
--- a/fnl/plugins/editor/leap.fnl
+++ b/fnl/plugins/leap.fnl
diff --git a/fnl/plugins/lsp/diagnostics.fnl b/fnl/plugins/lsp/diagnostics.fnl
index 8676924..f4a2a74 100644
--- a/fnl/plugins/lsp/diagnostics.fnl
+++ b/fnl/plugins/lsp/diagnostics.fnl
@@ -1,6 +1,6 @@
 ;; Handlers for the requests and responses from and to the lsp server.
 
-(local icons (require :plugins.icons))
+(local icons (require :icons))
 
 (local signs [{:name :DiagnosticSignError :text (. icons :error)}
               {:name :DiagnosticSignWarn :text (. icons :warn)}
diff --git a/fnl/plugins/lsp/init.fnl b/fnl/plugins/lsp/init.fnl
index f04ba86..c06a5aa 100644
--- a/fnl/plugins/lsp/init.fnl
+++ b/fnl/plugins/lsp/init.fnl
@@ -1,3 +1 @@
 ;; Lsp plugins.
-
-[(require :plugins.lsp.lspconfig) (require :plugins.lsp.mason)]
diff --git a/fnl/plugins/lsp/mason.fnl b/fnl/plugins/lsp/mason.fnl
index f94f328..4187381 100644
--- a/fnl/plugins/lsp/mason.fnl
+++ b/fnl/plugins/lsp/mason.fnl
@@ -1,6 +1,6 @@
 ;; Mason manages external tooling, e.g. lsp, formatters, and linters.
 
-(local icons (require :plugins.icons))
+(local icons (require :icons))
 
 (local opts {:ui {:border :single
                   :icons {:package_installed (.. (. icons :checkmark) " ")
diff --git a/fnl/plugins/editor/lualine.fnl b/fnl/plugins/lualine.fnl
index a34e73e..1afad4f 100644
--- a/fnl/plugins/editor/lualine.fnl
+++ b/fnl/plugins/lualine.fnl
@@ -1,6 +1,6 @@
 ;; Statusbar.
 
-(local icons (require :plugins.icons))
+(local icons (require :icons))
 
 (local disable [:neogitstatus
                 :netrw
diff --git a/fnl/plugins/editor/minibar.fnl b/fnl/plugins/minibar.fnl
index d25489c..d25489c 100644
--- a/fnl/plugins/editor/minibar.fnl
+++ b/fnl/plugins/minibar.fnl
diff --git a/fnl/plugins/editor/neogit.fnl b/fnl/plugins/neogit.fnl
index a84c9dd..a84c9dd 100644
--- a/fnl/plugins/editor/neogit.fnl
+++ b/fnl/plugins/neogit.fnl
diff --git a/fnl/plugins/editor/nvim-lint.fnl b/fnl/plugins/nvim-lint.fnl
index 2ea01fa..2ea01fa 100644
--- a/fnl/plugins/editor/nvim-lint.fnl
+++ b/fnl/plugins/nvim-lint.fnl
diff --git a/fnl/plugins/editor/oil.fnl b/fnl/plugins/oil.fnl
index a15c22e..fac1532 100644
--- a/fnl/plugins/editor/oil.fnl
+++ b/fnl/plugins/oil.fnl
@@ -6,7 +6,7 @@
                        :<C-h> :actions.select_split
                        :<C-t> :actions.select_tab
                        :<C-p> :actions.preview
-                       :<C-c> :actions.close
+                       :q :actions.close
                        :<C-l> :actions.refresh
                        :- :actions.parent
                        :_ :actions.open_cwd
diff --git a/fnl/plugins/editor/orgmode.fnl b/fnl/plugins/orgmode.fnl
index abf98f7..abf98f7 100644
--- a/fnl/plugins/editor/orgmode.fnl
+++ b/fnl/plugins/orgmode.fnl
diff --git a/fnl/plugins/editor/persistence.fnl b/fnl/plugins/persistence.fnl
index 1939564..1939564 100644
--- a/fnl/plugins/editor/persistence.fnl
+++ b/fnl/plugins/persistence.fnl
diff --git a/fnl/plugins/editor/spectre.fnl b/fnl/plugins/spectre.fnl
index c7307f8..c7307f8 100644
--- a/fnl/plugins/editor/spectre.fnl
+++ b/fnl/plugins/spectre.fnl
diff --git a/fnl/plugins/editor/stay-in-place.fnl b/fnl/plugins/stay-in-place.fnl
index b264a05..b264a05 100644
--- a/fnl/plugins/editor/stay-in-place.fnl
+++ b/fnl/plugins/stay-in-place.fnl
diff --git a/fnl/plugins/editor/surround.fnl b/fnl/plugins/surround.fnl
index e8fda32..e8fda32 100644
--- a/fnl/plugins/editor/surround.fnl
+++ b/fnl/plugins/surround.fnl
diff --git a/fnl/plugins/editor/telescope.fnl b/fnl/plugins/telescope.fnl
index 720c69c..1489f06 100644
--- a/fnl/plugins/editor/telescope.fnl
+++ b/fnl/plugins/telescope.fnl
@@ -108,7 +108,7 @@
 (fn config []
   (let [telescope (require :telescope)
         actions (require :telescope.actions)
-        icons (require :plugins.icons)]
+        icons (require :icons)]
     (telescope.setup {:defaults {:prompt_prefix (.. " " (. icons :telescope)
                                                     " ")
                                  :selection_caret (.. (. icons :caret) " ")
diff --git a/fnl/plugins/editor/textobjs.fnl b/fnl/plugins/textobjs.fnl
index 8d68ac3..8d68ac3 100644
--- a/fnl/plugins/editor/textobjs.fnl
+++ b/fnl/plugins/textobjs.fnl
diff --git a/fnl/plugins/editor/toggleterm.fnl b/fnl/plugins/toggleterm.fnl
index 12168aa..12168aa 100644
--- a/fnl/plugins/editor/toggleterm.fnl
+++ b/fnl/plugins/toggleterm.fnl
diff --git a/fnl/plugins/editor/treesitter.fnl b/fnl/plugins/treesitter.fnl
index 103948d..103948d 100644
--- a/fnl/plugins/editor/treesitter.fnl
+++ b/fnl/plugins/treesitter.fnl
diff --git a/fnl/plugins/editor/trouble.fnl b/fnl/plugins/trouble.fnl
index b9a4e3c..35e67a9 100644
--- a/fnl/plugins/editor/trouble.fnl
+++ b/fnl/plugins/trouble.fnl
@@ -2,6 +2,12 @@
 
 (local keys [{1 :<leader>jt
               2 "<cmd>TroubleToggle workspace_diagnostics<cr>"
+              :desc :Trouble}
+             {1 "[e"
+              2 "<cmd>lua require(\"trouble\").previous({skip_groups = true, jump = true});<cr>"
+              :desc :Trouble}
+             {1 "[n"
+              2 "<cmd>lua require(\"trouble\").next({skip_groups = true, jump = true});<cr>"
               :desc :Trouble}])
 
 (local opts {:position :bottom
diff --git a/fnl/plugins/editor/undotree.fnl b/fnl/plugins/undotree.fnl
index 05de139..05de139 100644
--- a/fnl/plugins/editor/undotree.fnl
+++ b/fnl/plugins/undotree.fnl
diff --git a/fnl/plugins/editor/which-key.fnl b/fnl/plugins/which-key.fnl
index 962183e..9251832 100644
--- a/fnl/plugins/editor/which-key.fnl
+++ b/fnl/plugins/which-key.fnl
@@ -1,6 +1,6 @@
 ;; Which-key provides a pop-up menu for some key mappings.
 
-(local icons (require :plugins.icons))
+(local icons (require :icons))
 
 (local opts {:plugins {:marks true
                        :registers true
diff --git a/fnl/plugins/editor/window-picker.fnl b/fnl/plugins/window-picker.fnl
index e396ce1..e396ce1 100644
--- a/fnl/plugins/editor/window-picker.fnl
+++ b/fnl/plugins/window-picker.fnl
diff --git a/fnl/plugins/editor/zen.fnl b/fnl/plugins/zen.fnl
index e9a1576..e9a1576 100644
--- a/fnl/plugins/editor/zen.fnl
+++ b/fnl/plugins/zen.fnl
diff --git a/init.lua b/init.lua
index edc5f6f..d94d2e0 100644
--- a/init.lua
+++ b/init.lua
@@ -26,4 +26,4 @@ require("hotpot").setup {
   },
 }
 require "settings"
-require "plugins"
+require "core"
diff --git a/lazy-lock.json b/lazy-lock.json
index afb5f9f..7172cdf 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,9 +1,9 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "90149d11708d38037e340bf7a668e1a79217680d" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "bdf477a9d30e26881c971bf4b061f0f7b18ce67e" },
   "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" },
-  "better-escape.nvim": { "branch": "master", "commit": "d0e9bc2357d79d88fcbf067e7096812dd917b58f" },
+  "better-escape.nvim": { "branch": "master", "commit": "2d75c375e93ce58b07826a0575a5a33fd2cebbda" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" },
@@ -32,25 +32,25 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" },
   "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" },
   "minibar.nvim": { "branch": "master", "commit": "353ca4efaf7fff1566bb02e0d7cb51133c41f660" },
-  "neogit": { "branch": "master", "commit": "18366c64b0997167a1832056c4c0e1ac30da6e62" },
+  "neogit": { "branch": "master", "commit": "93bf00cd5db1e88ea0ca9105e83f7e97896a7cd2" },
   "no-clown-fiesta.nvim": { "branch": "master", "commit": "ecf3e186d336e03b5ce7ed4e8f7f72ad983947df" },
   "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" },
   "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" },
   "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-lint": { "branch": "master", "commit": "4dbc7ec60b33b656f7c54bb945671a55b18699f2" },
+  "nvim-lint": { "branch": "master", "commit": "d44185d3e57e00c164485a454174294b36ef7067" },
   "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" },
   "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" },
   "nvim-surround": { "branch": "main", "commit": "633a0ab03159569a66b65671b0ffb1a6aed6cf18" },
-  "nvim-treesitter": { "branch": "master", "commit": "65ef62092ef997d2ecf68ede01a0afbda17808c3" },
+  "nvim-treesitter": { "branch": "master", "commit": "8ae4080c5ba59d81b4e49525d4168807bc098e73" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" },
-  "nvim-various-textobjs": { "branch": "main", "commit": "e7d4f3d00ebfd6f29fd46b837a09c19096176133" },
-  "nvim-web-devicons": { "branch": "master", "commit": "cff25ce621e6d15fae0b0bfe38c00be50ce38468" },
+  "nvim-various-textobjs": { "branch": "main", "commit": "3d5fe55e79a7d7b64cd715e37b5db7252379f573" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" },
   "nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" },
-  "oil.nvim": { "branch": "master", "commit": "523b61430cb7365f8f86609c2ea60e48456bac63" },
+  "oil.nvim": { "branch": "master", "commit": "a128e6f75c6a71b7b9ac7ea663949a5209771cd5" },
   "org-bullets.nvim": { "branch": "main", "commit": "6e0d60e901bb939eb526139cb1f8d59065132fd9" },
-  "orgmode": { "branch": "master", "commit": "8040906d983ec7ec1e2aae7bd904ddfbeaff0470" },
+  "orgmode": { "branch": "master", "commit": "9ada64e05c1d0ea5c373c2d69cf2e5b5017b311c" },
   "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
@@ -60,7 +60,7 @@
   "telescope-frecency.nvim": { "branch": "master", "commit": "9c18474d0a4b82435ce141c2a21d9bd7b9189272" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope-orgmode.nvim": { "branch": "main", "commit": "eabff061c3852a9aa94e672a7d2fa4a1ef63f9e2" },
-  "telescope.nvim": { "branch": "master", "commit": "3466159b0fcc1876483f6f53587562628664d850" },
+  "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" },
   "toggleterm.nvim": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" },