nvim

.config/nvim/init.lua

@@ -2,4 +2,19 @@ vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
 require("config")
-require("plugins")
+
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git", "clone", "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable",
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup("plugins", {
+  change_detection = { notify = false },
+})

.config/nvim/lua/plugins/blink.lua

@@ -1,18 +1,8 @@
-vim.pack.add({
+return {
-	{
+  "saghen/blink.cmp",
-		src = "https://github.com/saghen/blink.cmp",
+  version = "^1",
-		version = vim.version.range("^1"),
+  event = "InsertEnter", -- Lazy's native equivalent of the manual InsertEnter augroup
-	},
+  config = function()
-})
-
--- Lazy load on first insert mode entry (may not necessary)
-local group = vim.api.nvim_create_augroup("BlinkCmpLazyLoad", { clear = true })
-
-vim.api.nvim_create_autocmd("InsertEnter", {
-	pattern = "*",
-	group = group,
-	once = true,
-	callback = function()
     require("blink.cmp").setup({
       keymap = { preset = "super-tab" },
       appearance = {
@@ -28,4 +18,4 @@ vim.api.nvim_create_autocmd("InsertEnter", {
       fuzzy = { implementation = "prefer_rust_with_warning" },
     })
   end,
-})
+}

.config/nvim/lua/plugins/conform.lua

@@ -1,6 +1,7 @@
-vim.pack.add({ "https://github.com/stevearc/conform.nvim" })
+return {
-
+  "stevearc/conform.nvim",
-require("conform").setup({
+  config = function()
+    require("conform").setup({
       formatters_by_ft = {
         lua        = { "stylua" },
         go         = { "goimports", "gofmt" },
@@ -21,59 +22,46 @@ require("conform").setup({
       default_format_opts = {
         lsp_format = "fallback",
       },
-	--[[  format_on_save = function(bufnr)
+    })
-    local ignore_filetypes = { "sql", "yaml", "yml" }
-    if vim.tbl_contains(ignore_filetypes, vim.bo[bufnr].filetype) then
-      return
-    end
-    if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
-      return
-    end
-    local bufname = vim.api.nvim_buf_get_name(bufnr)
-    if bufname:match("/node_modules/") then
-      return
-    end
-    return { timeout_ms = 500, lsp_format = "fallback" }
-  end,
-]]
-})
 
-vim.api.nvim_create_user_command("FormatDisable", function(opts)
+    vim.api.nvim_create_user_command("FormatDisable", function(opts)
       if opts.bang then
         vim.b.disable_autoformat = true
       else
         vim.g.disable_autoformat = true
       end
       vim.notify("Autoformat disabled" .. (opts.bang and " (buffer)" or " (global)"), vim.log.levels.WARN)
-end, { desc = "Disable autoformat-on-save", bang = true })
+    end, { desc = "Disable autoformat-on-save", bang = true })
 
-vim.api.nvim_create_user_command("FormatEnable", function()
+    vim.api.nvim_create_user_command("FormatEnable", function()
       vim.b.disable_autoformat = false
       vim.g.disable_autoformat = false
       vim.notify("Autoformat enabled", vim.log.levels.INFO)
-end, { desc = "Re-enable autoformat-on-save" })
+    end, { desc = "Re-enable autoformat-on-save" })
 
-local auto_format = true
+    local auto_format = true
 
-vim.keymap.set("n", "<leader>uf", function()
+    vim.keymap.set("n", "<leader>uf", function()
       auto_format = not auto_format
       if auto_format then
         vim.cmd("FormatEnable")
       else
         vim.cmd("FormatDisable")
       end
-end, { desc = "Toggle Autoformat" })
+    end, { desc = "Toggle Autoformat" })
 
-vim.keymap.set({ "n", "v" }, "<leader>cn", "<cmd>ConformInfo<cr>", { desc = "Conform Info" })
+    vim.keymap.set({ "n", "v" }, "<leader>cn", "<cmd>ConformInfo<cr>", { desc = "Conform Info" })
 
-vim.keymap.set({ "n", "v" }, "<leader>cf", function()
+    vim.keymap.set({ "n", "v" }, "<leader>cf", function()
       require("conform").format({ async = true }, function(err, did_edit)
         if not err and did_edit then
           vim.notify("Code formatted", vim.log.levels.INFO, { title = "Conform" })
         end
       end)
-end, { desc = "Format buffer" })
+    end, { desc = "Format buffer" })
 
-vim.keymap.set({ "n", "v" }, "<leader>cF", function()
+    vim.keymap.set({ "n", "v" }, "<leader>cF", function()
       require("conform").format({ formatters = { "injected" }, timeout_ms = 3000 })
-end, { desc = "Format Injected Langs" })
+    end, { desc = "Format Injected Langs" })
+  end,
+}

.config/nvim/lua/plugins/git.lua

@@ -1,9 +1,8 @@
-vim.pack.add({
+return {
-	"https://github.com/lewis6991/gitsigns.nvim",
+  {
-	"https://github.com/sindrets/diffview.nvim",
+    "lewis6991/gitsigns.nvim",
-})
+    config = function()
-
+      require("gitsigns").setup({
-require("gitsigns").setup({
         signs = {
           add          = { text = "┃" },
           change       = { text = "┃" },
@@ -21,19 +20,17 @@ require("gitsigns").setup({
           untracked    = { text = "┆" },
         },
         signs_staged_enable = true,
-	signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
+        signcolumn = true,
-	numhl = false, -- Toggle with `:Gitsigns toggle_numhl`
+        numhl = false,
-	linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
+        linehl = false,
-	word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
+        word_diff = false,
-	watch_gitdir = {
+        watch_gitdir = { follow_files = true },
-		follow_files = true,
-	},
         auto_attach = true,
         attach_to_untracked = false,
-	current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+        current_line_blame = false,
         current_line_blame_opts = {
           virt_text = true,
-		virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
+          virt_text_pos = "eol",
           delay = 1000,
           ignore_whitespace = false,
           virt_text_priority = 100,
@@ -42,10 +39,9 @@ require("gitsigns").setup({
         current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
         sign_priority = 6,
         update_debounce = 100,
-	status_formatter = nil, -- Use default
+        status_formatter = nil,
-	max_file_length = 40000, -- Disable if file is longer than this (in lines)
+        max_file_length = 40000,
         preview_config = {
-		-- Options passed to nvim_open_win
           style = "minimal",
           relative = "cursor",
           row = 0,
@@ -62,51 +58,27 @@ require("gitsigns").setup({
 
           -- Navigation
           map("n", "]c", function()
-			if vim.wo.diff then
+            if vim.wo.diff then vim.cmd.normal({ "]c", bang = true })
-				vim.cmd.normal({ "]c", bang = true })
+            else gitsigns.nav_hunk("next") end
-			else
-				gitsigns.nav_hunk("next")
-			end
           end)
-
           map("n", "[c", function()
-			if vim.wo.diff then
+            if vim.wo.diff then vim.cmd.normal({ "[c", bang = true })
-				vim.cmd.normal({ "[c", bang = true })
+            else gitsigns.nav_hunk("prev") end
-			else
-				gitsigns.nav_hunk("prev")
-			end
           end)
 
           -- Actions
           map("n", "<leader>hs", gitsigns.stage_hunk)
           map("n", "<leader>hr", gitsigns.reset_hunk)
-
+          map("v", "<leader>hs", function() gitsigns.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) end)
-		map("v", "<leader>hs", function()
+          map("v", "<leader>hr", function() gitsigns.reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) end)
-			gitsigns.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
-		end)
-
-		map("v", "<leader>hr", function()
-			gitsigns.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
-		end)
-
           map("n", "<leader>hS", gitsigns.stage_buffer)
           map("n", "<leader>hR", gitsigns.reset_buffer)
           map("n", "<leader>hp", gitsigns.preview_hunk)
           map("n", "<leader>hi", gitsigns.preview_hunk_inline)
-
+          map("n", "<leader>hb", function() gitsigns.blame_line({ full = true }) end)
-		map("n", "<leader>hb", function()
-			gitsigns.blame_line({ full = true })
-		end)
-
           map("n", "<leader>hd", gitsigns.diffthis)
-
+          map("n", "<leader>hD", function() gitsigns.diffthis("~") end)
-		map("n", "<leader>hD", function()
+          map("n", "<leader>hQ", function() gitsigns.setqflist("all") end)
-			gitsigns.diffthis("~")
-		end)
-
-		map("n", "<leader>hQ", function()
-			gitsigns.setqflist("all")
-		end)
           map("n", "<leader>hq", gitsigns.setqflist)
 
           -- Toggles
@@ -116,327 +88,126 @@ require("gitsigns").setup({
           -- Text object
           map({ "o", "x" }, "ih", gitsigns.select_hunk)
         end,
-})
+      })
+    end,
+  },
+  {
+    "sindrets/diffview.nvim",
+    dependencies = { "nvim-lua/plenary.nvim" },
+    config = function()
+      local actions = require("diffview.actions")
 
--- Lua
+      require("diffview").setup({
-local actions = require("diffview.actions")
+        diff_binaries = false,
-
+        enhanced_diff_hl = false,
-require("diffview").setup({
+        git_cmd = { "git" },
-	diff_binaries = false, -- Show diffs for binaries
+        hg_cmd = { "hg" },
-	enhanced_diff_hl = false, -- See |diffview-config-enhanced_diff_hl|
+        use_icons = true,
-	git_cmd = { "git" }, -- The git executable followed by default args.
+        show_help_hints = true,
-	hg_cmd = { "hg" }, -- The hg executable followed by default args.
+        watch_index = true,
-	use_icons = true, -- Requires nvim-web-devicons
+        icons = {
-	show_help_hints = true, -- Show hints for how to open the help panel
+          folder_closed = "",
-	watch_index = true, -- Update views and index buffers when the git index changes.
+          folder_open = "",
-	icons = { -- Only applies when use_icons is true.
-		folder_closed = "",
-		folder_open = "",
         },
         signs = {
-		fold_closed = "",
+          fold_closed = "",
-		fold_open = "",
+          fold_open = "",
           done = "✓",
         },
         view = {
-		-- Configure the layout and behavior of different types of views.
-		-- Available layouts:
-		--  'diff1_plain'
-		--    |'diff2_horizontal'
-		--    |'diff2_vertical'
-		--    |'diff3_horizontal'
-		--    |'diff3_vertical'
-		--    |'diff3_mixed'
-		--    |'diff4_mixed'
-		-- For more info, see |diffview-config-view.x.layout|.
           default = {
-			-- Config for changed files, and staged files in diff views.
             layout = "diff2_horizontal",
-			disable_diagnostics = false, -- Temporarily disable diagnostics for diff buffers while in the view.
+            disable_diagnostics = false,
-			winbar_info = false, -- See |diffview-config-view.x.winbar_info|
+            winbar_info = false,
           },
           merge_tool = {
-			-- Config for conflicted files in diff views during a merge or rebase.
             layout = "diff3_horizontal",
-			disable_diagnostics = true, -- Temporarily disable diagnostics for diff buffers while in the view.
+            disable_diagnostics = true,
-			winbar_info = true, -- See |diffview-config-view.x.winbar_info|
+            winbar_info = true,
           },
           file_history = {
-			-- Config for changed files in file history views.
             layout = "diff2_horizontal",
-			disable_diagnostics = false, -- Temporarily disable diagnostics for diff buffers while in the view.
+            disable_diagnostics = false,
-			winbar_info = false, -- See |diffview-config-view.x.winbar_info|
+            winbar_info = false,
           },
         },
         file_panel = {
-		listing_style = "tree", -- One of 'list' or 'tree'
+          listing_style = "tree",
-		tree_options = { -- Only applies when listing_style is 'tree'
+          tree_options = {
-			flatten_dirs = true, -- Flatten dirs that only contain one single dir
+            flatten_dirs = true,
-			folder_statuses = "only_folded", -- One of 'never', 'only_folded' or 'always'.
+            folder_statuses = "only_folded",
           },
-		win_config = { -- See |diffview-config-win_config|
+          win_config = {
             position = "left",
             width = 35,
             win_opts = {},
           },
         },
         file_history_panel = {
-		log_options = { -- See |diffview-config-log_options|
+          log_options = {
             git = {
-				single_file = {
+              single_file = { diff_merges = "combined" },
-					diff_merges = "combined",
+              multi_file  = { diff_merges = "first-parent" },
-				},
-				multi_file = {
-					diff_merges = "first-parent",
-				},
             },
             hg = {
               single_file = {},
               multi_file  = {},
             },
           },
-		win_config = { -- See |diffview-config-win_config|
+          win_config = {
             position = "bottom",
             height = 16,
             win_opts = {},
           },
         },
         commit_log_panel = {
-		win_config = {}, -- See |diffview-config-win_config|
+          win_config = {},
         },
-	default_args = { -- Default args prepended to the arg-list for the listed commands
+        default_args = {
           DiffviewOpen = {},
           DiffviewFileHistory = {},
         },
-	hooks = {}, -- See |diffview-config-hooks|
+        hooks = {},
         keymaps = {
-		disable_defaults = false, -- Disable the default keymaps
+          disable_defaults = false,
           view = {
-			-- The `view` bindings are active in the diff buffers, only when the current
+            { "n", "<tab>",       actions.select_next_entry,          { desc = "Open the diff for the next file" } },
-			-- tabpage is a Diffview.
+            { "n", "<s-tab>",     actions.select_prev_entry,          { desc = "Open the diff for the previous file" } },
-			{
+            { "n", "[F",          actions.select_first_entry,         { desc = "Open the diff for the first file" } },
-				"n",
+            { "n", "]F",          actions.select_last_entry,          { desc = "Open the diff for the last file" } },
-				"<tab>",
+            { "n", "gf",          actions.goto_file_edit,             { desc = "Open the file in the previous tabpage" } },
-				actions.select_next_entry,
-				{ desc = "Open the diff for the next file" },
-			},
-			{
-				"n",
-				"<s-tab>",
-				actions.select_prev_entry,
-				{ desc = "Open the diff for the previous file" },
-			},
-			{
-				"n",
-				"[F",
-				actions.select_first_entry,
-				{ desc = "Open the diff for the first file" },
-			},
-			{
-				"n",
-				"]F",
-				actions.select_last_entry,
-				{ desc = "Open the diff for the last file" },
-			},
-			{
-				"n",
-				"gf",
-				actions.goto_file_edit,
-				{ desc = "Open the file in the previous tabpage" },
-			},
             { "n", "<C-w><C-f>",  actions.goto_file_split,            { desc = "Open the file in a new split" } },
             { "n", "<C-w>gf",     actions.goto_file_tab,              { desc = "Open the file in a new tabpage" } },
             { "n", "<leader>e",   actions.focus_files,                { desc = "Bring focus to the file panel" } },
             { "n", "<leader>b",   actions.toggle_files,               { desc = "Toggle the file panel." } },
-			{
+            { "n", "g<C-x>",      actions.cycle_layout,               { desc = "Cycle through available layouts." } },
-				"n",
+            { "n", "[x",          actions.prev_conflict,              { desc = "In the merge-tool: jump to the previous conflict" } },
-				"g<C-x>",
+            { "n", "]x",          actions.next_conflict,              { desc = "In the merge-tool: jump to the next conflict" } },
-				actions.cycle_layout,
+            { "n", "<leader>co",  actions.conflict_choose("ours"),    { desc = "Choose the OURS version of a conflict" } },
-				{ desc = "Cycle through available layouts." },
+            { "n", "<leader>ct",  actions.conflict_choose("theirs"),  { desc = "Choose the THEIRS version of a conflict" } },
-			},
+            { "n", "<leader>cb",  actions.conflict_choose("base"),    { desc = "Choose the BASE version of a conflict" } },
-			{
+            { "n", "<leader>ca",  actions.conflict_choose("all"),     { desc = "Choose all the versions of a conflict" } },
-				"n",
+            { "n", "dX",          actions.conflict_choose("none"),    { desc = "Delete the conflict region" } },
-				"[x",
+            { "n", "<leader>cO",  actions.conflict_choose_all("ours"),   { desc = "Choose OURS for the whole file" } },
-				actions.prev_conflict,
+            { "n", "<leader>cT",  actions.conflict_choose_all("theirs"), { desc = "Choose THEIRS for the whole file" } },
-				{ desc = "In the merge-tool: jump to the previous conflict" },
+            { "n", "<leader>cB",  actions.conflict_choose_all("base"),   { desc = "Choose BASE for the whole file" } },
-			},
+            { "n", "<leader>cA",  actions.conflict_choose_all("all"),    { desc = "Choose all versions for the whole file" } },
-			{
+            { "n", "g?",          actions.help("view"),               { desc = "Open the help panel" } },
-				"n",
-				"]x",
-				actions.next_conflict,
-				{ desc = "In the merge-tool: jump to the next conflict" },
-			},
-			{
-				"n",
-				"<leader>co",
-				actions.conflict_choose("ours"),
-				{ desc = "Choose the OURS version of a conflict" },
-			},
-			{
-				"n",
-				"<leader>ct",
-				actions.conflict_choose("theirs"),
-				{ desc = "Choose the THEIRS version of a conflict" },
-			},
-			{
-				"n",
-				"<leader>cb",
-				actions.conflict_choose("base"),
-				{ desc = "Choose the BASE version of a conflict" },
-			},
-			{
-				"n",
-				"<leader>ca",
-				actions.conflict_choose("all"),
-				{ desc = "Choose all the versions of a conflict" },
-			},
-			{ "n", "dx", actions.conflict_choose("none"), { desc = "Delete the conflict region" } },
-			{
-				"n",
-				"<leader>cO",
-				actions.conflict_choose_all("ours"),
-				{ desc = "Choose the OURS version of a conflict for the whole file" },
-			},
-			{
-				"n",
-				"<leader>cT",
-				actions.conflict_choose_all("theirs"),
-				{ desc = "Choose the THEIRS version of a conflict for the whole file" },
-			},
-			{
-				"n",
-				"<leader>cB",
-				actions.conflict_choose_all("base"),
-				{ desc = "Choose the BASE version of a conflict for the whole file" },
-			},
-			{
-				"n",
-				"<leader>cA",
-				actions.conflict_choose_all("all"),
-				{ desc = "Choose all the versions of a conflict for the whole file" },
-			},
-			{
-				"n",
-				"dX",
-				actions.conflict_choose_all("none"),
-				{ desc = "Delete the conflict region for the whole file" },
-			},
-		},
-		diff1 = {
-			-- Mappings in single window diff layouts
-			{ "n", "g?", actions.help({ "view", "diff1" }), { desc = "Open the help panel" } },
-		},
-		diff2 = {
-			-- Mappings in 2-way diff layouts
-			{ "n", "g?", actions.help({ "view", "diff2" }), { desc = "Open the help panel" } },
-		},
-		diff3 = {
-			-- Mappings in 3-way diff layouts
-			{
-				{ "n", "x" },
-				"2do",
-				actions.diffget("ours"),
-				{ desc = "Obtain the diff hunk from the OURS version of the file" },
-			},
-			{
-				{ "n", "x" },
-				"3do",
-				actions.diffget("theirs"),
-				{ desc = "Obtain the diff hunk from the THEIRS version of the file" },
-			},
-			{ "n", "g?", actions.help({ "view", "diff3" }), { desc = "Open the help panel" } },
-		},
-		diff4 = {
-			-- Mappings in 4-way diff layouts
-			{
-				{ "n", "x" },
-				"1do",
-				actions.diffget("base"),
-				{ desc = "Obtain the diff hunk from the BASE version of the file" },
-			},
-			{
-				{ "n", "x" },
-				"2do",
-				actions.diffget("ours"),
-				{ desc = "Obtain the diff hunk from the OURS version of the file" },
-			},
-			{
-				{ "n", "x" },
-				"3do",
-				actions.diffget("theirs"),
-				{ desc = "Obtain the diff hunk from the THEIRS version of the file" },
-			},
-			{ "n", "g?", actions.help({ "view", "diff4" }), { desc = "Open the help panel" } },
           },
           file_panel = {
-			{
+            { "n", "j",           actions.next_entry,        { desc = "Bring the cursor to the next file entry" } },
-				"n",
+            { "n", "<down>",      actions.next_entry,        { desc = "Bring the cursor to the next file entry" } },
-				"j",
+            { "n", "k",           actions.prev_entry,        { desc = "Bring the cursor to the previous file entry" } },
-				actions.next_entry,
+            { "n", "<up>",        actions.prev_entry,        { desc = "Bring the cursor to the previous file entry" } },
-				{ desc = "Bring the cursor to the next file entry" },
+            { "n", "<cr>",        actions.select_entry,      { desc = "Open the diff for the selected entry" } },
-			},
+            { "n", "o",           actions.select_entry,      { desc = "Open the diff for the selected entry" } },
-			{
+            { "n", "l",           actions.select_entry,      { desc = "Open the diff for the selected entry" } },
-				"n",
+            { "n", "<2-LeftMouse>", actions.select_entry,    { desc = "Open the diff for the selected entry" } },
-				"<down>",
+            { "n", "-",           actions.toggle_stage_entry, { desc = "Stage / unstage the selected entry" } },
-				actions.next_entry,
+            { "n", "s",           actions.toggle_stage_entry, { desc = "Stage / unstage the selected entry" } },
-				{ desc = "Bring the cursor to the next file entry" },
-			},
-			{
-				"n",
-				"k",
-				actions.prev_entry,
-				{ desc = "Bring the cursor to the previous file entry" },
-			},
-			{
-				"n",
-				"<up>",
-				actions.prev_entry,
-				{ desc = "Bring the cursor to the previous file entry" },
-			},
-			{
-				"n",
-				"<cr>",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
-			{
-				"n",
-				"o",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
-			{
-				"n",
-				"l",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
-			{
-				"n",
-				"<2-LeftMouse>",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
-			{
-				"n",
-				"-",
-				actions.toggle_stage_entry,
-				{ desc = "Stage / unstage the selected entry" },
-			},
-			{
-				"n",
-				"s",
-				actions.toggle_stage_entry,
-				{ desc = "Stage / unstage the selected entry" },
-			},
             { "n", "S",           actions.stage_all,         { desc = "Stage all entries" } },
             { "n", "U",           actions.unstage_all,       { desc = "Unstage all entries" } },
-			{
+            { "n", "X",           actions.restore_entry,     { desc = "Restore entry to the state on the left side" } },
-				"n",
-				"X",
-				actions.restore_entry,
-				{ desc = "Restore entry to the state on the left side" },
-			},
             { "n", "L",           actions.open_commit_log,   { desc = "Open the commit log panel" } },
             { "n", "zo",          actions.open_fold,         { desc = "Expand fold" } },
             { "n", "h",           actions.close_fold,        { desc = "Collapse fold" } },
@@ -446,205 +217,55 @@ require("diffview").setup({
             { "n", "zM",          actions.close_all_folds,   { desc = "Collapse all folds" } },
             { "n", "<c-b>",       actions.scroll_view(-0.25), { desc = "Scroll the view up" } },
             { "n", "<c-f>",       actions.scroll_view(0.25),  { desc = "Scroll the view down" } },
-			{
+            { "n", "<tab>",       actions.select_next_entry,  { desc = "Open the diff for the next file" } },
-				"n",
+            { "n", "<s-tab>",     actions.select_prev_entry,  { desc = "Open the diff for the previous file" } },
-				"<tab>",
+            { "n", "[F",          actions.select_first_entry, { desc = "Open the diff for the first file" } },
-				actions.select_next_entry,
+            { "n", "]F",          actions.select_last_entry,  { desc = "Open the diff for the last file" } },
-				{ desc = "Open the diff for the next file" },
+            { "n", "gf",          actions.goto_file_edit,     { desc = "Open the file in the previous tabpage" } },
-			},
+            { "n", "<C-w><C-f>",  actions.goto_file_split,    { desc = "Open the file in a new split" } },
-			{
+            { "n", "<C-w>gf",     actions.goto_file_tab,      { desc = "Open the file in a new tabpage" } },
-				"n",
+            { "n", "i",           actions.listing_style,       { desc = "Toggle between 'list' and 'tree' views" } },
-				"<s-tab>",
+            { "n", "f",           actions.toggle_flatten_dirs, { desc = "Flatten empty subdirectories in tree listing style" } },
-				actions.select_prev_entry,
+            { "n", "R",           actions.refresh_files,       { desc = "Update stats and entries in the file list" } },
-				{ desc = "Open the diff for the previous file" },
+            { "n", "<leader>e",   actions.focus_files,         { desc = "Bring focus to the file panel" } },
-			},
-			{
-				"n",
-				"[F",
-				actions.select_first_entry,
-				{ desc = "Open the diff for the first file" },
-			},
-			{
-				"n",
-				"]F",
-				actions.select_last_entry,
-				{ desc = "Open the diff for the last file" },
-			},
-			{
-				"n",
-				"gf",
-				actions.goto_file_edit,
-				{ desc = "Open the file in the previous tabpage" },
-			},
-			{
-				"n",
-				"<C-w><C-f>",
-				actions.goto_file_split,
-				{ desc = "Open the file in a new split" },
-			},
-			{
-				"n",
-				"<C-w>gf",
-				actions.goto_file_tab,
-				{ desc = "Open the file in a new tabpage" },
-			},
-			{
-				"n",
-				"i",
-				actions.listing_style,
-				{ desc = "Toggle between 'list' and 'tree' views" },
-			},
-			{
-				"n",
-				"f",
-				actions.toggle_flatten_dirs,
-				{ desc = "Flatten empty subdirectories in tree listing style" },
-			},
-			{
-				"n",
-				"R",
-				actions.refresh_files,
-				{ desc = "Update stats and entries in the file list" },
-			},
-			{
-				"n",
-				"<leader>e",
-				actions.focus_files,
-				{ desc = "Bring focus to the file panel" },
-			},
             { "n", "<leader>b",   actions.toggle_files,        { desc = "Toggle the file panel" } },
             { "n", "g<C-x>",      actions.cycle_layout,        { desc = "Cycle available layouts" } },
             { "n", "[x",          actions.prev_conflict,       { desc = "Go to the previous conflict" } },
             { "n", "]x",          actions.next_conflict,       { desc = "Go to the next conflict" } },
             { "n", "g?",          actions.help("file_panel"),  { desc = "Open the help panel" } },
-			{
+            { "n", "<leader>cO",  actions.conflict_choose_all("ours"),   { desc = "Choose OURS for the whole file" } },
-				"n",
+            { "n", "<leader>cT",  actions.conflict_choose_all("theirs"), { desc = "Choose THEIRS for the whole file" } },
-				"<leader>cO",
+            { "n", "<leader>cB",  actions.conflict_choose_all("base"),   { desc = "Choose BASE for the whole file" } },
-				actions.conflict_choose_all("ours"),
+            { "n", "<leader>cA",  actions.conflict_choose_all("all"),    { desc = "Choose all versions for the whole file" } },
-				{ desc = "Choose the OURS version of a conflict for the whole file" },
+            { "n", "dX",          actions.conflict_choose_all("none"),   { desc = "Delete the conflict region for the whole file" } },
-			},
-			{
-				"n",
-				"<leader>cT",
-				actions.conflict_choose_all("theirs"),
-				{ desc = "Choose the THEIRS version of a conflict for the whole file" },
-			},
-			{
-				"n",
-				"<leader>cB",
-				actions.conflict_choose_all("base"),
-				{ desc = "Choose the BASE version of a conflict for the whole file" },
-			},
-			{
-				"n",
-				"<leader>cA",
-				actions.conflict_choose_all("all"),
-				{ desc = "Choose all the versions of a conflict for the whole file" },
-			},
-			{
-				"n",
-				"dX",
-				actions.conflict_choose_all("none"),
-				{ desc = "Delete the conflict region for the whole file" },
-			},
           },
           file_history_panel = {
             { "n", "g!",          actions.options,            { desc = "Open the option panel" } },
-			{
+            { "n", "<C-A-d>",     actions.open_in_diffview,   { desc = "Open the entry under the cursor in a diffview" } },
-				"n",
+            { "n", "y",           actions.copy_hash,          { desc = "Copy the commit hash of the entry under the cursor" } },
-				"<C-A-d>",
-				actions.open_in_diffview,
-				{ desc = "Open the entry under the cursor in a diffview" },
-			},
-			{
-				"n",
-				"y",
-				actions.copy_hash,
-				{ desc = "Copy the commit hash of the entry under the cursor" },
-			},
             { "n", "L",           actions.open_commit_log,    { desc = "Show commit details" } },
-			{
+            { "n", "X",           actions.restore_entry,      { desc = "Restore file to the state from the selected entry" } },
-				"n",
-				"X",
-				actions.restore_entry,
-				{ desc = "Restore file to the state from the selected entry" },
-			},
             { "n", "zo",          actions.open_fold,          { desc = "Expand fold" } },
             { "n", "zc",          actions.close_fold,         { desc = "Collapse fold" } },
             { "n", "h",           actions.close_fold,         { desc = "Collapse fold" } },
             { "n", "za",          actions.toggle_fold,        { desc = "Toggle fold" } },
             { "n", "zR",          actions.open_all_folds,     { desc = "Expand all folds" } },
             { "n", "zM",          actions.close_all_folds,    { desc = "Collapse all folds" } },
-			{
+            { "n", "j",           actions.next_entry,         { desc = "Bring the cursor to the next file entry" } },
-				"n",
+            { "n", "<down>",      actions.next_entry,         { desc = "Bring the cursor to the next file entry" } },
-				"j",
+            { "n", "k",           actions.prev_entry,         { desc = "Bring the cursor to the previous file entry" } },
-				actions.next_entry,
+            { "n", "<up>",        actions.prev_entry,         { desc = "Bring the cursor to the previous file entry" } },
-				{ desc = "Bring the cursor to the next file entry" },
+            { "n", "<cr>",        actions.select_entry,       { desc = "Open the diff for the selected entry" } },
-			},
+            { "n", "o",           actions.select_entry,       { desc = "Open the diff for the selected entry" } },
-			{
+            { "n", "l",           actions.select_entry,       { desc = "Open the diff for the selected entry" } },
-				"n",
+            { "n", "<2-LeftMouse>", actions.select_entry,     { desc = "Open the diff for the selected entry" } },
-				"<down>",
-				actions.next_entry,
-				{ desc = "Bring the cursor to the next file entry" },
-			},
-			{
-				"n",
-				"k",
-				actions.prev_entry,
-				{ desc = "Bring the cursor to the previous file entry" },
-			},
-			{
-				"n",
-				"<up>",
-				actions.prev_entry,
-				{ desc = "Bring the cursor to the previous file entry" },
-			},
-			{
-				"n",
-				"<cr>",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
-			{
-				"n",
-				"o",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
-			{
-				"n",
-				"l",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
-			{
-				"n",
-				"<2-LeftMouse>",
-				actions.select_entry,
-				{ desc = "Open the diff for the selected entry" },
-			},
             { "n", "<c-b>",       actions.scroll_view(-0.25), { desc = "Scroll the view up" } },
             { "n", "<c-f>",       actions.scroll_view(0.25),  { desc = "Scroll the view down" } },
             { "n", "<tab>",       actions.select_next_entry,  { desc = "Open the diff for the next file" } },
-			{
+            { "n", "<s-tab>",     actions.select_prev_entry,  { desc = "Open the diff for the previous file" } },
-				"n",
+            { "n", "[F",          actions.select_first_entry, { desc = "Open the diff for the first file" } },
-				"<s-tab>",
-				actions.select_prev_entry,
-				{ desc = "Open the diff for the previous file" },
-			},
-			{
-				"n",
-				"[F",
-				actions.select_first_entry,
-				{ desc = "Open the diff for the first file" },
-			},
             { "n", "]F",          actions.select_last_entry,  { desc = "Open the diff for the last file" } },
-			{
+            { "n", "gf",          actions.goto_file_edit,     { desc = "Open the file in the previous tabpage" } },
-				"n",
-				"gf",
-				actions.goto_file_edit,
-				{ desc = "Open the file in the previous tabpage" },
-			},
             { "n", "<C-w><C-f>",  actions.goto_file_split,    { desc = "Open the file in a new split" } },
             { "n", "<C-w>gf",     actions.goto_file_tab,      { desc = "Open the file in a new tabpage" } },
             { "n", "<leader>e",   actions.focus_files,        { desc = "Bring focus to the file panel" } },
@@ -662,4 +283,7 @@ require("diffview").setup({
             { "n", "<esc>", actions.close, { desc = "Close help menu" } },
           },
         },
-})
+      })
+    end,
+  },
+}

.config/nvim/lua/plugins/init.lua

@@ -1,11 +0,0 @@
-require("plugins.log-highlight")
-require("plugins.whichkey")
-require("plugins.treesitter")
-require("plugins.neotree")
-require("plugins.telescope")
-require("plugins.blink")
-require("plugins.conform")
-require("plugins.git")
-require("plugins.markdown")
-require("plugins.theme")
-require("plugins.lualine")

.config/nvim/lua/plugins/log-highlight.lua

@@ -1 +1,3 @@
-vim.pack.add({ "https://github.com/fei6409/log-highlight.nvim" })
+return {
+  "fei6409/log-highlight.nvim",
+}

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

@@ -1,14 +1,13 @@
-vim.pack.add({
+return {
-	"https://github.com/nvim-lualine/lualine.nvim",
+  "nvim-lualine/lualine.nvim",
-	"https://github.com/nvim-tree/nvim-web-devicons",
+  dependencies = { "nvim-tree/nvim-web-devicons" },
-})
+  config = function()
-
+    require("lualine").setup({
-require("lualine").setup({
       options = {
         icons_enabled = true,
         theme = "auto",
-		component_separators = { left = "", right = "" },
+        component_separators = { left = "", right = "" },
-		section_separators = { left = "", right = "" },
+        section_separators = { left = "", right = "" },
         disabled_filetypes = {
           statusline = {},
           winbar = {},
@@ -21,18 +20,11 @@ require("lualine").setup({
           statusline = 1000,
           tabline = 1000,
           winbar = 1000,
-			refresh_time = 16, -- ~60fps
+          refresh_time = 16,
           events = {
-				"WinEnter",
+            "WinEnter", "BufEnter", "BufWritePost", "SessionLoadPost",
-				"BufEnter",
+            "FileChangedShellPost", "VimResized", "Filetype",
-				"BufWritePost",
+            "CursorMoved", "CursorMovedI", "ModeChanged",
-				"SessionLoadPost",
-				"FileChangedShellPost",
-				"VimResized",
-				"Filetype",
-				"CursorMoved",
-				"CursorMovedI",
-				"ModeChanged",
           },
         },
       },
@@ -56,4 +48,6 @@ require("lualine").setup({
       winbar = {},
       inactive_winbar = {},
       extensions = {},
-})
+    })
+  end,
+}

.config/nvim/lua/plugins/markdown.lua

@@ -1,7 +1,7 @@
-vim.pack.add({
+return {
-    'https://github.com/nvim-treesitter/nvim-treesitter',
+  "MeanderingProgrammer/render-markdown.nvim",
-    -- 'https://github.com/nvim-mini/mini.nvim',            -- if you use the mini.nvim suite
+  dependencies = {
-    -- 'https://github.com/nvim-mini/mini.icons',        -- if you use standalone mini plugins
+    "nvim-treesitter/nvim-treesitter",
-    -- 'https://github.com/nvim-tree/nvim-web-devicons', -- if you prefer nvim-web-devicons
+    "nvim-tree/nvim-web-devicons",
-    'https://github.com/MeanderingProgrammer/render-markdown.nvim',
+  },
-})
+}

.config/nvim/lua/plugins/neotree.lua

@@ -1,11 +1,9 @@
-vim.pack.add({
+return {
-  {
+  "nvim-neo-tree/neo-tree.nvim",
-    src = 'https://github.com/nvim-neo-tree/neo-tree.nvim',
+  version = "3.*",
-    version = vim.version.range('3')
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "MunifTanjim/nui.nvim",
+    "nvim-tree/nvim-web-devicons",
   },
-  -- dependencies
+}
-  "https://github.com/nvim-lua/plenary.nvim",
-  "https://github.com/MunifTanjim/nui.nvim",
-  -- optional, but recommended
-  "https://github.com/nvim-tree/nvim-web-devicons",
-})

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

@@ -1,13 +1,18 @@
-vim.pack.add({"https://github.com/nvim-telescope/telescope.nvim",
+return {
-"https://github.com/nvim-lua/plenary.nvim",
+  "nvim-telescope/telescope.nvim",
-"https://github.com/BurntSushi/ripgrep",
+  dependencies = {
-"https://github.com/nvim-telescope/telescope-fzf-native.nvim",
+    "nvim-lua/plenary.nvim",
-"https://github.com/sharkdp/fd",
+    "nvim-tree/nvim-web-devicons",
-"https://github.com/nvim-tree/nvim-web-devicons"}
+    {
-)
+      "nvim-telescope/telescope-fzf-native.nvim",
-
+      build = "make",
-local builtin = require('telescope.builtin')
+    },
-vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
+  },
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
+  config = function()
-vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
+    local builtin = require("telescope.builtin")
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
+    vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
+    vim.keymap.set("n", "<leader>fg", builtin.live_grep,  { desc = "Telescope live grep" })
+    vim.keymap.set("n", "<leader>fb", builtin.buffers,    { desc = "Telescope buffers" })
+    vim.keymap.set("n", "<leader>fh", builtin.help_tags,  { desc = "Telescope help tags" })
+  end,
+}

.config/nvim/lua/plugins/theme.lua

@@ -1,3 +1,8 @@
-vim.pack.add({"https://github.com/catppuccin/nvim"})
+return {
-
+  "catppuccin/nvim",
-vim.cmd("colorscheme catppuccin")
+  name = "catppuccin",
+  priority = 1000, -- Load before other plugins so colorscheme is set first
+  config = function()
+    vim.cmd("colorscheme catppuccin")
+  end,
+}

.config/nvim/lua/plugins/treesitter.lua

@@ -1,69 +1,47 @@
-vim.pack.add({
+return {
   {
-    src = "https://github.com/nvim-treesitter/nvim-treesitter",
+    "nvim-treesitter/nvim-treesitter",
-    version = "main",
+    branch = "main",
+    build = ":TSUpdate",
+    config = function()
+      require("nvim-treesitter").setup({})
+      require("nvim-treesitter").install({
+        "bash", "blade", "c", "comment", "css", "diff", "dockerfile",
+        "fish", "gitcommit", "gitignore", "go", "gomod", "gosum", "gowork",
+        "html", "ini", "javascript", "jsdoc", "json", "lua", "luadoc",
+        "luap", "make", "markdown", "markdown_inline", "nginx", "nix",
+        "proto", "python", "query", "regex", "rust", "scss", "sql",
+        "terraform", "toml", "tsx", "typescript", "vim", "vimdoc",
+        "xml", "yaml", "zig",
+      })
+
+      vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+      vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = { "*" },
+        callback = function()
+          local filetype = vim.bo.filetype
+          if filetype and filetype ~= "" then
+            pcall(vim.treesitter.start)
+          end
+        end,
+      })
+    end,
   },
   {
-    src = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects",
+    "nvim-treesitter/nvim-treesitter-textobjects",
-    version = "main",
+    branch = "main",
-  },
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
-})
+    config = function()
-
+      require("nvim-treesitter-textobjects").setup({
-require("nvim-treesitter").setup({})
-require("nvim-treesitter").install({
-  "bash",
-  "blade",
-  "c",
-  "comment",
-  "css",
-  "diff",
-  "dockerfile",
-  "fish",
-  "gitcommit",
-  "gitignore",
-  "go",
-  "gomod",
-  "gosum",
-  "gowork",
-  "html",
-  "ini",
-  "javascript",
-  "jsdoc",
-  "json",
-  "lua",
-  "luadoc",
-  "luap",
-  "make",
-  "markdown",
-  "markdown_inline",
-  "nginx",
-  "nix",
-  "proto",
-  "python",
-  "query",
-  "regex",
-  "rust",
-  "scss",
-  "sql",
-  "terraform",
-  "toml",
-  "tsx",
-  "typescript",
-  "vim",
-  "vimdoc",
-  "xml",
-  "yaml",
-  "zig",
-})
-
-require("nvim-treesitter-textobjects").setup({
         select = {
           enable = true,
           lookahead = true,
           selection_modes = {
-      ["@parameter.outer"] = "v", -- charwise
+            ["@parameter.outer"] = "v",
-      ["@function.outer"] = "V", -- linewise
+            ["@function.outer"] = "V",
-      ["@class.outer"] = "<c-v>", -- blockwise
+            ["@class.outer"] = "<c-v>",
           },
           include_surrounding_whitespace = false,
         },
@@ -71,11 +49,11 @@ require("nvim-treesitter-textobjects").setup({
           enable = true,
           set_jumps = true,
         },
-})
+      })
 
--- SELECT keymaps
+      -- SELECT keymaps
-local sel = require("nvim-treesitter-textobjects.select")
+      local sel = require("nvim-treesitter-textobjects.select")
-for _, map in ipairs({
+      for _, map in ipairs({
         { { "x", "o" }, "af", "@function.outer" },
         { { "x", "o" }, "if", "@function.inner" },
         { { "x", "o" }, "ac", "@class.outer" },
@@ -84,15 +62,15 @@ for _, map in ipairs({
         { { "x", "o" }, "ia", "@parameter.inner" },
         { { "x", "o" }, "ad", "@comment.outer" },
         { { "x", "o" }, "as", "@statement.outer" },
-}) do
+      }) do
-vim.keymap.set(map[1], map[2], function()
+        vim.keymap.set(map[1], map[2], function()
           sel.select_textobject(map[3], "textobjects")
-end, { desc = "Select " .. map[3] })
+        end, { desc = "Select " .. map[3] })
-end
+      end
 
--- MOVE keymaps
+      -- MOVE keymaps
-local mv = require("nvim-treesitter-textobjects.move")
+      local mv = require("nvim-treesitter-textobjects.move")
-for _, map in ipairs({
+      for _, map in ipairs({
         { { "n", "x", "o" }, "]m", mv.goto_next_start,     "@function.outer" },
         { { "n", "x", "o" }, "[m", mv.goto_previous_start, "@function.outer" },
         { { "n", "x", "o" }, "]]", mv.goto_next_start,     "@class.outer" },
@@ -101,44 +79,13 @@ for _, map in ipairs({
         { { "n", "x", "o" }, "[M", mv.goto_previous_end,   "@function.outer" },
         { { "n", "x", "o" }, "]o", mv.goto_next_start,     { "@loop.inner", "@loop.outer" } },
         { { "n", "x", "o" }, "[o", mv.goto_previous_start, { "@loop.inner", "@loop.outer" } },
-}) do
+      }) do
-local modes, lhs, fn, query = map[1], map[2], map[3], map[4]
+        local modes, lhs, fn, query = map[1], map[2], map[3], map[4]
--- build a human-readable desc
+        local qstr = (type(query) == "table") and table.concat(query, ",") or query
-local qstr = (type(query) == "table") and table.concat(query, ",") or query
+        vim.keymap.set(modes, lhs, function()
-vim.keymap.set(modes, lhs, function()
           fn(query, "textobjects")
-end, { desc = "Move to " .. qstr })
+        end, { desc = "Move to " .. qstr })
-end
-
-vim.api.nvim_create_autocmd("PackChanged", {
-  desc = "Handle nvim-treesitter updates",
-  group = vim.api.nvim_create_augroup("nvim-treesitter-pack-changed-update-handler", { clear = true }),
-  callback = function(event)
-    if event.data.kind == "update" then
-      local ok = pcall(vim.cmd, "TSUpdate")
-      if ok then
-        vim.notify("TSUpdate completed successfully!", vim.log.levels.INFO)
-      else
-        vim.notify("TSUpdate command not available yet, skipping", vim.log.levels.WARN)
-      end
       end
     end,
-})
+  },
-
+}
-vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
-vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = { "*" },
-  callback = function()
-    local filetype = vim.bo.filetype
-    if filetype and filetype ~= "" then
-      local success = pcall(function()
-        vim.treesitter.start()
-      end)
-      if not success then
-        return
-      end
-    end
-  end,
-})

.config/nvim/lua/plugins/whichkey.lua

@@ -1,16 +1,16 @@
-vim.pack.add({
+return {
-  "https://github.com/folke/which-key.nvim",
+  "folke/which-key.nvim",
-})
+  event = "VeryLazy",
-
+  config = function()
-local wk = require("which-key")
+    local wk = require("which-key")
-wk.setup({
+    wk.setup({
       preset = "helix",
-})
+    })
-wk.add({
+    wk.add({
       { "<leader><tab>", group = "tabs" },
       { "<leader>c", group = "code" },
       { "<leader>d", group = "debug" },
-  { "<leader>D", group = "Diffview", icon = { icon = "", color = "orange" } },
+      { "<leader>D", group = "Diffview", icon = { icon = "", color = "orange" } },
       { "<leader>p", group = "Yanky", icon = { icon = "󰃮 ", color = "yellow" } },
       { "<leader>dp", group = "profiler" },
       { "<leader>f", group = "file/find" },
@@ -40,7 +40,6 @@ wk.add({
           return require("which-key.extras").expand.win()
         end,
       },
-  -- better descriptions
       { "gx", desc = "Open with system app" },
       {
         "<leader>fC",
@@ -48,7 +47,7 @@ wk.add({
         {
           "<leader>fCf",
           function()
-        vim.fn.setreg("+", vim.fn.expand("%:p")) -- Copy full file path to clipboard
+            vim.fn.setreg("+", vim.fn.expand("%:p"))
             vim.notify("Copied full file path: " .. vim.fn.expand("%:p"))
           end,
           desc = "Copy full file path",
@@ -56,7 +55,7 @@ wk.add({
         {
           "<leader>fCn",
           function()
-        vim.fn.setreg("+", vim.fn.expand("%:t")) -- Copy file name to clipboard
+            vim.fn.setreg("+", vim.fn.expand("%:t"))
             vim.notify("Copied file name: " .. vim.fn.expand("%:t"))
           end,
           desc = "Copy file name",
@@ -64,10 +63,10 @@ wk.add({
         {
           "<leader>fCr",
           function()
-        local cwd = vim.fn.getcwd() -- Current working directory
+            local cwd = vim.fn.getcwd()
-        local full_path = vim.fn.expand("%:p") -- Full file path
+            local full_path = vim.fn.expand("%:p")
-        local rel_path = full_path:sub(#cwd + 2) -- Remove cwd prefix and leading slash
+            local rel_path = full_path:sub(#cwd + 2)
-        vim.fn.setreg("+", rel_path) -- Copy relative file path to clipboard
+            vim.fn.setreg("+", rel_path)
             vim.notify("Copied relative file path: " .. rel_path)
           end,
           desc = "Copy relative file path",
@@ -88,11 +87,10 @@ wk.add({
         },
       },
       {
-    -- Nested mappings are allowed and can be added in any order
+        mode = { "n", "v" },
-    -- Most attributes can be inherited or overridden on any level
+        { "<leader>q", "<cmd>q<cr>", desc = "Quit" },
-    -- There's no limit to the depth of nesting
-    mode = { "n", "v" }, -- NORMAL and VISUAL mode
-    { "<leader>q", "<cmd>q<cr>", desc = "Quit" }, -- no need to specify mode since it's inherited
         { "<leader>w", "<cmd>w<cr>", desc = "Write" },
       },
-})
+    })
+  end,
+}

.config/nvim/nvim-pack-lock.json

@@ -1,80 +0,0 @@
-{
-  "plugins": {
-    "blink.cmp": {
-      "rev": "b19413d",
-      "src": "https://github.com/saghen/blink.cmp",
-      "version": "1.0.0 - 2.0.0"
-    },
-    "conform.nvim": {
-      "rev": "8314f4c",
-      "src": "https://github.com/stevearc/conform.nvim"
-    },
-    "diffview.nvim": {
-      "rev": "4516612",
-      "src": "https://github.com/sindrets/diffview.nvim"
-    },
-    "fd": {
-      "rev": "5f95a78",
-      "src": "https://github.com/sharkdp/fd"
-    },
-    "gitsigns.nvim": {
-      "rev": "dfac404",
-      "src": "https://github.com/lewis6991/gitsigns.nvim"
-    },
-    "log-highlight.nvim": {
-      "rev": "ca88628f6dd3b9bb46f9a7401669e24cf7de47a4",
-      "src": "https://github.com/fei6409/log-highlight.nvim"
-    },
-    "lualine.nvim": {
-      "rev": "47f91c4",
-      "src": "https://github.com/nvim-lualine/lualine.nvim"
-    },
-    "neo-tree.nvim": {
-      "rev": "f3df514",
-      "src": "https://github.com/nvim-neo-tree/neo-tree.nvim",
-      "version": "3.0.0 - 4.0.0"
-    },
-    "nui.nvim": {
-      "rev": "de74099",
-      "src": "https://github.com/MunifTanjim/nui.nvim"
-    },
-    "nvim": {
-      "rev": "6efc53e",
-      "src": "https://github.com/catppuccin/nvim"
-    },
-    "nvim-treesitter": {
-      "rev": "b033ab33",
-      "src": "https://github.com/nvim-treesitter/nvim-treesitter",
-      "version": "'main'"
-    },
-    "nvim-treesitter-textobjects": {
-      "rev": "28a3494",
-      "src": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects",
-      "version": "'main'"
-    },
-    "nvim-web-devicons": {
-      "rev": "6788013",
-      "src": "https://github.com/nvim-tree/nvim-web-devicons"
-    },
-    "plenary.nvim": {
-      "rev": "b9fd522",
-      "src": "https://github.com/nvim-lua/plenary.nvim"
-    },
-    "ripgrep": {
-      "rev": "0a88ccc",
-      "src": "https://github.com/BurntSushi/ripgrep"
-    },
-    "telescope-fzf-native.nvim": {
-      "rev": "6fea601",
-      "src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
-    },
-    "telescope.nvim": {
-      "rev": "3333a52",
-      "src": "https://github.com/nvim-telescope/telescope.nvim"
-    },
-    "which-key.nvim": {
-      "rev": "3aab214",
-      "src": "https://github.com/folke/which-key.nvim"
-    }
-  }
-}