diff --git a/lua/custom/plugins/autopairs.lua b/lua/custom/plugins/autopairs.lua
new file mode 100644
index 00000000..dbe6b7a3
--- /dev/null
+++ b/lua/custom/plugins/autopairs.lua
@@ -0,0 +1,4 @@
+return {
+    "windwp/nvim-autopairs",
+    config = function() require("nvim-autopairs").setup {} end
+}
diff --git a/lua/custom/plugins/comment.lua b/lua/custom/plugins/comment.lua
new file mode 100644
index 00000000..16a8a70c
--- /dev/null
+++ b/lua/custom/plugins/comment.lua
@@ -0,0 +1,4 @@
+return {
+    "terrortylor/nvim-comment",
+    config = function() require("nvim_comment").setup() end
+}
diff --git a/lua/custom/plugins/helm.lua b/lua/custom/plugins/helm.lua
new file mode 100644
index 00000000..4536a509
--- /dev/null
+++ b/lua/custom/plugins/helm.lua
@@ -0,0 +1,30 @@
+return {
+    'towolf/vim-helm',
+    config = function()
+	local function detach_yamlls()
+		local clients = vim.lsp.get_active_clients()
+		for client_id, client in pairs(clients) do
+			if client.name == "yamlls" then
+				vim.lsp.buf_detach_client(0, client_id)
+			end
+		end
+	end
+
+	local gotmpl_group = vim.api.nvim_create_augroup("_gotmpl", { clear = true })
+	vim.api.nvim_create_autocmd("FileType", {
+		group = gotmpl_group,
+		pattern = "yaml",
+		callback = function()
+			vim.schedule(function()
+				local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false)
+				for _, line in ipairs(lines) do
+					if string.match(line, "{{.+}}") then
+						vim.defer_fn(detach_yamlls, 500)
+						return
+					end
+				end
+			end)
+		end,
+	})
+	end
+}
diff --git a/lua/custom/plugins/vim-terraform.lua b/lua/custom/plugins/vim-terraform.lua
new file mode 100644
index 00000000..f0157e47
--- /dev/null
+++ b/lua/custom/plugins/vim-terraform.lua
@@ -0,0 +1,3 @@
+return {
+    "hashivim/vim-terraform"
+}