From df63eeb98ea6ea72c56a8983b53573f25a2544ba Mon Sep 17 00:00:00 2001 From: Oscar Wallberg Date: Sun, 24 Sep 2023 04:54:30 +0200 Subject: [PATCH] Restructuring --- README.md | 4 +- lua/{lsp/init.lua => lsp.lua} | 2 +- lua/lsp/{config => }/bashls.lua | 0 lua/lsp/{config => }/clangd.lua | 0 lua/lsp/{config => }/cmake.lua | 0 lua/lsp/{config => }/diagnosticls.lua | 0 lua/lsp/{config => }/intelephense.lua | 0 lua/lsp/{config => }/jedi_language_server.lua | 0 lua/lsp/{config => }/lemminx.lua | 0 lua/lsp/{config => }/lua_ls.lua | 0 lua/lsp/{config => }/phpactor.lua | 0 lua/{plugins/init.lua => plugins.lua} | 58 +++++++++---------- lua/plugins/{config => }/aerial.lua | 0 lua/plugins/{config => }/autopairs.lua | 0 lua/plugins/{config => }/bufdelete.lua | 0 lua/plugins/{config => }/catppuccin.lua | 0 lua/plugins/{config => }/cmp.lua | 0 lua/plugins/{config => }/comment.lua | 0 lua/plugins/{config => }/dap.lua | 0 lua/plugins/{config => }/dap_ui.lua | 0 lua/plugins/{config => }/diffview.lua | 0 lua/plugins/{config => }/flog.lua | 0 lua/plugins/{config => }/fugitive.lua | 0 lua/plugins/{config => }/gitsigns.lua | 0 lua/plugins/{config => }/indent-blankline.lua | 0 lua/plugins/{config => }/lspkind.lua | 0 lua/plugins/{config => }/lualine.lua | 0 lua/plugins/{config => }/luasnip.lua | 0 lua/plugins/{config => }/markdown-preview.lua | 0 lua/plugins/{config => }/mason.lua | 0 lua/plugins/{config => }/mason_lspconfig.lua | 0 lua/plugins/{config => }/mason_update_all.lua | 0 lua/plugins/{config => }/move.lua | 0 lua/plugins/{config => }/notify.lua | 0 lua/plugins/{config => }/orgmode.lua | 0 lua/plugins/{config => }/telescope.lua | 0 lua/plugins/{config => }/tokyonight.lua | 0 lua/plugins/{config => }/tree.lua | 0 .../{config => }/treesitter-context.lua | 0 lua/plugins/{config => }/treesitter.lua | 0 lua/plugins/{config => }/vscode.lua | 0 lua/plugins/{config => }/winresizer.lua | 0 lua/plugins/{config => }/winshift.lua | 0 43 files changed, 32 insertions(+), 32 deletions(-) rename lua/{lsp/init.lua => lsp.lua} (99%) rename lua/lsp/{config => }/bashls.lua (100%) rename lua/lsp/{config => }/clangd.lua (100%) rename lua/lsp/{config => }/cmake.lua (100%) rename lua/lsp/{config => }/diagnosticls.lua (100%) rename lua/lsp/{config => }/intelephense.lua (100%) rename lua/lsp/{config => }/jedi_language_server.lua (100%) rename lua/lsp/{config => }/lemminx.lua (100%) rename lua/lsp/{config => }/lua_ls.lua (100%) rename lua/lsp/{config => }/phpactor.lua (100%) rename lua/{plugins/init.lua => plugins.lua} (69%) rename lua/plugins/{config => }/aerial.lua (100%) rename lua/plugins/{config => }/autopairs.lua (100%) rename lua/plugins/{config => }/bufdelete.lua (100%) rename lua/plugins/{config => }/catppuccin.lua (100%) rename lua/plugins/{config => }/cmp.lua (100%) rename lua/plugins/{config => }/comment.lua (100%) rename lua/plugins/{config => }/dap.lua (100%) rename lua/plugins/{config => }/dap_ui.lua (100%) rename lua/plugins/{config => }/diffview.lua (100%) rename lua/plugins/{config => }/flog.lua (100%) rename lua/plugins/{config => }/fugitive.lua (100%) rename lua/plugins/{config => }/gitsigns.lua (100%) rename lua/plugins/{config => }/indent-blankline.lua (100%) rename lua/plugins/{config => }/lspkind.lua (100%) rename lua/plugins/{config => }/lualine.lua (100%) rename lua/plugins/{config => }/luasnip.lua (100%) rename lua/plugins/{config => }/markdown-preview.lua (100%) rename lua/plugins/{config => }/mason.lua (100%) rename lua/plugins/{config => }/mason_lspconfig.lua (100%) rename lua/plugins/{config => }/mason_update_all.lua (100%) rename lua/plugins/{config => }/move.lua (100%) rename lua/plugins/{config => }/notify.lua (100%) rename lua/plugins/{config => }/orgmode.lua (100%) rename lua/plugins/{config => }/telescope.lua (100%) rename lua/plugins/{config => }/tokyonight.lua (100%) rename lua/plugins/{config => }/tree.lua (100%) rename lua/plugins/{config => }/treesitter-context.lua (100%) rename lua/plugins/{config => }/treesitter.lua (100%) rename lua/plugins/{config => }/vscode.lua (100%) rename lua/plugins/{config => }/winresizer.lua (100%) rename lua/plugins/{config => }/winshift.lua (100%) diff --git a/README.md b/README.md index cc6c870..c3a1bfb 100644 --- a/README.md +++ b/README.md @@ -130,8 +130,8 @@ Some servers have additional runtime dependencies: - **bash-language-server**: shellcheck (optional, used for linting) If you don't need some specific language server, and want to get rid of any -warning messages, you may either remove them from the top of `lua/lsp/init.lua` -or disable them in `lua/lsp/config/.lua`. +warning messages, you may either remove them from the top of `lua/lsp.lua` +or disable them in `lua/lsp/.lua`. ### Clipboard see `:checkhealth` and `:h clipboard`. diff --git a/lua/lsp/init.lua b/lua/lsp.lua similarity index 99% rename from lua/lsp/init.lua rename to lua/lsp.lua index efe8bac..e4bb6f8 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp.lua @@ -37,7 +37,7 @@ P.config = { } for server, _ in pairs(P.config) do - local ok, resp = pcall(require, "lsp.config." .. server) + local ok, resp = pcall(require, "lsp." .. server) if not ok then return end diff --git a/lua/lsp/config/bashls.lua b/lua/lsp/bashls.lua similarity index 100% rename from lua/lsp/config/bashls.lua rename to lua/lsp/bashls.lua diff --git a/lua/lsp/config/clangd.lua b/lua/lsp/clangd.lua similarity index 100% rename from lua/lsp/config/clangd.lua rename to lua/lsp/clangd.lua diff --git a/lua/lsp/config/cmake.lua b/lua/lsp/cmake.lua similarity index 100% rename from lua/lsp/config/cmake.lua rename to lua/lsp/cmake.lua diff --git a/lua/lsp/config/diagnosticls.lua b/lua/lsp/diagnosticls.lua similarity index 100% rename from lua/lsp/config/diagnosticls.lua rename to lua/lsp/diagnosticls.lua diff --git a/lua/lsp/config/intelephense.lua b/lua/lsp/intelephense.lua similarity index 100% rename from lua/lsp/config/intelephense.lua rename to lua/lsp/intelephense.lua diff --git a/lua/lsp/config/jedi_language_server.lua b/lua/lsp/jedi_language_server.lua similarity index 100% rename from lua/lsp/config/jedi_language_server.lua rename to lua/lsp/jedi_language_server.lua diff --git a/lua/lsp/config/lemminx.lua b/lua/lsp/lemminx.lua similarity index 100% rename from lua/lsp/config/lemminx.lua rename to lua/lsp/lemminx.lua diff --git a/lua/lsp/config/lua_ls.lua b/lua/lsp/lua_ls.lua similarity index 100% rename from lua/lsp/config/lua_ls.lua rename to lua/lsp/lua_ls.lua diff --git a/lua/lsp/config/phpactor.lua b/lua/lsp/phpactor.lua similarity index 100% rename from lua/lsp/config/phpactor.lua rename to lua/lsp/phpactor.lua diff --git a/lua/plugins/init.lua b/lua/plugins.lua similarity index 69% rename from lua/plugins/init.lua rename to lua/plugins.lua index a0f2d9d..945be8e 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins.lua @@ -23,21 +23,21 @@ local plugins = { lazy = false, name = "catppuccin", config = function () - require("plugins.config.catppuccin") + require("plugins.catppuccin") end, }, { "rcarriga/nvim-notify", priority = 900, lazy = false, - config = function () require("plugins.config.notify") end, + config = function () require("plugins.notify") end, }, { "rafamadriz/friendly-snippets", }, { "L3MON4D3/LuaSnip", - config = function () require("plugins.config.luasnip") end, + config = function () require("plugins.luasnip") end, -- comment out on windows and install jsregexp manually build = ( require("utils").os_name ~= "Windows_NT" @@ -48,7 +48,7 @@ local plugins = { }, { "windwp/nvim-autopairs", - config = function () require("plugins.config.autopairs") end, + config = function () require("plugins.autopairs") end, }, { "saadparwaiz1/cmp_luasnip", @@ -70,21 +70,21 @@ local plugins = { }, { "hrsh7th/nvim-cmp", - config = function () require("plugins.config.cmp") end, + config = function () require("plugins.cmp") end, }, { "onsails/lspkind.nvim", - config = function () require("plugins.config.lspkind") end, + config = function () require("plugins.lspkind") end, }, { "williamboman/mason.nvim", - config = function () require("plugins.config.mason") end, + config = function () require("plugins.mason") end, lazy = true, event = "VimEnter", }, { "williamboman/mason-lspconfig.nvim", - config = function () require("plugins.config.mason_lspconfig") end, + config = function () require("plugins.mason_lspconfig") end, lazy = true, event = "VimEnter", }, @@ -96,37 +96,37 @@ local plugins = { }, { "nvim-treesitter/nvim-treesitter", - config = function () require("plugins.config.treesitter") end, + config = function () require("plugins.treesitter") end, build = ":TSUpdate", lazy = true, event = "VimEnter", }, { "mfussenegger/nvim-dap", - config = function () require("plugins.config.dap") end, + config = function () require("plugins.dap") end, lazy = true, ft = require("lsp"):filetypes(), }, { "rcarriga/nvim-dap-ui", - config = function () require("plugins.config.dap_ui") end, + config = function () require("plugins.dap_ui") end, dependencies = { "mfussenegger/nvim-dap", }, }, { "tpope/vim-fugitive", - config = function () require("plugins.config.fugitive") end, + config = function () require("plugins.fugitive") end, lazy = true, event = "VimEnter", }, { "rbong/vim-flog", - config = function () require("plugins.config.flog") end, + config = function () require("plugins.flog") end, }, { "nvim-lualine/lualine.nvim", - config = function () require("plugins.config.lualine") end, + config = function () require("plugins.lualine") end, lazy = true, event = "VimEnter", dependencies = { @@ -135,13 +135,13 @@ local plugins = { }, { "lewis6991/gitsigns.nvim", - config = function () require("plugins.config.gitsigns") end, + config = function () require("plugins.gitsigns") end, lazy = true, event = "VimEnter", }, { "nvim-telescope/telescope.nvim", - config = function () require("plugins.config.telescope") end, + config = function () require("plugins.telescope") end, lazy = true, event = "VimEnter", dependencies = { @@ -150,25 +150,25 @@ local plugins = { }, { "numToStr/Comment.nvim", - config = function () require("plugins.config.comment") end, + config = function () require("plugins.comment") end, lazy = true, event = "VimEnter", }, { "lukas-reineke/indent-blankline.nvim", - config = function () require("plugins.config.indent-blankline") end, + config = function () require("plugins.indent-blankline") end, lazy = true, event = "VimEnter", }, { "simeji/winresizer", - config = function () require("plugins.config.winresizer") end, + config = function () require("plugins.winresizer") end, lazy = true, keys = { "r", }, }, { "sindrets/winshift.nvim", - config = function () require("plugins.config.winshift") end, + config = function () require("plugins.winshift") end, lazy = true, keys = { "m", }, }, @@ -179,7 +179,7 @@ local plugins = { }, { "kyazdani42/nvim-tree.lua", - config = function () require("plugins.config.tree") end, + config = function () require("plugins.tree") end, dependencies = { "nvim-tree/nvim-web-devicons", }, @@ -191,7 +191,7 @@ local plugins = { }, { "stevearc/aerial.nvim", - config = function () require("plugins.config.aerial") end, + config = function () require("plugins.aerial") end, dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons", @@ -199,23 +199,23 @@ local plugins = { }, { "RubixDev/mason-update-all", - config = function () require("plugins.config.mason_update_all") end, + config = function () require("plugins.mason_update_all") end, }, { "famiu/bufdelete.nvim", - config = function () require("plugins.config.bufdelete") end, + config = function () require("plugins.bufdelete") end, }, { "nvim-treesitter/nvim-treesitter-context", - config = function () require("plugins.config.treesitter-context") end, + config = function () require("plugins.treesitter-context") end, }, { "fedepujol/move.nvim", - config = function () require("plugins.config.move") end, + config = function () require("plugins.move") end, }, { "nvim-orgmode/orgmode", - config = function () require("plugins.config.orgmode") end, + config = function () require("plugins.orgmode") end, dependencies = { "nvim-treesitter/nvim-treesitter", }, @@ -225,7 +225,7 @@ local plugins = { }, { "sindrets/diffview.nvim", - config = function () require("plugins.config.diffview") end, + config = function () require("plugins.diffview") end, dependencies = { "nvim-tree/nvim-web-devicons", }, @@ -233,7 +233,7 @@ local plugins = { { "iamcco/markdown-preview.nvim", build = "cd app && npm install", - config = function () require("plugins.config.markdown-preview") end, + config = function () require("plugins.markdown-preview") end, }, } diff --git a/lua/plugins/config/aerial.lua b/lua/plugins/aerial.lua similarity index 100% rename from lua/plugins/config/aerial.lua rename to lua/plugins/aerial.lua diff --git a/lua/plugins/config/autopairs.lua b/lua/plugins/autopairs.lua similarity index 100% rename from lua/plugins/config/autopairs.lua rename to lua/plugins/autopairs.lua diff --git a/lua/plugins/config/bufdelete.lua b/lua/plugins/bufdelete.lua similarity index 100% rename from lua/plugins/config/bufdelete.lua rename to lua/plugins/bufdelete.lua diff --git a/lua/plugins/config/catppuccin.lua b/lua/plugins/catppuccin.lua similarity index 100% rename from lua/plugins/config/catppuccin.lua rename to lua/plugins/catppuccin.lua diff --git a/lua/plugins/config/cmp.lua b/lua/plugins/cmp.lua similarity index 100% rename from lua/plugins/config/cmp.lua rename to lua/plugins/cmp.lua diff --git a/lua/plugins/config/comment.lua b/lua/plugins/comment.lua similarity index 100% rename from lua/plugins/config/comment.lua rename to lua/plugins/comment.lua diff --git a/lua/plugins/config/dap.lua b/lua/plugins/dap.lua similarity index 100% rename from lua/plugins/config/dap.lua rename to lua/plugins/dap.lua diff --git a/lua/plugins/config/dap_ui.lua b/lua/plugins/dap_ui.lua similarity index 100% rename from lua/plugins/config/dap_ui.lua rename to lua/plugins/dap_ui.lua diff --git a/lua/plugins/config/diffview.lua b/lua/plugins/diffview.lua similarity index 100% rename from lua/plugins/config/diffview.lua rename to lua/plugins/diffview.lua diff --git a/lua/plugins/config/flog.lua b/lua/plugins/flog.lua similarity index 100% rename from lua/plugins/config/flog.lua rename to lua/plugins/flog.lua diff --git a/lua/plugins/config/fugitive.lua b/lua/plugins/fugitive.lua similarity index 100% rename from lua/plugins/config/fugitive.lua rename to lua/plugins/fugitive.lua diff --git a/lua/plugins/config/gitsigns.lua b/lua/plugins/gitsigns.lua similarity index 100% rename from lua/plugins/config/gitsigns.lua rename to lua/plugins/gitsigns.lua diff --git a/lua/plugins/config/indent-blankline.lua b/lua/plugins/indent-blankline.lua similarity index 100% rename from lua/plugins/config/indent-blankline.lua rename to lua/plugins/indent-blankline.lua diff --git a/lua/plugins/config/lspkind.lua b/lua/plugins/lspkind.lua similarity index 100% rename from lua/plugins/config/lspkind.lua rename to lua/plugins/lspkind.lua diff --git a/lua/plugins/config/lualine.lua b/lua/plugins/lualine.lua similarity index 100% rename from lua/plugins/config/lualine.lua rename to lua/plugins/lualine.lua diff --git a/lua/plugins/config/luasnip.lua b/lua/plugins/luasnip.lua similarity index 100% rename from lua/plugins/config/luasnip.lua rename to lua/plugins/luasnip.lua diff --git a/lua/plugins/config/markdown-preview.lua b/lua/plugins/markdown-preview.lua similarity index 100% rename from lua/plugins/config/markdown-preview.lua rename to lua/plugins/markdown-preview.lua diff --git a/lua/plugins/config/mason.lua b/lua/plugins/mason.lua similarity index 100% rename from lua/plugins/config/mason.lua rename to lua/plugins/mason.lua diff --git a/lua/plugins/config/mason_lspconfig.lua b/lua/plugins/mason_lspconfig.lua similarity index 100% rename from lua/plugins/config/mason_lspconfig.lua rename to lua/plugins/mason_lspconfig.lua diff --git a/lua/plugins/config/mason_update_all.lua b/lua/plugins/mason_update_all.lua similarity index 100% rename from lua/plugins/config/mason_update_all.lua rename to lua/plugins/mason_update_all.lua diff --git a/lua/plugins/config/move.lua b/lua/plugins/move.lua similarity index 100% rename from lua/plugins/config/move.lua rename to lua/plugins/move.lua diff --git a/lua/plugins/config/notify.lua b/lua/plugins/notify.lua similarity index 100% rename from lua/plugins/config/notify.lua rename to lua/plugins/notify.lua diff --git a/lua/plugins/config/orgmode.lua b/lua/plugins/orgmode.lua similarity index 100% rename from lua/plugins/config/orgmode.lua rename to lua/plugins/orgmode.lua diff --git a/lua/plugins/config/telescope.lua b/lua/plugins/telescope.lua similarity index 100% rename from lua/plugins/config/telescope.lua rename to lua/plugins/telescope.lua diff --git a/lua/plugins/config/tokyonight.lua b/lua/plugins/tokyonight.lua similarity index 100% rename from lua/plugins/config/tokyonight.lua rename to lua/plugins/tokyonight.lua diff --git a/lua/plugins/config/tree.lua b/lua/plugins/tree.lua similarity index 100% rename from lua/plugins/config/tree.lua rename to lua/plugins/tree.lua diff --git a/lua/plugins/config/treesitter-context.lua b/lua/plugins/treesitter-context.lua similarity index 100% rename from lua/plugins/config/treesitter-context.lua rename to lua/plugins/treesitter-context.lua diff --git a/lua/plugins/config/treesitter.lua b/lua/plugins/treesitter.lua similarity index 100% rename from lua/plugins/config/treesitter.lua rename to lua/plugins/treesitter.lua diff --git a/lua/plugins/config/vscode.lua b/lua/plugins/vscode.lua similarity index 100% rename from lua/plugins/config/vscode.lua rename to lua/plugins/vscode.lua diff --git a/lua/plugins/config/winresizer.lua b/lua/plugins/winresizer.lua similarity index 100% rename from lua/plugins/config/winresizer.lua rename to lua/plugins/winresizer.lua diff --git a/lua/plugins/config/winshift.lua b/lua/plugins/winshift.lua similarity index 100% rename from lua/plugins/config/winshift.lua rename to lua/plugins/winshift.lua