Merge branch 'main' into dotfiles

lua/lazyvim/plugins/extras/editor/harpoon2.lua

@@ -6,7 +6,8 @@ return {
       width = vim.api.nvim_win_get_width(0) - 4,
     },
   },
-  keys = {
+  keys = function()
+    local keys = {
       {
         "<leader>H",
         function()
@@ -21,41 +22,18 @@ return {
           harpoon.ui:toggle_quick_menu(harpoon:list())
         end,
         desc = "Harpoon Quick Menu",
-    },
+      }
-    {
+    }
-      "<leader>1",
+
+    for i = 1, 5 do
+      table.insert(keys, {
+        "<leader>" .. i,
         function()
-        require("harpoon"):list():select(1)
+          require("harpoon"):list():select(i)
         end,
-      desc = "Harpoon to File 1",
+        desc = "Harpoon to File " .. i,
-    },
+      })
-    {
+    end
-      "<leader>2",
+    return keys
-      function()
+  end
-        require("harpoon"):list():select(2)
-      end,
-      desc = "Harpoon to File 2",
-    },
-    {
-      "<leader>3",
-      function()
-        require("harpoon"):list():select(3)
-      end,
-      desc = "Harpoon to File 3",
-    },
-    {
-      "<leader>4",
-      function()
-        require("harpoon"):list():select(4)
-      end,
-      desc = "Harpoon to File 4",
-    },
-    {
-      "<leader>5",
-      function()
-        require("harpoon"):list():select(5)
-      end,
-      desc = "Harpoon to File 5",
-    },
-  },
 }

lua/lazyvim/plugins/extras/util/dot.lua

@@ -7,6 +7,23 @@ local function have(path)
 end
 
 return {
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        bashls = {},
+      },
+    },
+  },
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      vim.list_extend(opts.ensure_installed or {}, {
+        "shfmt",
+        "shellcheck",
+      })
+    end,
+  },
   -- add some stuff to treesitter
   {
     "nvim-treesitter/nvim-treesitter",