From 6bef8f32b19778fdfe52f0eb39719425508dcc7b Mon Sep 17 00:00:00 2001
From: Kyren223 <Kyren223@proton.me>
Date: Thu, 24 Apr 2025 11:36:39 +0300
Subject: [PATCH] Refactored nvim config to make it easier and less insanely
 nested

---
 .config/nvim/init.lua                                     | 8 ++++----
 .../nvim/lua/{custom/config/cmp.lua => cmp_helper.lua}    | 2 +-
 .config/nvim/lua/{custom/config => }/commands.lua         | 0
 .config/nvim/lua/{custom/config => }/dap-keymaps.lua      | 0
 .config/nvim/lua/{custom/config => }/keymaps.lua          | 0
 .config/nvim/lua/{custom/config => }/language-servers.lua | 0
 .config/nvim/lua/{custom/config => }/lsp-keymaps.lua      | 0
 .config/nvim/lua/{custom/config => }/lsp.lua              | 4 ++--
 .../lua/{custom/config/lualine.lua => lualine_helper.lua} | 0
 .config/nvim/lua/{custom/config => }/options.lua          | 0
 .config/nvim/lua/{custom => }/plugins/activity-watch.lua  | 0
 .config/nvim/lua/{custom => }/plugins/alpha.lua           | 0
 .config/nvim/lua/{custom => }/plugins/auto-save.lua       | 0
 .config/nvim/lua/{custom => }/plugins/auto-session.lua    | 0
 .config/nvim/lua/{custom => }/plugins/buffer-manager.lua  | 0
 .config/nvim/lua/{custom => }/plugins/buffer-vaccum.lua   | 0
 .config/nvim/lua/{custom => }/plugins/bullets.lua         | 0
 .config/nvim/lua/{custom => }/plugins/ccc.lua             | 0
 .../nvim/lua/{custom => }/plugins/clangd_extensions.lua   | 0
 .config/nvim/lua/{custom => }/plugins/code-playground.lua | 0
 .config/nvim/lua/{custom => }/plugins/colorscheme.lua     | 0
 .config/nvim/lua/{custom => }/plugins/comment.lua         | 0
 .config/nvim/lua/{custom => }/plugins/conform.lua         | 0
 .config/nvim/lua/{custom => }/plugins/diffview.lua        | 0
 .config/nvim/lua/{custom => }/plugins/edgy.lua            | 0
 .config/nvim/lua/{custom => }/plugins/gitsigns.lua        | 0
 .config/nvim/lua/{custom => }/plugins/gopher.lua          | 0
 .config/nvim/lua/{custom => }/plugins/harpoon.lua         | 0
 .config/nvim/lua/{custom => }/plugins/helpview.lua        | 0
 .../nvim/lua/{custom => }/plugins/indent-blankline.lua    | 0
 .config/nvim/lua/{custom => }/plugins/lazydev.lua         | 0
 .config/nvim/lua/{custom => }/plugins/leap.lua            | 0
 .config/nvim/lua/{custom => }/plugins/lsp-signature.lua   | 0
 .config/nvim/lua/{custom => }/plugins/lspsaga.lua         | 0
 .config/nvim/lua/{custom => }/plugins/lualine.lua         | 2 +-
 .config/nvim/lua/{custom => }/plugins/markdown-toggle.lua | 0
 .config/nvim/lua/{custom => }/plugins/mason.lua           | 0
 .config/nvim/lua/{custom => }/plugins/mini.lua            | 0
 .config/nvim/lua/{custom => }/plugins/neogen.lua          | 0
 .config/nvim/lua/{custom => }/plugins/neogit.lua          | 0
 .config/nvim/lua/{custom => }/plugins/nvim-autopairs.lua  | 0
 .config/nvim/lua/{custom => }/plugins/nvim-cmp.lua        | 4 ++--
 .config/nvim/lua/{custom => }/plugins/nvim-dap-ui.lua     | 0
 .config/nvim/lua/{custom => }/plugins/nvim-dap.lua        | 2 +-
 .config/nvim/lua/{custom => }/plugins/nvim-dbee.lua       | 0
 .config/nvim/lua/{custom => }/plugins/nvim-java.lua       | 0
 .config/nvim/lua/{custom => }/plugins/nvim-lint.lua       | 0
 .config/nvim/lua/{custom => }/plugins/nvim-lspconfig.lua  | 4 ++--
 .config/nvim/lua/{custom => }/plugins/nvim-scrollbar.lua  | 0
 .config/nvim/lua/{custom => }/plugins/nvim-spectre.lua    | 0
 .config/nvim/lua/{custom => }/plugins/nvim-surround.lua   | 0
 .config/nvim/lua/{custom => }/plugins/nvim-treesitter.lua | 0
 .config/nvim/lua/{custom => }/plugins/nvim-ts-autotag.lua | 0
 .config/nvim/lua/{custom => }/plugins/octo.lua            | 0
 .config/nvim/lua/{custom => }/plugins/oil.lua             | 0
 .config/nvim/lua/{custom => }/plugins/overseer.lua        | 0
 .config/nvim/lua/{custom => }/plugins/pretty-hover.lua    | 0
 .config/nvim/lua/{custom => }/plugins/render-markdown.lua | 0
 .config/nvim/lua/{custom => }/plugins/rustaceanvim.lua    | 6 +++---
 .config/nvim/lua/{custom => }/plugins/snacks.lua          | 0
 .config/nvim/lua/{custom => }/plugins/sqls.lua            | 0
 .config/nvim/lua/{custom => }/plugins/suda.lua            | 0
 .config/nvim/lua/{custom => }/plugins/telescope.lua       | 2 +-
 .../lua/{custom => }/plugins/tiny-inline-diagnostic.lua   | 0
 .config/nvim/lua/{custom => }/plugins/todo-comments.lua   | 0
 .config/nvim/lua/{custom => }/plugins/trouble.lua         | 0
 .config/nvim/lua/{custom => }/plugins/undotree.lua        | 0
 .config/nvim/lua/{custom => }/plugins/vim-be-good.lua     | 0
 .config/nvim/lua/{custom => }/plugins/vim-illuminate.lua  | 0
 .../nvim/lua/{custom => }/plugins/vim-tmux-navigator.lua  | 0
 .config/nvim/lua/{custom => }/plugins/vim-wakatime.lua    | 0
 .config/nvim/lua/{custom/config => }/rustaceanvim.lua     | 0
 .config/nvim/lua/{custom => }/snippets/go.lua             | 0
 .config/nvim/lua/{custom => }/snippets/lua.lua            | 0
 .../{custom/config/telescope.lua => telescope_helper.lua} | 0
 75 files changed, 17 insertions(+), 17 deletions(-)
 rename .config/nvim/lua/{custom/config/cmp.lua => cmp_helper.lua} (98%)
 rename .config/nvim/lua/{custom/config => }/commands.lua (100%)
 rename .config/nvim/lua/{custom/config => }/dap-keymaps.lua (100%)
 rename .config/nvim/lua/{custom/config => }/keymaps.lua (100%)
 rename .config/nvim/lua/{custom/config => }/language-servers.lua (100%)
 rename .config/nvim/lua/{custom/config => }/lsp-keymaps.lua (100%)
 rename .config/nvim/lua/{custom/config => }/lsp.lua (95%)
 rename .config/nvim/lua/{custom/config/lualine.lua => lualine_helper.lua} (100%)
 rename .config/nvim/lua/{custom/config => }/options.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/activity-watch.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/alpha.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/auto-save.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/auto-session.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/buffer-manager.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/buffer-vaccum.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/bullets.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/ccc.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/clangd_extensions.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/code-playground.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/colorscheme.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/comment.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/conform.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/diffview.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/edgy.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/gitsigns.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/gopher.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/harpoon.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/helpview.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/indent-blankline.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/lazydev.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/leap.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/lsp-signature.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/lspsaga.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/lualine.lua (82%)
 rename .config/nvim/lua/{custom => }/plugins/markdown-toggle.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/mason.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/mini.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/neogen.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/neogit.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-autopairs.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-cmp.lua (86%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-dap-ui.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-dap.lua (97%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-dbee.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-java.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-lint.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-lspconfig.lua (90%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-scrollbar.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-spectre.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-surround.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-treesitter.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/nvim-ts-autotag.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/octo.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/oil.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/overseer.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/pretty-hover.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/render-markdown.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/rustaceanvim.lua (54%)
 rename .config/nvim/lua/{custom => }/plugins/snacks.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/sqls.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/suda.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/telescope.lua (91%)
 rename .config/nvim/lua/{custom => }/plugins/tiny-inline-diagnostic.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/todo-comments.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/trouble.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/undotree.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/vim-be-good.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/vim-illuminate.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/vim-tmux-navigator.lua (100%)
 rename .config/nvim/lua/{custom => }/plugins/vim-wakatime.lua (100%)
 rename .config/nvim/lua/{custom/config => }/rustaceanvim.lua (100%)
 rename .config/nvim/lua/{custom => }/snippets/go.lua (100%)
 rename .config/nvim/lua/{custom => }/snippets/lua.lua (100%)
 rename .config/nvim/lua/{custom/config/telescope.lua => telescope_helper.lua} (100%)

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index a8d2c53..111d5c4 100644
--- a/.config/nvim/init.lua
+++ b/.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 = {
diff --git a/.config/nvim/lua/custom/config/cmp.lua b/.config/nvim/lua/cmp_helper.lua
similarity index 98%
rename from .config/nvim/lua/custom/config/cmp.lua
rename to .config/nvim/lua/cmp_helper.lua
index e9f657c..ffa3418 100644
--- a/.config/nvim/lua/custom/config/cmp.lua
+++ b/.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
 
diff --git a/.config/nvim/lua/custom/config/commands.lua b/.config/nvim/lua/commands.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/commands.lua
rename to .config/nvim/lua/commands.lua
diff --git a/.config/nvim/lua/custom/config/dap-keymaps.lua b/.config/nvim/lua/dap-keymaps.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/dap-keymaps.lua
rename to .config/nvim/lua/dap-keymaps.lua
diff --git a/.config/nvim/lua/custom/config/keymaps.lua b/.config/nvim/lua/keymaps.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/keymaps.lua
rename to .config/nvim/lua/keymaps.lua
diff --git a/.config/nvim/lua/custom/config/language-servers.lua b/.config/nvim/lua/language-servers.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/language-servers.lua
rename to .config/nvim/lua/language-servers.lua
diff --git a/.config/nvim/lua/custom/config/lsp-keymaps.lua b/.config/nvim/lua/lsp-keymaps.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/lsp-keymaps.lua
rename to .config/nvim/lua/lsp-keymaps.lua
diff --git a/.config/nvim/lua/custom/config/lsp.lua b/.config/nvim/lua/lsp.lua
similarity index 95%
rename from .config/nvim/lua/custom/config/lsp.lua
rename to .config/nvim/lua/lsp.lua
index 02ff31f..89fbc58 100644
--- a/.config/nvim/lua/custom/config/lsp.lua
+++ b/.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,
 })
diff --git a/.config/nvim/lua/custom/config/lualine.lua b/.config/nvim/lua/lualine_helper.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/lualine.lua
rename to .config/nvim/lua/lualine_helper.lua
diff --git a/.config/nvim/lua/custom/config/options.lua b/.config/nvim/lua/options.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/options.lua
rename to .config/nvim/lua/options.lua
diff --git a/.config/nvim/lua/custom/plugins/activity-watch.lua b/.config/nvim/lua/plugins/activity-watch.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/activity-watch.lua
rename to .config/nvim/lua/plugins/activity-watch.lua
diff --git a/.config/nvim/lua/custom/plugins/alpha.lua b/.config/nvim/lua/plugins/alpha.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/alpha.lua
rename to .config/nvim/lua/plugins/alpha.lua
diff --git a/.config/nvim/lua/custom/plugins/auto-save.lua b/.config/nvim/lua/plugins/auto-save.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/auto-save.lua
rename to .config/nvim/lua/plugins/auto-save.lua
diff --git a/.config/nvim/lua/custom/plugins/auto-session.lua b/.config/nvim/lua/plugins/auto-session.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/auto-session.lua
rename to .config/nvim/lua/plugins/auto-session.lua
diff --git a/.config/nvim/lua/custom/plugins/buffer-manager.lua b/.config/nvim/lua/plugins/buffer-manager.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/buffer-manager.lua
rename to .config/nvim/lua/plugins/buffer-manager.lua
diff --git a/.config/nvim/lua/custom/plugins/buffer-vaccum.lua b/.config/nvim/lua/plugins/buffer-vaccum.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/buffer-vaccum.lua
rename to .config/nvim/lua/plugins/buffer-vaccum.lua
diff --git a/.config/nvim/lua/custom/plugins/bullets.lua b/.config/nvim/lua/plugins/bullets.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/bullets.lua
rename to .config/nvim/lua/plugins/bullets.lua
diff --git a/.config/nvim/lua/custom/plugins/ccc.lua b/.config/nvim/lua/plugins/ccc.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/ccc.lua
rename to .config/nvim/lua/plugins/ccc.lua
diff --git a/.config/nvim/lua/custom/plugins/clangd_extensions.lua b/.config/nvim/lua/plugins/clangd_extensions.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/clangd_extensions.lua
rename to .config/nvim/lua/plugins/clangd_extensions.lua
diff --git a/.config/nvim/lua/custom/plugins/code-playground.lua b/.config/nvim/lua/plugins/code-playground.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/code-playground.lua
rename to .config/nvim/lua/plugins/code-playground.lua
diff --git a/.config/nvim/lua/custom/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/colorscheme.lua
rename to .config/nvim/lua/plugins/colorscheme.lua
diff --git a/.config/nvim/lua/custom/plugins/comment.lua b/.config/nvim/lua/plugins/comment.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/comment.lua
rename to .config/nvim/lua/plugins/comment.lua
diff --git a/.config/nvim/lua/custom/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/conform.lua
rename to .config/nvim/lua/plugins/conform.lua
diff --git a/.config/nvim/lua/custom/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/diffview.lua
rename to .config/nvim/lua/plugins/diffview.lua
diff --git a/.config/nvim/lua/custom/plugins/edgy.lua b/.config/nvim/lua/plugins/edgy.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/edgy.lua
rename to .config/nvim/lua/plugins/edgy.lua
diff --git a/.config/nvim/lua/custom/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/gitsigns.lua
rename to .config/nvim/lua/plugins/gitsigns.lua
diff --git a/.config/nvim/lua/custom/plugins/gopher.lua b/.config/nvim/lua/plugins/gopher.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/gopher.lua
rename to .config/nvim/lua/plugins/gopher.lua
diff --git a/.config/nvim/lua/custom/plugins/harpoon.lua b/.config/nvim/lua/plugins/harpoon.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/harpoon.lua
rename to .config/nvim/lua/plugins/harpoon.lua
diff --git a/.config/nvim/lua/custom/plugins/helpview.lua b/.config/nvim/lua/plugins/helpview.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/helpview.lua
rename to .config/nvim/lua/plugins/helpview.lua
diff --git a/.config/nvim/lua/custom/plugins/indent-blankline.lua b/.config/nvim/lua/plugins/indent-blankline.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/indent-blankline.lua
rename to .config/nvim/lua/plugins/indent-blankline.lua
diff --git a/.config/nvim/lua/custom/plugins/lazydev.lua b/.config/nvim/lua/plugins/lazydev.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/lazydev.lua
rename to .config/nvim/lua/plugins/lazydev.lua
diff --git a/.config/nvim/lua/custom/plugins/leap.lua b/.config/nvim/lua/plugins/leap.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/leap.lua
rename to .config/nvim/lua/plugins/leap.lua
diff --git a/.config/nvim/lua/custom/plugins/lsp-signature.lua b/.config/nvim/lua/plugins/lsp-signature.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/lsp-signature.lua
rename to .config/nvim/lua/plugins/lsp-signature.lua
diff --git a/.config/nvim/lua/custom/plugins/lspsaga.lua b/.config/nvim/lua/plugins/lspsaga.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/lspsaga.lua
rename to .config/nvim/lua/plugins/lspsaga.lua
diff --git a/.config/nvim/lua/custom/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
similarity index 82%
rename from .config/nvim/lua/custom/plugins/lualine.lua
rename to .config/nvim/lua/plugins/lualine.lua
index f1e5ec5..e331310 100644
--- a/.config/nvim/lua/custom/plugins/lualine.lua
+++ b/.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,
 }
diff --git a/.config/nvim/lua/custom/plugins/markdown-toggle.lua b/.config/nvim/lua/plugins/markdown-toggle.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/markdown-toggle.lua
rename to .config/nvim/lua/plugins/markdown-toggle.lua
diff --git a/.config/nvim/lua/custom/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/mason.lua
rename to .config/nvim/lua/plugins/mason.lua
diff --git a/.config/nvim/lua/custom/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/mini.lua
rename to .config/nvim/lua/plugins/mini.lua
diff --git a/.config/nvim/lua/custom/plugins/neogen.lua b/.config/nvim/lua/plugins/neogen.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/neogen.lua
rename to .config/nvim/lua/plugins/neogen.lua
diff --git a/.config/nvim/lua/custom/plugins/neogit.lua b/.config/nvim/lua/plugins/neogit.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/neogit.lua
rename to .config/nvim/lua/plugins/neogit.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-autopairs.lua b/.config/nvim/lua/plugins/nvim-autopairs.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-autopairs.lua
rename to .config/nvim/lua/plugins/nvim-autopairs.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-cmp.lua b/.config/nvim/lua/plugins/nvim-cmp.lua
similarity index 86%
rename from .config/nvim/lua/custom/plugins/nvim-cmp.lua
rename to .config/nvim/lua/plugins/nvim-cmp.lua
index 4860338..221c756 100644
--- a/.config/nvim/lua/custom/plugins/nvim-cmp.lua
+++ b/.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,
 }
