Categorize plugins into core, extra, and colorschemes

lua/valeth/lazy.lua

@@ -55,6 +55,8 @@ require("lazy").setup({
         border = "rounded",
     },
     spec = {
-        { import = "valeth.plugins" },
+        { import = "valeth.plugins.colorschemes" },
+        { import = "valeth.plugins.core" },
+        { import = "valeth.plugins.extra" },
     }
 })

lua/valeth/options.lua

@@ -22,6 +22,9 @@ vim.opt.fillchars:append({ eob = "·" })
 
 vim.g.mapleader = " "
 
+vim.diagnostic.config({
+    virtual_text = false,
+})
 
 augroup("valeth", { clear = true })
 

lua/valeth/plugins/colorschemes.lua

@@ -1,42 +0,0 @@
-local ayu_spec = {
-    "valeth/ayu-nvim",
-    branch = "fold-column-fg",
-    enabled = false,
-    lazy = false,
-    priority = 1000,
-    config = function()
-        vim.g.ayu_mirage = true
-        vim.cmd.colorscheme("ayu")
-    end
-}
-
-local catppuccin_spec = {
-    "catppuccin/nvim",
-    name = "catppuccin",
-    enabled = true,
-    lazy = false,
-    priority = 1000,
-    config = function()
-        require("catppuccin").setup({
-            custom_highlights = function(colors)
-                return {
-                    Folded = { bg = colors.none },
-                    UfoFoldedEllipsis = { fg = colors.blue, bg = colors.none },
-                }
-            end,
-            integrations = {
-                mason = true,
-                noice = true,
-                harpoon = true,
-                lsp_trouble = true,
-                which_key = true,
-            }
-        })
-
-        vim.cmd.colorscheme("catppuccin")
-    end
-}
-
-return {
-    ayu_spec, catppuccin_spec
-}

lua/valeth/plugins/colorschemes/ayu.lua

@@ -0,0 +1,16 @@
+local spec = {
+    "valeth/ayu-nvim",
+    branch = "fold-column-fg",
+    enabled = false,
+    lazy = false,
+    priority = 1000,
+}
+
+
+spec.config = function()
+    vim.g.ayu_mirage = true
+    vim.cmd.colorscheme("ayu")
+end
+
+
+return spec

lua/valeth/plugins/colorschemes/catppuccin.lua

@@ -0,0 +1,31 @@
+local spec = {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    enabled = true,
+    lazy = false,
+    priority = 1000,
+};
+
+
+spec.config = function()
+    require("catppuccin").setup({
+        custom_highlights = function(colors)
+            return {
+                Folded = { bg = colors.none },
+                UfoFoldedEllipsis = { fg = colors.blue, bg = colors.none },
+            }
+        end,
+        integrations = {
+            mason = true,
+            noice = true,
+            harpoon = true,
+            lsp_trouble = true,
+            which_key = true,
+        }
+    })
+
+    vim.cmd.colorscheme("catppuccin")
+end
+
+
+return spec

lua/valeth/plugins/extra/dressing.lua

@@ -0,0 +1,4 @@
+return {
+    "stevearc/dressing.nvim",
+    opts = {},
+}

lua/valeth/plugins/extra/indent-blankline.lua

@@ -0,0 +1,13 @@
+
+return {
+        "lukas-reineke/indent-blankline.nvim",
+        dependencies = {
+            "nvim-treesitter/nvim-treesitter",
+        },
+        main = "ibl",
+        opts = {
+            scope = {
+                show_start = false,
+            }
+        }
+    }

lua/valeth/plugins/extra/lualine.lua

@@ -1,10 +1,10 @@
 local spec = {
     "nvim-lualine/lualine.nvim",
+    dependencies = {
+        "nvim-tree/nvim-web-devicons",
+    }
 }
 
-spec.dependencies = {
-    "nvim-tree/nvim-web-devicons",
-}
 
 local function macro_recording()
     local reg = vim.fn.reg_recording()
@@ -16,6 +16,7 @@ local function macro_recording()
     return "REC @ " .. reg
 end
 
+
 spec.config = function()
     require("lualine").setup({
         sections = {
@@ -40,4 +41,5 @@ spec.config = function()
     })
 end
 
+
 return spec

lua/valeth/plugins/extra/noice.lua

@@ -0,0 +1,36 @@
+return {
+    "folke/noice.nvim",
+    event = "VeryLazy",
+    opts = {
+        notify = {
+            -- keep this disabled until I find a solution to make it less obnoxious
+            enabled = false
+        },
+        lsp = {
+            override = {
+                ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+                ["vim.lsp.util.stylize_markdown"] = true,
+                ["cmp.entry.get_documentation"] = true,
+            },
+        },
+        presets = {
+            command_palette = true,
+            lsp_doc_border = true,
+        },
+        messages = {
+            view = "mini",
+        },
+        views = {
+            notify = {
+                replace = true,
+            },
+        },
+    },
+    keys = {
+        { "<leader>nd", "<cmd>NoiceDismiss<CR>", desc = "Dismiss all noice messages" },
+    },
+    dependencies = {
+        "MunifTanjim/nui.nvim",
+        "rcarriga/nvim-notify",
+    }
+}

lua/valeth/plugins/extra/rainbow_csv.lua

@@ -0,0 +1,5 @@
+return {
+    "cameron-wags/rainbow_csv.nvim",
+    ft = "csv",
+    opts = {},
+}

lua/valeth/plugins/indent-blankline.lua

@@ -1,15 +0,0 @@
-local spec = {
-    "lukas-reineke/indent-blankline.nvim",
-    dependencies = {
-        "nvim-treesitter/nvim-treesitter",
-    },
-    main = "ibl",
-}
-
-spec.opts = {
-    scope = {
-        show_start = false,
-    }
-}
-
-return spec

lua/valeth/plugins/init.lua

@@ -1,16 +0,0 @@
-vim.diagnostic.config({
-    virtual_text = false,
-})
-
-return {
-    {
-        "cameron-wags/rainbow_csv.nvim",
-        ft = "csv",
-        opts = {},
-    },
-
-    {
-        "stevearc/dressing.nvim",
-        opts = {},
-    },
-}

lua/valeth/plugins/noice.lua

@@ -1,42 +0,0 @@
-local spec = {
-    "folke/noice.nvim",
-}
-
-spec.event = "VeryLazy"
-
-spec.opts = {
-    notify = {
-        -- keep this disabled until I find a solution to make it less obnoxious
-        enabled = false
-    },
-    lsp = {
-        override = {
-            ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-            ["vim.lsp.util.stylize_markdown"] = true,
-            ["cmp.entry.get_documentation"] = true,
-        },
-    },
-    presets = {
-        command_palette = true,
-        lsp_doc_border = true,
-    },
-    messages = {
-        view = "mini",
-    },
-    views = {
-        notify = {
-            replace = true,
-        },
-    },
-}
-
-spec.keys = {
-    { "<leader>nd", "<cmd>NoiceDismiss<CR>", desc = "Dismiss all noice messages" },
-}
-
-spec.dependencies = {
-    "MunifTanjim/nui.nvim",
-    "rcarriga/nvim-notify",
-}
-
-return spec