fix: merge conflict

lsp/bash.lua

@@ -0,0 +1,18 @@
+---@type vim.lsp.Config
+return {
+    cmd = { "bash-language-server", "start" },
+    settings = {
+        bashIde = {
+            -- Glob pattern for finding and parsing shell script files in the workspace.
+            -- Used by the background analysis features across files.
+
+            -- Prevent recursive scanning which will cause issues when opening a file
+            -- directly in the home directory (e.g. ~/foo.sh).
+            --
+            -- Default upstream pattern is "**/*@(.sh|.inc|.bash|.command)".
+            globPattern = vim.env.GLOB_PATTERN or "*@(.sh|.inc|.bash|.command)",
+        },
+    },
+    filetypes = { "bash", "sh" },
+    root_markers = { ".git" },
+}

lua/weeheavy/prefs.lua

@@ -7,7 +7,7 @@ vim.lsp.enable({
     "ansible",
     "marksman",
     "write-good",
-    "woke",
+    -- "woke", -- permission issues with macOS .Trash
     "tailwind",
     "docker-compose",
     "bicep",
@@ -15,6 +15,7 @@ vim.lsp.enable({
     "python",
     "elixir",
     "json",
+    "bash",
 })
 
 -- Set highlight on search