init.lua @ c36ca9a

M lua/plugins/git.lua

@@ -4,14 +4,14 @@ {
     "lewis6991/gitsigns.nvim",
     event = "BufRead",
     keys = function()
-      local g = require "gitsigns"
+      --stylua: ignore
       return {
-        { "]g", g.next_hunk },
-        { "[g", g.prev_hunk },
-        { "<leader>gs", g.stage_hunk },
-        { "<leader>gS", g.undo_stage_hunk },
-        { "<leader>gr", g.reset_hunk },
-        { "<leader>gh", g.preview_hunk },
+        { "]g", function() require("gitsigns").next_hunk() end },
+        { "[g", function() require("gitsigns").prev_hunk() end},
+        { "<leader>gs", function() require("gitsigns").stage_hunk() end},
+        { "<leader>gS", function() require("gitsigns").undo_stage_hunk() end },
+        { "<leader>gr", function() require("gitsigns").reset_hunk() end },
+        { "<leader>gh", function() require("gitsigns").preview_hunk() end },
       }
     end,
     opts = {

M lua/plugins/navigation.lua

@@ -13,16 +13,14 @@ {
     "ThePrimeagen/harpoon",
     branch = "harpoon2",
     keys = function()
-      local h = require "harpoon"
-
       -- stylua: ignore
       return {
-        { "<leader>a", function() h:list():add() end },
-        { "<C-f>", function() h.ui:toggle_quick_menu(h:list()) end },
-        { "<A-f>", function() h:list():select(1) end },
-        { "<A-d>", function() h:list():select(2) end },
-        { "<A-s>", function() h:list():select(3) end },
-        { "<A-a>", function() h:list():select(4) end },
+        { "<leader>a", function() require("harpoon"):list():add() end },
+        { "<C-f>", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end },
+        { "<A-f>", function() require("harpoon"):list():select(1) end },
+        { "<A-d>", function() require("harpoon"):list():select(2) end },
+        { "<A-s>", function() require("harpoon"):list():select(3) end },
+        { "<A-a>", function() require("harpoon"):list():select(4) end },
       }
     end,
     ---@type HarpoonPartialConfig

M lua/plugins/telescope.lua

@@ -14,14 +14,20 @@ require("telescope.builtin").grep_string { search = input }
       end)
     end
 
+    local function wrap(fn)
+      return function()
+        return require("telescope.builtin")[fn]()
+      end
+    end
+
     return {
-      { "<leader>f", ":Telescope find_files<cr>" },
-      { "<leader>b", ":Telescope buffers<cr>" },
-      { "<leader>sr", ":Telescope oldfiles<cr>" },
-      { "<leader>sg", ":Telescope live_grep<cr>" },
+      { "<leader>f", wrap "find_files" },
+      { "<leader>b", wrap "buffers" },
+      { "<leader>sr", wrap "oldfiles" },
+      { "<leader>sg", wrap "live_grep" },
       { "<leader>st", grep_string },
-      { "<leader>sd", ":Telescope diagnostics<cr>" },
-      { "<leader>sh", ":Telescope help_tags<cr>" },
+      { "<leader>sd", wrap "diagnostics" },
+      { "<leader>sh", wrap "help_tags" },
     }
   end,
   config = function()