Streamline linting/formatting/syntax dotenv files

Blackjacx · Aug 22, 2024 · 8b700a8 · 8b700a8
1 parent 36fceb4
commit 8b700a8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/bootstrap/config_dirs/nvim/lua/user/core/filetypes.lua b/bootstrap/config_dirs/nvim/lua/user/core/filetypes.lua
@@ -1,16 +1,17 @@
 vim.filetype.add({
 	extension = {
 		conf = "conf",
-		env = "dotenv",
-		envrc = "dotenv",
+		env = "sh",
+		envrc = "sh",
 	},
 	filename = {
-		[".env"] = "dotenv",
-		[".envrc"] = "dotenv",
+		[".env"] = "sh",
+		[".envrc"] = "sh",
+		["swiftformat"] = "conf",
 		[".yamlfmt"] = "yaml",
 	},
 	pattern = {
-		["%.env%.[%w_.-]+"] = "dotenv",
-		["%.envrc%.[%w_.-]+"] = "dotenv",
+		["%.env%.[%w_.-]+"] = "sh",
+		["%.envrc%.[%w_.-]+"] = "sh",
 	},
 })
diff --git a/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/lspconfig.lua b/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/lspconfig.lua
@@ -92,6 +92,11 @@ return {
 			["bashls"] = function()
 				lspconfig["bashls"].setup({
 					capabilities = capabilities,
+					filetypes = {
+						"sh",
+						"zsh",
+						"dotenv",
+					},
 				})
 			end,
 

diff --git a/bootstrap/config_dirs/nvim/lua/user/plugins/nvim-notify.lua b/bootstrap/config_dirs/nvim/lua/user/plugins/nvim-notify.lua
@@ -6,6 +6,6 @@ return {
 		local plugin = require("notify")
 
 		-- enable
-		plugin.setup({})
+		plugin.setup()
 	end,
 }