diff --git a/.config/nvim/lua/custom/plugins/nvim-dap-ui.lua b/.config/nvim/lua/plugins/nvim-dap-ui.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-dap-ui.lua
rename to .config/nvim/lua/plugins/nvim-dap-ui.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-dap.lua b/.config/nvim/lua/plugins/nvim-dap.lua
similarity index 97%
rename from .config/nvim/lua/custom/plugins/nvim-dap.lua
rename to .config/nvim/lua/plugins/nvim-dap.lua
index a6387dc..dd4bbee 100644
--- a/.config/nvim/lua/custom/plugins/nvim-dap.lua
+++ b/.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
diff --git a/.config/nvim/lua/custom/plugins/nvim-dbee.lua b/.config/nvim/lua/plugins/nvim-dbee.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-dbee.lua
rename to .config/nvim/lua/plugins/nvim-dbee.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-java.lua b/.config/nvim/lua/plugins/nvim-java.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-java.lua
rename to .config/nvim/lua/plugins/nvim-java.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-lint.lua b/.config/nvim/lua/plugins/nvim-lint.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-lint.lua
rename to .config/nvim/lua/plugins/nvim-lint.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-lspconfig.lua b/.config/nvim/lua/plugins/nvim-lspconfig.lua
similarity index 90%
rename from .config/nvim/lua/custom/plugins/nvim-lspconfig.lua
rename to .config/nvim/lua/plugins/nvim-lspconfig.lua
index 0b358fe..1dd0a77 100644
--- a/.config/nvim/lua/custom/plugins/nvim-lspconfig.lua
+++ b/.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,
 }
