diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index b70004d..2884cea 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,22 +1,24 @@
 {
   "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
   "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
-  "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" },
-  "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
+  "catppuccin": { "branch": "main", "commit": "a0c769bc7cd04bbbf258b3d5f01e2bdce744108d" },
+  "conform.nvim": { "branch": "master", "commit": "b529dd4897c85c3188cc787084089a9d55843093" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "gitsigns.nvim": { "branch": "main", "commit": "731b581428ec6c1ccb451b95190ebbc6d7006db7" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" },
   "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "bef29b653ba71d442816bf56286c2a686210be04" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "c2682b0d9732bf52cbc34862056f143e71dc4a6d" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
   "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
-  "mini.nvim": { "branch": "main", "commit": "35e1767f4cd7dde51256eabae7349a5283a43cba" },
+  "mini.nvim": { "branch": "main", "commit": "5a10dfb3ab49b3ee2425bc2c215b5067ccce1c79" },
   "neo-tree.nvim": { "branch": "main", "commit": "7bc06b5efc5554d10f73a8aa508e02c03a83c2a0" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" },
+  "nvim-autopairs": { "branch": "master", "commit": "2647cce4cb64fb35c212146663384e05ae126bdf" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" },
   "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
+  "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
diff --git a/nvim/lua/config/lazy/32-tree.lua b/nvim/lua/config/lazy/32-tree.lua
index 6ca77da..13038ad 100644
--- a/nvim/lua/config/lazy/32-tree.lua
+++ b/nvim/lua/config/lazy/32-tree.lua
@@ -21,6 +21,9 @@ return {
 					".DS_Store",
 					"thumbs.db",
 				},
+				never_show_by_pattern = {
+					".terraform*",
+				},
 			},
 			use_libuv_file_watcher = true,
 			window = {
diff --git a/nvim/lua/config/lazy/80-mini.lua b/nvim/lua/config/lazy/80-mini.lua
index 662ccf3..7ed7cdc 100644
--- a/nvim/lua/config/lazy/80-mini.lua
+++ b/nvim/lua/config/lazy/80-mini.lua
@@ -13,14 +13,5 @@ return {
 		--   gc  - comment
 		--   gcc - comment current line
 		require("mini.comment").setup()
-
-		-- Autopairing of brackets and such
-		require("mini.pairs").setup()
-
-		-- Add/delete/replace surroundings (brackets, quotes, etc.)
-		-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
-		-- - sd'   - [S]urround [D]elete [']quotes
-		-- - sr)'  - [S]urround [R]eplace [)] [']
-		require("mini.surround").setup()
 	end,
 }
diff --git a/nvim/lua/config/lazy/81-surround.lua b/nvim/lua/config/lazy/81-surround.lua
new file mode 100644
index 0000000..581f06f
--- /dev/null
+++ b/nvim/lua/config/lazy/81-surround.lua
@@ -0,0 +1,5 @@
+return {
+	"kylechui/nvim-surround",
+	event = "VeryLazy",
+	config = true,
+}
diff --git a/nvim/lua/config/lazy/82-autopairs.lua b/nvim/lua/config/lazy/82-autopairs.lua
new file mode 100644
index 0000000..6378d47
--- /dev/null
+++ b/nvim/lua/config/lazy/82-autopairs.lua
@@ -0,0 +1,5 @@
+return {
+	"windwp/nvim-autopairs",
+	event = "InsertEnter",
+	config = true,
+}
diff --git a/nvim/lua/config/settings.lua b/nvim/lua/config/settings.lua
index f0b7480..073bcef 100644
--- a/nvim/lua/config/settings.lua
+++ b/nvim/lua/config/settings.lua
@@ -11,6 +11,7 @@ vim.schedule(function()
 	vim.opt.clipboard = "unnamedplus"
 end)
 
+vim.opt.timeoutlen = 1000
 vim.opt.breakindent = true
 vim.opt.undofile = true
 vim.opt.ignorecase = true
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index c107274..10614ef 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -23,7 +23,6 @@ set -g @catppuccin_window_current_text " #W"
 set -g @catppuccin_window_flags "icon"
 set -g status-left-length 100
 set -g status-left "#{E:@catppuccin_status_session}"
-set -g status-justify centre
 set -g status-right-length 100
 set -g status-right "#{E:@catppuccin_status_application}"
 set -agF status-right "#{E:@catppuccin_status_cpu}"
diff --git a/zsh/zshrc b/zsh/zshrc
index 2239e72..8cac9a0 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -99,6 +99,9 @@ export GOPATH=~/src/golang
 export GOBIN=$GOPATH/bin
 export PATH=~/bin:$GOBIN:$PATH
 export XDG_CONFIG_HOME=$HOME/.config
+export TALOSCONFIG=$XDG_CONFIG_HOME/talos/config.yaml
+export KUBECONFIG=$XDG_CONFIG_HOME/kube/k8s-dev.yaml
+
 if [[ -d "/opt/homebrew/share/google-cloud-sdk/bin" ]]; then
     export PATH=/opt/homebrew/share/google-cloud-sdk/bin:$PATH
 fi