diff --git a/modules/cli/nvim/lua/plugins/cmp.lua b/modules/cli/nvim/lua/plugins/cmp.lua
index c3a7135..7728629 100644
--- a/modules/cli/nvim/lua/plugins/cmp.lua
+++ b/modules/cli/nvim/lua/plugins/cmp.lua
@@ -12,6 +12,9 @@ return {
 		opts = function()
 			local cmp = require("cmp")
 			return {
+				completion = {
+					autocomplete = false
+				},
 				snippet = {
 					expand = function(args)
 						vim.snippet.expand(args.body)
diff --git a/modules/cli/nvim/lua/plugins/tree.lua b/modules/cli/nvim/lua/plugins/tree.lua
index 9080454..0d2451e 100644
--- a/modules/cli/nvim/lua/plugins/tree.lua
+++ b/modules/cli/nvim/lua/plugins/tree.lua
@@ -20,10 +20,6 @@ return {
 			},
 			keymaps = {
 				["<BS>"] = "actions.parent",
-
-				-- Disable default mappings that conflict with harpoon.
-				["<C-h>"] = false,
-				["<C-t>"] = false,
 			},
 		},
 	},
diff --git a/modules/cli/nvim/lua/plugins/treesiter.lua b/modules/cli/nvim/lua/plugins/treesiter.lua
index b4485a2..1cdb007 100644
--- a/modules/cli/nvim/lua/plugins/treesiter.lua
+++ b/modules/cli/nvim/lua/plugins/treesiter.lua
@@ -33,6 +33,10 @@ return {
 			matchup = { enable = true },
 		},
 		main = "nvim-treesitter.configs",
+		init = function()
+			vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+			vim.opt.foldtext = "v:lua.vim.treesitter.foldtext()"
+		end
 	},
 
 	{
diff --git a/modules/cli/nvim/lua/settings.lua b/modules/cli/nvim/lua/settings.lua
index 3e5ed07..b5612a9 100644
--- a/modules/cli/nvim/lua/settings.lua
+++ b/modules/cli/nvim/lua/settings.lua
@@ -51,6 +51,11 @@ local options = {
 
 	completeopt = { "menuone", "popup", "noinsert", "fuzzy" },
 	pumheight = 15,
+
+	foldcolumn = "1",
+	foldlevel = 99,
+	foldlevelstart = 99,
+	foldenable = true,
 }
 
 vim.g.loaded_python3_provider = 0