diff --git a/.config/nvim/lua/custom/plugins/nvim-scrollbar.lua b/.config/nvim/lua/plugins/nvim-scrollbar.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-scrollbar.lua
rename to .config/nvim/lua/plugins/nvim-scrollbar.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-spectre.lua b/.config/nvim/lua/plugins/nvim-spectre.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-spectre.lua
rename to .config/nvim/lua/plugins/nvim-spectre.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-surround.lua b/.config/nvim/lua/plugins/nvim-surround.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-surround.lua
rename to .config/nvim/lua/plugins/nvim-surround.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-treesitter.lua b/.config/nvim/lua/plugins/nvim-treesitter.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-treesitter.lua
rename to .config/nvim/lua/plugins/nvim-treesitter.lua
diff --git a/.config/nvim/lua/custom/plugins/nvim-ts-autotag.lua b/.config/nvim/lua/plugins/nvim-ts-autotag.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/nvim-ts-autotag.lua
rename to .config/nvim/lua/plugins/nvim-ts-autotag.lua
diff --git a/.config/nvim/lua/custom/plugins/octo.lua b/.config/nvim/lua/plugins/octo.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/octo.lua
rename to .config/nvim/lua/plugins/octo.lua
diff --git a/.config/nvim/lua/custom/plugins/oil.lua b/.config/nvim/lua/plugins/oil.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/oil.lua
rename to .config/nvim/lua/plugins/oil.lua
diff --git a/.config/nvim/lua/custom/plugins/overseer.lua b/.config/nvim/lua/plugins/overseer.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/overseer.lua
rename to .config/nvim/lua/plugins/overseer.lua
diff --git a/.config/nvim/lua/custom/plugins/pretty-hover.lua b/.config/nvim/lua/plugins/pretty-hover.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/pretty-hover.lua
rename to .config/nvim/lua/plugins/pretty-hover.lua
diff --git a/.config/nvim/lua/custom/plugins/render-markdown.lua b/.config/nvim/lua/plugins/render-markdown.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/render-markdown.lua
rename to .config/nvim/lua/plugins/render-markdown.lua
diff --git a/.config/nvim/lua/custom/plugins/rustaceanvim.lua b/.config/nvim/lua/plugins/rustaceanvim.lua
similarity index 54%
rename from .config/nvim/lua/custom/plugins/rustaceanvim.lua
rename to .config/nvim/lua/plugins/rustaceanvim.lua
index 4f509a2..564e046 100644
--- a/.config/nvim/lua/custom/plugins/rustaceanvim.lua
+++ b/.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,
 }
