From 4bd926e7edce4d1b7ec39e7dce27e0a33be2016d Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Tue, 21 Oct 2025 00:40:35 -0400 Subject: [PATCH] refactor(nvim): simplify lazy loading configuration --- lazy-lock.json | 40 +++++++++++++++++++------------------- lua/community.lua | 4 ++++ lua/plugins/bufferline.lua | 2 +- lua/plugins/neotree.lua | 31 ++++++++++++++++------------- 4 files changed, 42 insertions(+), 35 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index e56cb34..616de7d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,7 +4,7 @@ "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, "aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "astrocommunity": { "branch": "main", "commit": "689a880144d816166ee5065c744234c665c6609d" }, + "astrocommunity": { "branch": "main", "commit": "6675261abf346cc374272a122fe07aaa921f1a8a" }, "astrocore": { "branch": "main", "commit": "44a3dc0bf1591022b2a6bc89dccdfac1be17bec9" }, "astrolsp": { "branch": "main", "commit": "909fbe64f3f87d089ff3777751261544557117cc" }, "astrotheme": { "branch": "main", "commit": "4a2af93815e4e6adfe69c836e46047a9451de858" }, @@ -17,34 +17,34 @@ "chezmoi.vim": { "branch": "main", "commit": "ca5f2ed602046d5662cb76d845c4b510aae0ce84" }, "claudecode.nvim": { "branch": "main", "commit": "1552086ebcce9f4a2ea3b9793018a884d6b60169" }, "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" }, - "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" }, + "conform.nvim": { "branch": "master", "commit": "235dd79731c1dc51ec04abb4045cbc54727a172a" }, "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" }, "cyberdream.nvim": { "branch": "main", "commit": "eba11f590026e74915e13d12a53cdbdc9b98d9f9" }, - "doodle": { "branch": "main", "commit": "e75eedd90afede159b468f149b563d427d40e67a" }, + "doodle": { "branch": "main", "commit": "0179b3f105a57932626a219539dfd892591a1e8f" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "editorconfig-vim": { "branch": "master", "commit": "6a58b7c11f79c0e1d0f20533b3f42f2a11490cf8" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "gopher.nvim": { "branch": "main", "commit": "295e21e637f9194a4d2bc34622d324a88b028141" }, "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" }, "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" }, "inc-rename.nvim": { "branch": "main", "commit": "7c79416330364976955ec8059fe3832b72ee1271" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" }, + "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, "lsp_lines.nvim": { "branch": "main", "commit": "a92c755f182b89ea91bd8a6a2227208026f27b4d" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "e51f9b259f066c4347f9a79ffde54c29a0619384" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.bufremove": { "branch": "main", "commit": "285bdac9596ee7375db50c0f76ed04336dcd2685" }, - "neo-tree.nvim": { "branch": "main", "commit": "20244beec28b9d79ffb75fe1b1606f4dd8d476fc" }, + "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" }, "neoconf.nvim": { "branch": "main", "commit": "f630568a4d04154803886f21ca60923f12709f0f" }, "noice.nvim": { "branch": "main", "commit": "db248375c12c5322fbb9b505c1dc6f08e4527684" }, "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, "nvim-bqf": { "branch": "main", "commit": "a77b17e39b1b707b6feee86a36c83703c1534c08" }, "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, @@ -54,35 +54,35 @@ "nvim-dev-container": { "branch": "main", "commit": "56ecfb7a48e6a0728f0183f7a68f662a169a5262" }, "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" }, + "nvim-lspconfig": { "branch": "master", "commit": "185b2af444b27d6541c02d662b5b68190e5cf0c4" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" }, - "nvim-treesitter": { "branch": "main", "commit": "846d51137b8cbc030ab94edf9dc33968ddcdb195" }, + "nvim-treesitter": { "branch": "master", "commit": "f8aaf5ce4e27cd20de917946b2ae5c968a2c2858" }, "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" }, - "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, - "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-ufo": { "branch": "main", "commit": "61463090a4f55f5d080236ea62f09d1cd8976ff3" }, "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" }, "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, - "octo.nvim": { "branch": "master", "commit": "a6297cf215405c140c9e8f6a01b8e5d9aca794f2" }, - "overseer.nvim": { "branch": "master", "commit": "9334595f850a301ef8bd1d19fc46dca688f677b3" }, + "octo.nvim": { "branch": "master", "commit": "109685dc10ee84e762fb74a84b516b96ba966976" }, + "overseer.nvim": { "branch": "master", "commit": "c77c78b35d0b4d244e1cd77c25ec93a16fbbfc94" }, "package-info.nvim": { "branch": "master", "commit": "a1de9eb91fa52ab8361f0c05032673670a3d10ff" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" }, - "schemastore.nvim": { "branch": "main", "commit": "e71cc0607284739892287f6a2d92753999179dcf" }, + "schemastore.nvim": { "branch": "main", "commit": "960a5cf992c033170499ccc7003df59734ed40a8" }, "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" }, - "snacks.nvim": { "branch": "main", "commit": "bebf0bd38e3e7071abc4085ad46f1ebc32cdfe17" }, + "snacks.nvim": { "branch": "main", "commit": "1b4205eb1a224f668e85abeda2c0b1f0f73f477d" }, "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope.nvim": { "branch": "master", "commit": "a17d611a0e111836a1db5295f04945df407c5135" }, - "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" }, "tsc.nvim": { "branch": "main", "commit": "8c1b4ec6a48d038a79ced8674cb15e7db6dd8ef0" }, "typescript-tools.nvim": { "branch": "master", "commit": "bf11d98ad5736e1cbc1082ca9a03196d45c701f1" }, "vim-illuminate": { "branch": "master", "commit": "19cb21f513fc2b02f0c66be70107741e837516a1" }, - "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" } + "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" } } diff --git a/lua/community.lua b/lua/community.lua index 30c35a2..d7b4834 100644 --- a/lua/community.lua +++ b/lua/community.lua @@ -33,4 +33,8 @@ return { { import = "astrocommunity.lsp.inc-rename-nvim" }, { import = "astrocommunity.lsp.nvim-lsp-file-operations" }, { import = "astrocommunity.colorscheme.cyberdream-nvim" }, + { import = "astrocommunity.recipes.disable-borders" }, + { import = "astrocommunity.recipes.picker-lsp-mappings" }, + { import = "astrocommunity.recipes.telescope-nvim-snacks" }, + { import = "astrocommunity.recipes.vscode-icons" }, } diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua index d997ecc..f092313 100644 --- a/lua/plugins/bufferline.lua +++ b/lua/plugins/bufferline.lua @@ -18,7 +18,7 @@ return { close_command = function(n) require("astrocore.buffer").close(n) end, right_mouse_command = function(n) require("astrocore.buffer").close(n) end, separator_style = "thick", - indicator = { style = "icon", icon = "▎" }, + indicator = { style = "none", icon = "" }, diagnostics = "nvim_lsp", diagnostics_indicator = function(_, _, diagnostics_dict) local s = " " diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index bbf00d4..ce1111b 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -2,8 +2,8 @@ --- @module plugins.neotree -- Import shared modules -local ignore_patterns = require("config.ignore_patterns") -local terminals = require("config.terminals") +local ignore_patterns = require "config.ignore_patterns" +local terminals = require "config.terminals" return { { @@ -28,7 +28,7 @@ return { local hide_patterns = ignore_patterns.get_all_patterns() -- Setup LSP file operations integration - local events = require("neo-tree.events") + local events = require "neo-tree.events" return { -- LSP file operation event handlers for refactoring support @@ -52,25 +52,25 @@ return { { event = events.BEFORE_FILE_MOVE, handler = function(args) - require("astrolsp.file_operations").willRenameFiles({ from = args.source, to = args.destination }) + require("astrolsp.file_operations").willRenameFiles { from = args.source, to = args.destination } end, }, { event = events.BEFORE_FILE_RENAME, handler = function(args) - require("astrolsp.file_operations").willRenameFiles({ from = args.source, to = args.destination }) + require("astrolsp.file_operations").willRenameFiles { from = args.source, to = args.destination } end, }, { event = events.FILE_MOVED, handler = function(args) - require("astrolsp.file_operations").didRenameFiles({ from = args.source, to = args.destination }) + require("astrolsp.file_operations").didRenameFiles { from = args.source, to = args.destination } end, }, { event = events.FILE_RENAMED, handler = function(args) - require("astrolsp.file_operations").didRenameFiles({ from = args.source, to = args.destination }) + require("astrolsp.file_operations").didRenameFiles { from = args.source, to = args.destination } end, }, }, @@ -98,7 +98,7 @@ return { vim.defer_fn(function() local new_patterns = ignore_patterns.get_all_patterns() require("neo-tree").config.filesystem.filtered_items.hide_by_pattern = new_patterns - require("neo-tree.sources.manager").refresh("filesystem") + require("neo-tree.sources.manager").refresh "filesystem" end, 50) end, [""] = "toggle_hidden", @@ -172,13 +172,16 @@ return { local path = node.type == "directory" and node.path or vim.fn.fnamemodify(node.path, ":h") -- Check if running on Arch Linux - local is_arch = vim.fn.filereadable("/etc/arch-release") == 1 + local is_arch = vim.fn.filereadable "/etc/arch-release" == 1 if is_arch then -- Use uwsm to launch alacritty with yazi on Arch Linux - vim.fn.jobstart(string.format("uwsm app -- alacritty --working-directory %s -e yazi", vim.fn.shellescape(path)), { - detach = true, - }) + vim.fn.jobstart( + string.format("uwsm app -- alacritty --working-directory %s -e yazi", vim.fn.shellescape(path)), + { + detach = true, + } + ) else -- Fallback to direct alacritty launch with yazi on other systems vim.fn.jobstart(string.format("alacritty --working-directory %s -e yazi", vim.fn.shellescape(path)), { @@ -200,7 +203,7 @@ return { padding = 1, -- extra padding on left hand side -- indent guides with_markers = true, - indent_marker = "│", + indent_marker = "", last_indent_marker = "└", highlight = "NeoTreeIndentMarker", -- expander config, needed for nesting files @@ -268,7 +271,7 @@ return { -- Re-read patterns when navigating local new_patterns = ignore_patterns.get_all_patterns() state.filtered_items.hide_by_pattern = new_patterns - require("neo-tree.sources.manager").refresh("filesystem") + require("neo-tree.sources.manager").refresh "filesystem" end, -- If item is a file it will close neotree after opening it. open_and_close_neotree = function(state)