From 7f6cc1833c9d45c023c35ceef7045934f6238813 Mon Sep 17 00:00:00 2001 From: Paul <82609900+Paul-0x5061756c@users.noreply.github.com> Date: Wed, 14 May 2025 16:53:04 +0200 Subject: [PATCH] moved custom plugins to seperate folder --- init.lua | 117 +------------------------- lua/custom/plugins/autoformat.lua | 51 +++++++++++ lua/custom/plugins/autopairs.lua | 8 ++ lua/custom/plugins/github-copilot.lua | 7 ++ lua/custom/plugins/harpoon.lua | 30 +++++++ lua/custom/plugins/lazygit.lua | 14 +++ lua/custom/plugins/neoconf.lua | 7 ++ lua/custom/plugins/vim-razor.lua | 8 ++ 8 files changed, 126 insertions(+), 116 deletions(-) create mode 100644 lua/custom/plugins/autoformat.lua create mode 100644 lua/custom/plugins/autopairs.lua create mode 100644 lua/custom/plugins/github-copilot.lua create mode 100644 lua/custom/plugins/harpoon.lua create mode 100644 lua/custom/plugins/lazygit.lua create mode 100644 lua/custom/plugins/neoconf.lua create mode 100644 lua/custom/plugins/vim-razor.lua diff --git a/init.lua b/init.lua index 94bb550c..ae6baecd 100644 --- a/init.lua +++ b/init.lua @@ -707,121 +707,6 @@ require('lazy').setup({ } end, }, - - -- Vim Razor - { - 'jlcrochet/vim-razor', - lazy = false, - ft = 'cshtml' - }, - - -- Prime's Harpoon2 - { - 'ThePrimeagen/harpoon', - branch = 'harpoon2', - dependencies = { - 'nvim-lua/plenary.nvim', - }, - lazy = false, - config = function() - require('harpoon'):setup({}) - end, - keys = { - { - 'a', - function() - require('harpoon'):list():add() - end, - mode = 'n', - desc = '[A]dd to Harpoon', - }, - { - '', - function() - local files = require('harpoon'):list() or {} - require('harpoon').ui:toggle_quick_menu(files) - end, - desc = 'Toggle Harpoon [E]xplorer', - }, - }, - }, - -- neoconf.nvim - { - 'folke/neoconf.nvim', - lazy = false, - }, - -- Copilot - { - 'github/copilot.vim', - lazy = false, - }, - -- Autopairs - { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - config = true, - }, - -- LazyGit - { - 'kdheepak/lazygit.nvim', - lazy = false, - keys = { - { - 'lg', - 'LazyGit', - desc = '[L]azy [G]it', - }, - }, - }, -{ - -- Autoformat - 'stevearc/conform.nvim', - event = { 'BufWritePre' }, - cmd = { 'ConformInfo' }, - keys = { - { - 'f', - function() - require('conform').format { async = true, lsp_format = 'fallback' } - end, - mode = '', - desc = '[F]ormat buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well-standardized coding style. Add more languages here if needed. - local disable_filetypes = { c = true, cpp = true } - - if vim.g.disable_auto_format or disable_filetypes[vim.bo[bufnr].filetype] then - return false - end - - -- Determine lsp_format option based on filetype - local lsp_format_opt - if disable_filetypes[vim.bo[bufnr].filetype] then - lsp_format_opt = 'never' - else - lsp_format_opt = 'fallback' - end - - return { - timeout_ms = 500, - lsp_format = lsp_format_opt, - } - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, - }, - }, -}, - { -- You can easily change to a different colorscheme. -- Change the name of the colorscheme plugin below, and then -- change the command in the config to whatever the name of that colorscheme is. @@ -927,7 +812,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lua/custom/plugins/autoformat.lua b/lua/custom/plugins/autoformat.lua new file mode 100644 index 00000000..d23b83dc --- /dev/null +++ b/lua/custom/plugins/autoformat.lua @@ -0,0 +1,51 @@ + +return { + { + -- Autoformat + 'stevearc/conform.nvim', + event = { 'BufWritePre' }, + cmd = { 'ConformInfo' }, + keys = { + { + 'f', + function() + require('conform').format { async = true, lsp_format = 'fallback' } + end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well-standardized coding style. Add more languages here if needed. + local disable_filetypes = { c = true, cpp = true } + + if vim.g.disable_auto_format or disable_filetypes[vim.bo[bufnr].filetype] then + return false + end + + -- Determine lsp_format option based on filetype + local lsp_format_opt + if disable_filetypes[vim.bo[bufnr].filetype] then + lsp_format_opt = 'never' + else + lsp_format_opt = 'fallback' + end + + return { + timeout_ms = 500, + lsp_format = lsp_format_opt, + } + end, + formatters_by_ft = { + lua = { 'stylua' }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- You can use 'stop_after_first' to run the first available formatter from the list + -- javascript = { "prettierd", "prettier", stop_after_first = true }, + }, + }, +} +} diff --git a/lua/custom/plugins/autopairs.lua b/lua/custom/plugins/autopairs.lua new file mode 100644 index 00000000..9c32eac8 --- /dev/null +++ b/lua/custom/plugins/autopairs.lua @@ -0,0 +1,8 @@ +return { + -- Autopairs + { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + config = true, + } +} diff --git a/lua/custom/plugins/github-copilot.lua b/lua/custom/plugins/github-copilot.lua new file mode 100644 index 00000000..016a2f27 --- /dev/null +++ b/lua/custom/plugins/github-copilot.lua @@ -0,0 +1,7 @@ +return { + -- Copilot + { + 'github/copilot.vim', + lazy = false, + }, +} diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua new file mode 100644 index 00000000..ec80b9aa --- /dev/null +++ b/lua/custom/plugins/harpoon.lua @@ -0,0 +1,30 @@ +return { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { + 'nvim-lua/plenary.nvim', + }, + lazy = false, + config = function() + require('harpoon'):setup({}) + end, + keys = { + { + 'a', + function() + require('harpoon'):list():add() + end, + mode = 'n', + desc = '[A]dd to Harpoon', + }, + { + '', + function() + local files = require('harpoon'):list() or {} + require('harpoon').ui:toggle_quick_menu(files) + end, + desc = 'Toggle Harpoon [E]xplorer', + }, + }, +} + diff --git a/lua/custom/plugins/lazygit.lua b/lua/custom/plugins/lazygit.lua new file mode 100644 index 00000000..0ed09b40 --- /dev/null +++ b/lua/custom/plugins/lazygit.lua @@ -0,0 +1,14 @@ +return { + -- LazyGit + { + 'kdheepak/lazygit.nvim', + lazy = false, + keys = { + { + 'lg', + 'LazyGit', + desc = '[L]azy [G]it', + }, + }, + }, +} diff --git a/lua/custom/plugins/neoconf.lua b/lua/custom/plugins/neoconf.lua new file mode 100644 index 00000000..9a09fe64 --- /dev/null +++ b/lua/custom/plugins/neoconf.lua @@ -0,0 +1,7 @@ +return { + -- neoconf.nvim + { + 'folke/neoconf.nvim', + lazy = false, + } +} diff --git a/lua/custom/plugins/vim-razor.lua b/lua/custom/plugins/vim-razor.lua new file mode 100644 index 00000000..ddd64635 --- /dev/null +++ b/lua/custom/plugins/vim-razor.lua @@ -0,0 +1,8 @@ +return { + { + 'jlcrochet/vim-razor', + lazy = false, + ft = 'cshtml' + } +} +