diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 5670a7d..140a53f 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -8,7 +8,6 @@ vim.o.smartindent = true   -- Automatically indent new lines
 vim.o.wrap = false         -- Disable line wrapping
 vim.o.cursorline = true    -- Highlight the current line
 vim.o.termguicolors = true -- Enable 24-bit RGB colors
-vim.o.clipboard = "unnamedplus"
 vim.filetype.add({ extension = { svx = "markdown" } })
 vim.opt.listchars = { tab = "\\│\\", nbsp = "␣", trail = "·", extends = "›", precedes = "‹", leadmultispace = "│ " }
 vim.opt.list = true
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
index 44724f7..8e70f66 100644
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -1,9 +1,18 @@
 {
   "plugins": {
+    "codecompanion.nvim": {
+      "rev": "5b87dd95a5b62bbf198ef147b96d22751ccc1faa",
+      "src": "https://www.github.com/olimorris/codecompanion.nvim",
+      "version": "19.0.0 - 20.0.0"
+    },
     "conform.nvim": {
       "rev": "40dcec5555f960b0a04340d76eabdf4efe78599d",
       "src": "https://github.com/stevearc/conform.nvim"
     },
+    "diffview.nvim": {
+      "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
+      "src": "https://github.com/sindrets/diffview.nvim"
+    },
     "mason-lspconfig.nvim": {
       "rev": "a324581a3c83fdacdb9804b79de1cbe00ce18550",
       "src": "https://github.com/mason-org/mason-lspconfig.nvim"
@@ -39,6 +48,10 @@
     "plenary.nvim": {
       "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
       "src": "https://github.com/nvim-lua/plenary.nvim"
+    },
+    "which-key.nvim": {
+      "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a",
+      "src": "https://github.com/folke/which-key.nvim"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.tmux.conf b/.tmux.conf
index 78ae9bb..5cdb71c 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,3 +1,8 @@
+#set-option -g remain-on-exit on
+set-option -g default-shell /bin/zsh
 set -g history-limit 30000
-set -g mouse on
+# Allow Tmux to pass through OSC 52 escape sequences
 set -g allow-passthrough on
+
+set -g mouse on
+set -g set-clipboard on