Refactored nvim config to make it easier and less insanely nested

.config/nvim/init.lua

@@ -3,10 +3,10 @@ vim.loader.enable()
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
-require('custom.config.options')
+require('options')
 vim.schedule(function()
-    require('custom.config.keymaps')
-    require('custom.config.commands')
+    require('keymaps')
+    require('commands')
 end)
 
 local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
@@ -21,7 +21,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
     })
 end
 vim.opt.rtp:prepend(lazypath)
-require('lazy').setup({ import = 'custom/plugins' }, {
+require('lazy').setup({ import = 'plugins' }, {
     change_detection = { enabled = true, notify = false },
     defaults = { lazy = true },
     ui = {

.config/nvim/lua/cmp_helper.lua

@@ -1,5 +1,5 @@
 -- Load cmp_opts
-for _, ft_path in ipairs(vim.api.nvim_get_runtime_file('lua/custom/snippets/*.lua', true)) do
+for _, ft_path in ipairs(vim.api.nvim_get_runtime_file('lua/snippets/*.lua', true)) do
     loadfile(ft_path)()
 end
 

.config/nvim/lua/lsp.lua

@@ -1,7 +1,7 @@
 local lspconfig = require('lspconfig')
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
-local servers = require('custom.config.language-servers')
+local servers = require('language-servers')
 for name, config in pairs(servers) do
     if config == false then
         goto continue
@@ -68,6 +68,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
         end
 
         -- Register buffer local LSP keymaps
-        require('custom.config.lsp-keymaps').setup(bufnr)
+        require('lsp-keymaps').setup(bufnr)
     end,
 })

.config/nvim/lua/plugins/lualine.lua

@@ -3,6 +3,6 @@ return {
     dependencies = { 'nvim-tree/nvim-web-devicons', 'linrongbin16/lsp-progress.nvim' },
     event = 'VeryLazy',
     config = function()
-        require('custom.config.lualine')
+        require('lualine_helper')
     end,
 }

.config/nvim/lua/plugins/nvim-cmp.lua

@@ -1,6 +1,6 @@
 return {
     'hrsh7th/nvim-cmp',
-    event = "InsertEnter",
+    event = 'InsertEnter',
     dependencies = {
         'onsails/lspkind.nvim', -- icons for completion type
         'hrsh7th/cmp-path', -- complete filepaths
@@ -9,6 +9,6 @@ return {
         { 'L3MON4D3/LuaSnip', build = 'make install_jsregexp' }, -- snippets plugin
     },
     config = function()
-        require('custom.config.cmp')
+        require('cmp_helper')
     end,
 }

.config/nvim/lua/plugins/nvim-dap.lua

@@ -7,7 +7,7 @@ return {
     config = function() end,
     opts = function()
         -- Load dap keymaps
-        require('custom.config.dap-keymaps')
+        require('dap-keymaps')
         local dap = require('dap')
 
         -- Setup C/C++ dap

.config/nvim/lua/plugins/nvim-lspconfig.lua

@@ -10,7 +10,7 @@ return {
             'williamboman/mason-lspconfig.nvim',
             build = ':MasonUpdate',
             config = function()
-                local language_servers = require('custom.config.language-servers')
+                local language_servers = require('language-servers')
                 local ensure_installed = vim.tbl_filter(function(key)
                     local server = language_servers[key]
                     if type(server) == 'table' then
@@ -27,6 +27,6 @@ return {
         },
     },
     config = function()
-        require('custom.config.lsp')
+        require('lsp')
     end,
 }

.config/nvim/lua/plugins/rustaceanvim.lua

@@ -2,7 +2,7 @@ return {
     'mrcjkb/rustaceanvim',
     version = '^5',
     lazy = false, -- already lazy
-    init = function ()
-        require("custom.config.rustaceanvim")
-    end
+    init = function()
+        require('rustaceanvim')
+    end,
 }

.config/nvim/lua/plugins/telescope.lua

@@ -8,7 +8,7 @@ return {
     },
     cmd = 'Telescope',
     config = function()
-        require('custom.config.telescope')
+        require('telescope_helper')
     end,
     keys = {
         '<leader>fs',