From ae10df6e2c6b41711a0eeb1dd22e27aac4972613 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Thu, 5 Sep 2024 23:06:03 +0200
Subject: [PATCH] nvim: restructure plugin loading.

---
 nvim/lua/user/lazy.lua           | 5 +----
 nvim/lua/user/plugins/editor.lua | 4 ++++
 nvim/lua/user/plugins/ui.lua     | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nvim/lua/user/lazy.lua b/nvim/lua/user/lazy.lua
index 25dc0b7..9ab5dca 100644
--- a/nvim/lua/user/lazy.lua
+++ b/nvim/lua/user/lazy.lua
@@ -17,10 +17,7 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
     spec = {
-        { import = "user.plugins.core" },
-        { import = "user.plugins.ui" },
-        { import = "user.plugins.editor" },
-        { import = "user.plugins.lsp" },
+        { import = "user.plugins" },
 
         -- Language specific
         { import = "user.plugins.lang.lua" },
diff --git a/nvim/lua/user/plugins/editor.lua b/nvim/lua/user/plugins/editor.lua
index b0c5ea7..192e9af 100644
--- a/nvim/lua/user/plugins/editor.lua
+++ b/nvim/lua/user/plugins/editor.lua
@@ -1,4 +1,5 @@
 return {
+    { import = "user.plugins.editor.treesitter" },
     "echasnovski/mini.bufremove",
     {
         "windwp/nvim-autopairs",
@@ -77,6 +78,7 @@ return {
             }
         end,
     },
+    { import = "user.plugins.editor.gitsigns" },
     -- Formatting
     {
         'stevearc/conform.nvim',
@@ -90,6 +92,8 @@ return {
             user.formatter = ":lua require'conform'.format({ async = true })<CR>:<DEL>"
         end
     },
+    { import = "user.plugins.editor.fuzzyfinder" },
+    { import = "user.plugins.editor.autocomplete" },
     -- Snippets
     {
         "L3MON4D3/LuaSnip",
diff --git a/nvim/lua/user/plugins/ui.lua b/nvim/lua/user/plugins/ui.lua
index a8f4bea..f47aca4 100644
--- a/nvim/lua/user/plugins/ui.lua
+++ b/nvim/lua/user/plugins/ui.lua
@@ -1,4 +1,7 @@
 return {
+    { import = "user.plugins.ui.statusline" },
+    -- File explorer
+    { import = "user.plugins.ui.neotree" },
     -- Nicer notifications
     {
         "j-hui/fidget.nvim",
@@ -17,8 +20,6 @@ return {
             }
         }
     },
-    -- File explorer
-    { import = "user.plugins.ui.neotree" },
     {
         "folke/which-key.nvim",
         event = "VeryLazy",