diff --git a/.config/nvim/lua/custom/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/snacks.lua
rename to .config/nvim/lua/plugins/snacks.lua
diff --git a/.config/nvim/lua/custom/plugins/sqls.lua b/.config/nvim/lua/plugins/sqls.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/sqls.lua
rename to .config/nvim/lua/plugins/sqls.lua
diff --git a/.config/nvim/lua/custom/plugins/suda.lua b/.config/nvim/lua/plugins/suda.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/suda.lua
rename to .config/nvim/lua/plugins/suda.lua
diff --git a/.config/nvim/lua/custom/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
similarity index 91%
rename from .config/nvim/lua/custom/plugins/telescope.lua
rename to .config/nvim/lua/plugins/telescope.lua
index af0534b..b3e09af 100644
--- a/.config/nvim/lua/custom/plugins/telescope.lua
+++ b/.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',
diff --git a/.config/nvim/lua/custom/plugins/tiny-inline-diagnostic.lua b/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/tiny-inline-diagnostic.lua
rename to .config/nvim/lua/plugins/tiny-inline-diagnostic.lua
diff --git a/.config/nvim/lua/custom/plugins/todo-comments.lua b/.config/nvim/lua/plugins/todo-comments.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/todo-comments.lua
rename to .config/nvim/lua/plugins/todo-comments.lua
diff --git a/.config/nvim/lua/custom/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/trouble.lua
rename to .config/nvim/lua/plugins/trouble.lua
diff --git a/.config/nvim/lua/custom/plugins/undotree.lua b/.config/nvim/lua/plugins/undotree.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/undotree.lua
rename to .config/nvim/lua/plugins/undotree.lua
diff --git a/.config/nvim/lua/custom/plugins/vim-be-good.lua b/.config/nvim/lua/plugins/vim-be-good.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/vim-be-good.lua
rename to .config/nvim/lua/plugins/vim-be-good.lua
diff --git a/.config/nvim/lua/custom/plugins/vim-illuminate.lua b/.config/nvim/lua/plugins/vim-illuminate.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/vim-illuminate.lua
rename to .config/nvim/lua/plugins/vim-illuminate.lua
diff --git a/.config/nvim/lua/custom/plugins/vim-tmux-navigator.lua b/.config/nvim/lua/plugins/vim-tmux-navigator.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/vim-tmux-navigator.lua
rename to .config/nvim/lua/plugins/vim-tmux-navigator.lua
diff --git a/.config/nvim/lua/custom/plugins/vim-wakatime.lua b/.config/nvim/lua/plugins/vim-wakatime.lua
similarity index 100%
rename from .config/nvim/lua/custom/plugins/vim-wakatime.lua
rename to .config/nvim/lua/plugins/vim-wakatime.lua
diff --git a/.config/nvim/lua/custom/config/rustaceanvim.lua b/.config/nvim/lua/rustaceanvim.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/rustaceanvim.lua
rename to .config/nvim/lua/rustaceanvim.lua
diff --git a/.config/nvim/lua/custom/snippets/go.lua b/.config/nvim/lua/snippets/go.lua
similarity index 100%
rename from .config/nvim/lua/custom/snippets/go.lua
rename to .config/nvim/lua/snippets/go.lua
diff --git a/.config/nvim/lua/custom/snippets/lua.lua b/.config/nvim/lua/snippets/lua.lua
similarity index 100%
rename from .config/nvim/lua/custom/snippets/lua.lua
rename to .config/nvim/lua/snippets/lua.lua
diff --git a/.config/nvim/lua/custom/config/telescope.lua b/.config/nvim/lua/telescope_helper.lua
similarity index 100%
rename from .config/nvim/lua/custom/config/telescope.lua
rename to .config/nvim/lua/telescope_helper.lua