init.lua @ 4167c4a9aeb3cca88ceb2fe1a8d4f5e775169597

M lua/plugin/cmp.lua →lua/plugin/cmp.lua

M lua/plugin/dap.lua →lua/plugin/dap.lua

M lua/plugin/gitsigns.lua →lua/plugin/gitsigns.lua

M lua/lsp/config.lua →lua/lsp/config.lua

@@ -28,7 +28,7 @@
   require("nvim-lsp-installer").on_server_ready(function(server)
     local opts = { on_attach = on_attach }
 
-    local ok, user_opts = pcall(require, "plugin.configs.lsp.providers." .. server.name)
+    local ok, user_opts = pcall(require, "lsp.providers." .. server.name)
     if ok then
       opts = vim.tbl_deep_extend("force", opts, user_opts)
     end

M lua/lsp/null-ls.lua →lua/lsp/null-ls.lua

M lua/lsp/providers/jsonls.lua →lua/lsp/providers/jsonls.lua

M lua/lsp/providers/rust_analyzer.lua →lua/lsp/providers/rust_analyzer.lua

M lua/lsp/providers/sumneko_lua.lua →lua/lsp/providers/sumneko_lua.lua

M lua/lsp/providers/yamlls.lua →lua/lsp/providers/yamlls.lua

M lua/plugin/nvimtree.lua →lua/plugin/nvimtree.lua

M lua/plugin/project.lua →lua/plugin/project.lua

M lua/plugin/statusline.lua →lua/plugin/statusline.lua

M lua/plugin/telescope.lua →lua/plugin/telescope.lua

M lua/plugin/terminal.lua →lua/plugin/terminal.lua

M lua/plugin/treesitter.lua →lua/plugin/treesitter.lua

M lua/plugin/ultest.lua →lua/plugin/ultest.lua

M lua/plugin.lua →lua/plugin.lua

@@ -20,41 +20,33 @@ end,
   }
 
   use {
-    "lewis6991/spellsitter.nvim",
+    "NTBBloodbath/rest.nvim",
+    ft = "http",
     config = function()
-      require("spellsitter").setup()
+      require("rest-nvim").setup {}
     end,
   }
 
   use {
-    "NTBBloodbath/rest.nvim",
-    ft = "http",
+    "neovim/nvim-lspconfig",
+    requires = "williamboman/nvim-lsp-installer",
     config = function()
-    require("rest-nvim").setup{}
-    end
+      require("lsp.config").setup()
+    end,
   }
 
   use {
-    "neovim/nvim-lspconfig",
-    requires = {
-      "williamboman/nvim-lsp-installer",
-      {
-        "jose-elias-alvarez/null-ls.nvim",
-        after = "nvim-lspconfig",
-        config = function()
-          require("plugin.configs.lsp.null-ls").setup()
-        end,
-      },
-    },
+    "jose-elias-alvarez/null-ls.nvim",
+    after = "nvim-lspconfig",
     config = function()
-      require("plugin.configs.lsp.config").setup()
+      require("lsp.null-ls").setup()
     end,
   }
 
   use {
     "ahmedkhalf/project.nvim",
     config = function()
-      require("plugin.configs.project").setup()
+      require("plugin.project").setup()
     end,
   }
 
@@ -64,18 +56,9 @@ requires = {
       "Pocco81/DAPInstall.nvim",
       "theHamsta/nvim-dap-virtual-text",
       "nvim-telescope/telescope-dap.nvim",
-      { "jbyuki/one-small-step-for-vimkind", ft = "lua"},
     },
     config = function()
-      require("plugin.configs.dap").setup()
-    end,
-  }
-
-  use {
-    "folke/trouble.nvim",
-    cmd = "TroubleToggle",
-    config = function()
-      require("trouble").setup {}
+      require("plugin.dap").setup()
     end,
   }
 
@@ -90,14 +73,14 @@
   use {
     "lewis6991/gitsigns.nvim",
     config = function()
-      require("plugin.configs.gitsigns").setup()
+      require("plugin.gitsigns").setup()
     end,
   }
 
   use {
     "nvim-lualine/lualine.nvim",
     config = function()
-      require("plugin.configs.statusline").setup()
+      require("plugin.statusline").setup()
     end,
   }
 
@@ -107,7 +90,7 @@ requires = { { "vim-test/vim-test", after = "vim-ultest" } },
     cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" },
     run = ":UpdateRemotePlugins",
     config = function()
-      require("plugin.configs.ultest").setup()
+      require("plugin.ultest").setup()
     end,
   }
 
@@ -126,14 +109,11 @@ { "hrsh7th/cmp-nvim-lsp", after = "nvim-cmp" },
       { "hrsh7th/cmp-buffer", after = "nvim-cmp" },
       {
         "saadparwaiz1/cmp_luasnip",
-        requires = {
-          { "L3MON4D3/LuaSnip", after = "cmp_luasnip" },
-          { "rafamadriz/friendly-snippets", after = "LuaSnip" },
-        },
+        requires = { { "L3MON4D3/LuaSnip", after = "cmp_luasnip" }, { "rafamadriz/friendly-snippets", after = "LuaSnip" } },
       },
     },
     config = function()
-      require("plugin.configs.cmp").setup()
+      require("plugin.cmp").setup()
     end,
   }
 
@@ -148,7 +128,7 @@ use {
     "nvim-telescope/telescope.nvim",
     cmd = "Telescope",
     config = function()
-      require("plugin.configs.telescope").setup()
+      require("plugin.telescope").setup()
     end,
   }
 
@@ -156,7 +136,7 @@ use {
     "kyazdani42/nvim-tree.lua",
     cmd = "NvimTreeToggle",
     config = function()
-      require("plugin.configs.nvimtree").setup()
+      require("plugin.nvimtree").setup()
     end,
   }
 
@@ -164,14 +144,13 @@ use {
     "nvim-treesitter/nvim-treesitter",
     branch = "0.5-compat",
     config = function()
-      require("plugin.configs.treesitter").setup()
+      require("plugin.treesitter").setup()
     end,
   }
 
   use {
     "Smirnov-O/ts-unit.nvim",
     after = "nvim-treesitter",
-    -- keys = { "vip", "cip", "dip", "yip" },
     config = function()
       require("ts-unit").setup { keymaps = true }
     end,
@@ -181,7 +160,7 @@ use {
     "akinsho/toggleterm.nvim",
     keys = "<C-t>",
     config = function()
-      require("plugin.configs.terminal").setup()
+      require("plugin.terminal").setup()
     end,
   }
 end)