From 38203fbe761cb07918150456c359b4f24b44a086 Mon Sep 17 00:00:00 2001 From: Patrick Auernig Date: Fri, 6 Dec 2024 19:42:17 +0100 Subject: [PATCH] Categorize plugins into core, extra, and colorschemes --- lua/valeth/lazy.lua | 4 +- lua/valeth/options.lua | 3 ++ lua/valeth/plugins/colorschemes.lua | 42 ------------------- lua/valeth/plugins/colorschemes/ayu.lua | 16 +++++++ .../plugins/colorschemes/catppuccin.lua | 31 ++++++++++++++ lua/valeth/plugins/{ => core}/cmp.lua | 0 lua/valeth/plugins/{ => core}/lsp.lua | 0 lua/valeth/plugins/{ => core}/neogit.lua | 0 lua/valeth/plugins/{ => core}/oil.lua | 0 lua/valeth/plugins/{ => core}/resession.lua | 0 lua/valeth/plugins/{ => core}/telescope.lua | 0 lua/valeth/plugins/{ => core}/treesitter.lua | 0 lua/valeth/plugins/{ => extra}/cloak.lua | 0 lua/valeth/plugins/{ => extra}/crates.lua | 0 lua/valeth/plugins/extra/dressing.lua | 4 ++ lua/valeth/plugins/{ => extra}/formatting.lua | 0 lua/valeth/plugins/{ => extra}/harpoon.lua | 0 lua/valeth/plugins/extra/indent-blankline.lua | 13 ++++++ lua/valeth/plugins/{ => extra}/lualine.lua | 8 ++-- lua/valeth/plugins/extra/noice.lua | 36 ++++++++++++++++ lua/valeth/plugins/extra/rainbow_csv.lua | 5 +++ .../plugins/{ => extra}/render-markdown.lua | 0 lua/valeth/plugins/{ => extra}/statuscol.lua | 0 lua/valeth/plugins/{ => extra}/trouble.lua | 0 lua/valeth/plugins/{ => extra}/ufo.lua | 0 lua/valeth/plugins/{ => extra}/wakatime.lua | 0 lua/valeth/plugins/{ => extra}/whichkey.lua | 0 lua/valeth/plugins/indent-blankline.lua | 15 ------- lua/valeth/plugins/init.lua | 16 ------- lua/valeth/plugins/noice.lua | 42 ------------------- 30 files changed, 116 insertions(+), 119 deletions(-) delete mode 100644 lua/valeth/plugins/colorschemes.lua create mode 100644 lua/valeth/plugins/colorschemes/ayu.lua create mode 100644 lua/valeth/plugins/colorschemes/catppuccin.lua rename lua/valeth/plugins/{ => core}/cmp.lua (100%) rename lua/valeth/plugins/{ => core}/lsp.lua (100%) rename lua/valeth/plugins/{ => core}/neogit.lua (100%) rename lua/valeth/plugins/{ => core}/oil.lua (100%) rename lua/valeth/plugins/{ => core}/resession.lua (100%) rename lua/valeth/plugins/{ => core}/telescope.lua (100%) rename lua/valeth/plugins/{ => core}/treesitter.lua (100%) rename lua/valeth/plugins/{ => extra}/cloak.lua (100%) rename lua/valeth/plugins/{ => extra}/crates.lua (100%) create mode 100644 lua/valeth/plugins/extra/dressing.lua rename lua/valeth/plugins/{ => extra}/formatting.lua (100%) rename lua/valeth/plugins/{ => extra}/harpoon.lua (100%) create mode 100644 lua/valeth/plugins/extra/indent-blankline.lua rename lua/valeth/plugins/{ => extra}/lualine.lua (92%) create mode 100644 lua/valeth/plugins/extra/noice.lua create mode 100644 lua/valeth/plugins/extra/rainbow_csv.lua rename lua/valeth/plugins/{ => extra}/render-markdown.lua (100%) rename lua/valeth/plugins/{ => extra}/statuscol.lua (100%) rename lua/valeth/plugins/{ => extra}/trouble.lua (100%) rename lua/valeth/plugins/{ => extra}/ufo.lua (100%) rename lua/valeth/plugins/{ => extra}/wakatime.lua (100%) rename lua/valeth/plugins/{ => extra}/whichkey.lua (100%) delete mode 100644 lua/valeth/plugins/indent-blankline.lua delete mode 100644 lua/valeth/plugins/init.lua delete mode 100644 lua/valeth/plugins/noice.lua diff --git a/lua/valeth/lazy.lua b/lua/valeth/lazy.lua index 18e184d..3bb44c4 100644 --- a/lua/valeth/lazy.lua +++ b/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" }, } }) diff --git a/lua/valeth/options.lua b/lua/valeth/options.lua index 89e0696..529a9a8 100644 --- a/lua/valeth/options.lua +++ b/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 }) diff --git a/lua/valeth/plugins/colorschemes.lua b/lua/valeth/plugins/colorschemes.lua deleted file mode 100644 index 9b36669..0000000 --- a/lua/valeth/plugins/colorschemes.lua +++ /dev/null @@ -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 -} diff --git a/lua/valeth/plugins/colorschemes/ayu.lua b/lua/valeth/plugins/colorschemes/ayu.lua new file mode 100644 index 0000000..7b88d99 --- /dev/null +++ b/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 diff --git a/lua/valeth/plugins/colorschemes/catppuccin.lua b/lua/valeth/plugins/colorschemes/catppuccin.lua new file mode 100644 index 0000000..9b2ba6f --- /dev/null +++ b/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 diff --git a/lua/valeth/plugins/cmp.lua b/lua/valeth/plugins/core/cmp.lua similarity index 100% rename from lua/valeth/plugins/cmp.lua rename to lua/valeth/plugins/core/cmp.lua diff --git a/lua/valeth/plugins/lsp.lua b/lua/valeth/plugins/core/lsp.lua similarity index 100% rename from lua/valeth/plugins/lsp.lua rename to lua/valeth/plugins/core/lsp.lua diff --git a/lua/valeth/plugins/neogit.lua b/lua/valeth/plugins/core/neogit.lua similarity index 100% rename from lua/valeth/plugins/neogit.lua rename to lua/valeth/plugins/core/neogit.lua diff --git a/lua/valeth/plugins/oil.lua b/lua/valeth/plugins/core/oil.lua similarity index 100% rename from lua/valeth/plugins/oil.lua rename to lua/valeth/plugins/core/oil.lua diff --git a/lua/valeth/plugins/resession.lua b/lua/valeth/plugins/core/resession.lua similarity index 100% rename from lua/valeth/plugins/resession.lua rename to lua/valeth/plugins/core/resession.lua diff --git a/lua/valeth/plugins/telescope.lua b/lua/valeth/plugins/core/telescope.lua similarity index 100% rename from lua/valeth/plugins/telescope.lua rename to lua/valeth/plugins/core/telescope.lua diff --git a/lua/valeth/plugins/treesitter.lua b/lua/valeth/plugins/core/treesitter.lua similarity index 100% rename from lua/valeth/plugins/treesitter.lua rename to lua/valeth/plugins/core/treesitter.lua diff --git a/lua/valeth/plugins/cloak.lua b/lua/valeth/plugins/extra/cloak.lua similarity index 100% rename from lua/valeth/plugins/cloak.lua rename to lua/valeth/plugins/extra/cloak.lua diff --git a/lua/valeth/plugins/crates.lua b/lua/valeth/plugins/extra/crates.lua similarity index 100% rename from lua/valeth/plugins/crates.lua rename to lua/valeth/plugins/extra/crates.lua diff --git a/lua/valeth/plugins/extra/dressing.lua b/lua/valeth/plugins/extra/dressing.lua new file mode 100644 index 0000000..68d0aa8 --- /dev/null +++ b/lua/valeth/plugins/extra/dressing.lua @@ -0,0 +1,4 @@ +return { + "stevearc/dressing.nvim", + opts = {}, +} diff --git a/lua/valeth/plugins/formatting.lua b/lua/valeth/plugins/extra/formatting.lua similarity index 100% rename from lua/valeth/plugins/formatting.lua rename to lua/valeth/plugins/extra/formatting.lua diff --git a/lua/valeth/plugins/harpoon.lua b/lua/valeth/plugins/extra/harpoon.lua similarity index 100% rename from lua/valeth/plugins/harpoon.lua rename to lua/valeth/plugins/extra/harpoon.lua diff --git a/lua/valeth/plugins/extra/indent-blankline.lua b/lua/valeth/plugins/extra/indent-blankline.lua new file mode 100644 index 0000000..c892c56 --- /dev/null +++ b/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, + } + } + } diff --git a/lua/valeth/plugins/lualine.lua b/lua/valeth/plugins/extra/lualine.lua similarity index 92% rename from lua/valeth/plugins/lualine.lua rename to lua/valeth/plugins/extra/lualine.lua index ac83baa..67740e1 100644 --- a/lua/valeth/plugins/lualine.lua +++ b/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 diff --git a/lua/valeth/plugins/extra/noice.lua b/lua/valeth/plugins/extra/noice.lua new file mode 100644 index 0000000..c6c41b0 --- /dev/null +++ b/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 = { + { "nd", "NoiceDismiss", desc = "Dismiss all noice messages" }, + }, + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + } +} diff --git a/lua/valeth/plugins/extra/rainbow_csv.lua b/lua/valeth/plugins/extra/rainbow_csv.lua new file mode 100644 index 0000000..359a48b --- /dev/null +++ b/lua/valeth/plugins/extra/rainbow_csv.lua @@ -0,0 +1,5 @@ +return { + "cameron-wags/rainbow_csv.nvim", + ft = "csv", + opts = {}, +} diff --git a/lua/valeth/plugins/render-markdown.lua b/lua/valeth/plugins/extra/render-markdown.lua similarity index 100% rename from lua/valeth/plugins/render-markdown.lua rename to lua/valeth/plugins/extra/render-markdown.lua diff --git a/lua/valeth/plugins/statuscol.lua b/lua/valeth/plugins/extra/statuscol.lua similarity index 100% rename from lua/valeth/plugins/statuscol.lua rename to lua/valeth/plugins/extra/statuscol.lua diff --git a/lua/valeth/plugins/trouble.lua b/lua/valeth/plugins/extra/trouble.lua similarity index 100% rename from lua/valeth/plugins/trouble.lua rename to lua/valeth/plugins/extra/trouble.lua diff --git a/lua/valeth/plugins/ufo.lua b/lua/valeth/plugins/extra/ufo.lua similarity index 100% rename from lua/valeth/plugins/ufo.lua rename to lua/valeth/plugins/extra/ufo.lua diff --git a/lua/valeth/plugins/wakatime.lua b/lua/valeth/plugins/extra/wakatime.lua similarity index 100% rename from lua/valeth/plugins/wakatime.lua rename to lua/valeth/plugins/extra/wakatime.lua diff --git a/lua/valeth/plugins/whichkey.lua b/lua/valeth/plugins/extra/whichkey.lua similarity index 100% rename from lua/valeth/plugins/whichkey.lua rename to lua/valeth/plugins/extra/whichkey.lua diff --git a/lua/valeth/plugins/indent-blankline.lua b/lua/valeth/plugins/indent-blankline.lua deleted file mode 100644 index fef5e02..0000000 --- a/lua/valeth/plugins/indent-blankline.lua +++ /dev/null @@ -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 diff --git a/lua/valeth/plugins/init.lua b/lua/valeth/plugins/init.lua deleted file mode 100644 index bb27495..0000000 --- a/lua/valeth/plugins/init.lua +++ /dev/null @@ -1,16 +0,0 @@ -vim.diagnostic.config({ - virtual_text = false, -}) - -return { - { - "cameron-wags/rainbow_csv.nvim", - ft = "csv", - opts = {}, - }, - - { - "stevearc/dressing.nvim", - opts = {}, - }, -} diff --git a/lua/valeth/plugins/noice.lua b/lua/valeth/plugins/noice.lua deleted file mode 100644 index b07fea4..0000000 --- a/lua/valeth/plugins/noice.lua +++ /dev/null @@ -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 = { - { "nd", "NoiceDismiss", desc = "Dismiss all noice messages" }, -} - -spec.dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", -} - -return spec