diff --git a/users/tacocat/programs/tmux.nix b/users/tacocat/programs/tmux.nix
index d5ebebd..0a3f957 100644
--- a/users/tacocat/programs/tmux.nix
+++ b/users/tacocat/programs/tmux.nix
@@ -10,6 +10,8 @@
     terminal = "tmux-256color";
     extraConfig = ''
       set -g focus-events on
+      set -g allow-passthrough on
+      set -g set-clipboard on
     '';
   };
 }
diff --git a/users/tacocat/programs/vim.nix b/users/tacocat/programs/vim.nix
index 51441cb..2a28f4d 100644
--- a/users/tacocat/programs/vim.nix
+++ b/users/tacocat/programs/vim.nix
@@ -30,6 +30,11 @@
       set signcolumn=yes
       colorscheme gruvbox
       set updatetime=100
+      set cursorline
+      set autoindent
+      set belloff=all
+      nnoremap <C-@> :call system("wl-copy", @")<CR>
+      nnoremap <C-q> :nohlsearch<CR>
     '';
   };