diff --git a/vim/lua/pack/setup/neotree.lua b/vim/lua/config/neotree.lua similarity index 100% rename from vim/lua/pack/setup/neotree.lua rename to vim/lua/config/neotree.lua diff --git a/vim/lua/pack/setup/outline.lua b/vim/lua/config/outline.lua similarity index 100% rename from vim/lua/pack/setup/outline.lua rename to vim/lua/config/outline.lua diff --git a/vim/lua/lsp/setup.lua b/vim/lua/lsp/setup.lua deleted file mode 100644 index 91427f0..0000000 --- a/vim/lua/lsp/setup.lua +++ /dev/null @@ -1,15 +0,0 @@ -local config = require 'lspconfig' - -local default = { on_attach = require 'lsp.attach' } -for _, language in ipairs { - "html", - "cssls", - "clangd", - "tsserver", - "lua_ls", - "solargraph", - "standardrb", - "zls", -} do - config[language].setup(default) -end diff --git a/vim/lua/pack/setup.lua b/vim/plugin/packer.lua similarity index 93% rename from vim/lua/pack/setup.lua rename to vim/plugin/packer.lua index 6c66753..02ab068 100644 --- a/vim/lua/pack/setup.lua +++ b/vim/plugin/packer.lua @@ -20,7 +20,7 @@ use { "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended "MunifTanjim/nui.nvim", }; - config = require 'pack.setup.neotree'; + config = require 'config.neotree'; }; { "stevearc/aerial.nvim", config = function() @@ -28,7 +28,7 @@ use { end }; { - "hedyhli/outline.nvim", config = require 'pack.setup.outline'; + "hedyhli/outline.nvim", config = require 'config.outline'; }; { 'jinh0/eyeliner.nvim', config = function() require('eyeliner').setup { diff --git a/vimrc b/vimrc index e02290d..d606ebf 100644 --- a/vimrc +++ b/vimrc @@ -6,10 +6,6 @@ set runtimepath=$VIMRUNTIME,$HOME/.config/nvim,$HOME/.vim let &rtp=&rtp.','.expand(':p:h').'/vim' let &rtp=&rtp.','.expand(':p:h').'/vim/pack/*/start/*' -if has("nvim") - lua require("pack/setup") -end - set nocompatible au VimEnter * TSEnable highlight