diff --git a/nixos/neovim.nix b/nixos/neovim.nix
index 810d537..3efcd29 100644
--- a/nixos/neovim.nix
+++ b/nixos/neovim.nix
@@ -5,12 +5,36 @@
     enable = true;
     defaultEditor = true;
     configure = {
-      # colorscheme blue
-      # colorscheme desert
       customRC = ''
-        colorscheme peachpuff
-	set listchars=tab:→\ ,space:·,nbsp:␣,trail:•,eol:¶,precedes:«,extends:»
+        set title
+        set bg=light
+        set go=a
+        set mouse=a
+        set nohlsearch
+
+        colorscheme gruvbox
+
+        set listchars=tab:→\ ,space:·,nbsp:␣,trail:•,eol:¶,precedes:«,extends:»
+        set clipboard+=unnamedplus
+
+        " Replace-all is aliased to S.
+        nnoremap S :%s//g<Left><Left>
       '';
+      # vimPlugins inspired from Alexnortung
+      # https://discourse.nixos.org/t/neovim-no-longer-uses-config-or-plugins/13399/4
+      packages.nix = with pkgs.vimPlugins; {
+        start = [
+          vim-surround # Shortcuts for setting () {} etc.
+          # coc-nvim coc-git coc-highlight coc-python coc-rls coc-vetur coc-vimtex coc-yaml coc-html coc-json # auto completion
+          vim-nix # nix highlight
+          vimtex # latex stuff
+          fzf-vim # fuzzy finder through vim
+          nerdtree # file structure inside nvim
+          rainbow # Color parenthesis
+          gruvbox-nvim # theme
+        ];
+        opt = [];
+      };
     };
   };
 }
diff --git a/nixos/tmux.nix b/nixos/tmux.nix
index b9f0c62..ce1c107 100644
--- a/nixos/tmux.nix
+++ b/nixos/tmux.nix
@@ -4,19 +4,20 @@
   programs.tmux = {
     enable = true;
     clock24 = true;
+    escapeTime = 20;
     extraConfig = ''
-      # remap prefix from ^+A to ^+B (for nested tmux sessions)
+      # remap prefix from ^+B to alt-f
       unbind C-b
       set -g prefix M-f
       bind M-f send-prefix
 
       # nvim 'checkhealth' advice
       set-option -g focus-events on
-      set-option -g default-terminal "screen-256color"
       set-option -sa terminal-overrides ',xterm-256color:RGB'
+      set-option -g default-terminal "screen-256color"
 
       # enable mouse support for switching panes/windows
-      # set -g mouse on
+      set -g mouse on
 
       # extend history
       set -g history-limit 100000