diff --git a/users/tacocat/programs/tmux.nix b/users/tacocat/programs/tmux.nix
index 7a693ce..d5ebebd 100644
--- a/users/tacocat/programs/tmux.nix
+++ b/users/tacocat/programs/tmux.nix
@@ -8,8 +8,8 @@
     shell = "${pkgs.fish}/bin/fish";
     sensibleOnTop = true;
     terminal = "tmux-256color";
-    # extraConfig = ''
-    #   set -g default-terminal "screen-256color"
-    # '';
+    extraConfig = ''
+      set -g focus-events on
+    '';
   };
 }
diff --git a/users/tacocat/programs/vim.nix b/users/tacocat/programs/vim.nix
index 6f2dc1a..982a4bc 100644
--- a/users/tacocat/programs/vim.nix
+++ b/users/tacocat/programs/vim.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   programs.vim = {
     enable = true;
     settings = {
@@ -9,12 +9,23 @@
       history = 100;
       ignorecase = false;
       modeline = true;
-      mouse = "a";
       mousefocus = false;
       number = true;
       relativenumber = true;
       shiftwidth = 2;
       tabstop = 2;
     };
+    plugins = with pkgs.vimPlugins; [
+      onedark-vim
+      everforest
+      terminus
+      vim-fugitive
+      vim-gitgutter
+    ];
+    extraConfig = ''
+      set scrolloff=5
+      set hlsearch
+      colorscheme everforest
+    '';
   };
 }