diff --git a/.tmux.conf b/.tmux.conf
index 90d37c0..1b3595c 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -124,6 +124,6 @@ bind r source-file ~/.tmux.conf
 set -g base-index 1
 
 # Configure tmux buffer to clipbard
-#setw -g mode-keys vi
-#bind-key -T copy-mode-vi v send-keys -X begin-selection
-#bind -T copy-mode-vi y send-keys -X copy-pipe 'xclip -in -selection clipboard'
+# Copy with y. paste with P
+bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -i -sel clip > /dev/null"
+bind-key P run "xclip -o -sel clip | tmux load-buffer - ; tmux paste-buffer"
diff --git a/Makefile b/Makefile
index bc777c6..298ba22 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DOT_FILES=$(filter-out $(IGNORE_DOT_FILES), $(wildcard .*))
 DOT_INSTALLED=$(foreach dot, $(DOT_FILES), $(HOME)/$(dot))
 ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-PKG_ARCH_BASE=aspell-en aspell-fr conky cscope ctags dunst eog firefox noto-fonts-emoji fzf git gmrun gnome-terminal genius gvim hunspell-fr hyphen-en hyphen-fr lightdm numlockx openssh polkit-gnome python3 sudo tint2 tmux unrar unzip udevil zsh
+PKG_ARCH_BASE=aspell-en aspell-fr conky cscope ctags dunst eog firefox noto-fonts-emoji fzf git gmrun gnome-terminal genius gvim hunspell-fr hyphen-en hyphen-fr lightdm numlockx openssh polkit-gnome python3 sudo tint2 tmux unrar unzip udevil zsh xclip
 PKG_ARCH_DEV=autopep8 bear cppcheck clang flake8 gcc hstr shellcheck strace
 
 ifeq ($(USER), root)