Merge branch 'main' into dotfiles

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

@@ -6,56 +6,34 @@ return {
       width = vim.api.nvim_win_get_width(0) - 4,
     },
   },
-  keys = {
+  keys = function()
-    {
+    local keys = {
-      "<leader>H",
+      {
-      function()
+        "<leader>H",
-        require("harpoon"):list():append()
+        function()
-      end,
+          require("harpoon"):list():append()
-      desc = "Harpoon File",
+        end,
-    },
+        desc = "Harpoon File",
-    {
+      },
-      "<leader>h",
+      {
-      function()
+        "<leader>h",
-        local harpoon = require("harpoon")
+        function()
-        harpoon.ui:toggle_quick_menu(harpoon:list())
+          local harpoon = require("harpoon")
-      end,
+          harpoon.ui:toggle_quick_menu(harpoon:list())
-      desc = "Harpoon Quick Menu",
+        end,
-    },
+        desc = "Harpoon Quick Menu",
-    {
+      }
-      "<leader>1",
+    }
-      function()
+
-        require("harpoon"):list():select(1)
+    for i = 1, 5 do
-      end,
+      table.insert(keys, {
-      desc = "Harpoon to File 1",
+        "<leader>" .. i,
-    },
+        function()
-    {
+          require("harpoon"):list():select(i)
-      "<leader>2",
+        end,
-      function()
+        desc = "Harpoon to File " .. i,
-        require("harpoon"):list():select(2)
+      })
-      end,
+    end
-      desc = "Harpoon to File 2",
+    return keys
-    },
+  end
-    {
-      "<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",