diff --git a/.config/nvim b/.config/nvim
index 925358fb..3974ed33 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 925358fb63f6f652b966df6b20c8d56e6140d3b8
+Subproject commit 3974ed3386fc2ff51caacf9e8b7318bb6f77a79e
diff --git a/.tmux.conf b/.tmux.conf
index 4b364289..b7e2200b 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -5,5 +5,11 @@ set-option -g allow-rename off
 
 bind r source-file ~/.tmux.conf
 
+set-option escape-time 0
+
 bind-key -T copy-mode-vi 'v' send -X begin-selection
 bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
+bind-key -T copy-mode-vi Escape send -X cancel
+
+bind-key -n C-p run "xclip -o | tmux load-buffer -"
+bind-key -n C-y run "tmux show-buffer | xclip -i -sel p -f | xclip -i -sel c"