Merge remote changes with icon additions

  - Resolved conflicts from GitHub repo merge
  - Added icons to Debug and Git groups in which-key
  - Added icons to scratchpad, notifications, projects, and git browse keymaps

Author: greggh

lua/plugins/lsp.lua

@@ -29,35 +29,21 @@ return {
       emmet_language_server = {
         fileeypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "php" },
       },
-      eslint_d = {
-        root_dir = vim.fs.root(0, { "package.json", ".eslintrc.json", ".eslintrc.js", ".git" }),
-        filetypes = { "javascript", "typescript", "typescriptreact", "javascriptreact" },
-        flags = os.getenv("DEBOUNCE_ESLINT") and {
-          allow_incremental_sync = true,
-          debounce_text_changes = 1000,
-        } or nil,
-        on_attach = function(_, bufnr)
-          vim.api.nvim_create_autocmd("BufWritePre", {
-            buffer = bufnr,
-            command = "EslintFixAll",
-          })
-        end,
-      },
       gopls = {},
       html = {},
       jsonls = {},
       lua_ls = {
         settings = {
-          Lua = {
+          lua = {
             diagnostics = {
-              globals = { "vim", "Snacks" },
+              globals = { "vim", "snacks" },
             },
             completion = {
-              callSnippet = "Replace",
+              callsnippet = "replace",
             },
             workspace = {
               library = vim.api.nvim_get_runtime_file("", true),
-              checkThirdParty = false,
+              checkthirdparty = false,
             },
           },
         },
@@ -172,54 +158,19 @@ return {
     ---------------------
     -- mason
     ---------------------
+
     local ensure_installed = vim.tbl_keys(servers or {})
+    local ensure_lsptools_installed = vim.tbl_keys(servers or {})
 
     if vim.g.debugger then
       local DEBUGGERS = require("utils.debugger").DEBUGGERS
-      vim.list_extend(ensure_installed, DEBUGGERS)
+      vim.list_extend(ensure_lsptools_installed, DEBUGGERS)
     end
 
-    vim.list_extend(ensure_installed, LSP_TOOLS)
-
-    require("mason-tool-installer").setup({ ensure_installed = ensure_installed })
-    require("mason-lspconfig").setup({
-      handlers = {
-        function(server_name)
-          local server = servers[server_name] or {}
-          server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {})
-
-          -- Add memory limits for heavy LSP servers
-          local heavy_servers = {
-            "vtsls",
-            "lua_ls",
-            "pyright",
-            "rust_analyzer",
-            "gopls",
-            "clangd",
-            "tailwindcss",
-            "jdtls",
-            "yamlls",
-          }
-          if vim.tbl_contains(heavy_servers, server_name) then
-            server.settings = server.settings or {}
-            server.settings.memory = {
-              limitMb = get_memory_limit_mb(),
-            }
-          end
+    vim.list_extend(ensure_lsptools_installed, LSP_TOOLS)
 
-          -- Add offsetEncoding capability for clangd
-          if server_name == "clangd" then
-            server.capabilities.offsetEncoding = { "utf-16" }
-          end
-
-          --       server.on_attach = function(client, bufnr) -- Attach to every buffer
-          -- Populate Workspace-Diagnostics plugin information
-          --          require("workspace-diagnostics").populate_workspace_diagnostics(client, bufnr)
-          --        end
-          require("lspconfig")[server_name].setup(server)
-        end,
-      },
-    })
+    require("mason-tool-installer").setup({ ensure_installed = ensure_lsptools_installed })
+    require("mason-lspconfig").setup({ ensure_installed = ensure_installed, automatic_enable = true })
 
     ---------------------
     -- keybinds

lua/plugins/mini-sessions.lua

@@ -15,7 +15,8 @@ return {
       pre = {
         read = nil,
         write = function()
-          local edgy, diffview, dap, dapui = require("edgy"), require("diffview.lib"), require("dap"), require("dapui")
+          local edgy, diffview, dap, dapui =
+            require("edgy"), require("diffview.lib"), require("nvim-dap"), require("dapui")
 
           edgy.close()