diff --git a/init.lua b/init.lua
index 60883db..4942b55 100644
--- a/init.lua
+++ b/init.lua
@@ -87,7 +87,9 @@ require("lazy").setup({
 	"nvimtools/none-ls.nvim",
 	{
 		"sphamba/smear-cursor.nvim",
-		opts = {},
+		opts = {
+			smear_to_cmd = false
+		},
 	},
 	{
 		"karb94/neoscroll.nvim",
@@ -223,11 +225,11 @@ require("lazy").setup({
 		"rcarriga/nvim-dap-ui",
 		dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }
 	},
-	{
-		'mrcjkb/rustaceanvim',
-		version = '^4',
-		lazy = false,
-	},
+	-- {
+	-- 	'mrcjkb/rustaceanvim',
+	-- 	version = '^4',
+	-- 	lazy = false,
+	-- },
 	{
 		"folke/trouble.nvim",
 		dependencies = { "nvim-tree/nvim-web-devicons" },
@@ -414,6 +416,24 @@ require('lspconfig').ruff.setup {
 	}
 }
 require 'lspconfig'.gdscript.setup {}
+require 'lspconfig'.rust_analyzer.setup({
+	settings = {
+		['rust-analyzer'] = {
+			cargo = {
+				target = "xtensa-esp32-none-elf",
+				extraEnv = {
+					RUSTUP_TOOLCHAIN = "esp",
+				}
+			},
+			check = {
+				allTargets = false,
+				extraEnv = {
+					RUSTUP_TOOLCHAIN = "esp"
+				}
+			}
+		}
+	}
+})
 
 -------------------------------------------------------------------------------
 -- Debugging
diff --git a/tmux.conf b/tmux.conf
index 0d2960e..beb2d54 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,24 +1,28 @@
-# set-environment -g PATH "/usr/local/bin:/bin:/usr/bin"
-
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'Morantron/tmux-fingers'
+set -g @plugin 'tmux-plugins/tmux-yank'
+
 
 set-window-option -g mode-keys vi
-bind-key -T copy-mode-vi 'v' send -X begin-selection
-bind-key -T copy-mode-vi 'y' send -X copy-selection
 bind h select-pane -L
 bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
 
+bind C-k clear-history
+
 setw -g mouse on
 set -s set-clipboard on
 set -sg escape-time 5
-unbind -T copy-mode-vi MouseDragEnd1Pane
+set -g @yank_action 'copy-pipe'
+set -g @yank_with_mouse off
 set-option -sa terminal-features ',xterm-256color:RGB'
 
+unbind [
+bind-key -n M-c copy-mode
+
 set -g @catppuccin_flavor "mocha"
 set -g @catppuccin_window_status_style "rounded"
 set -g status-right-length 100