diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 4c68b4f2..8ccc274c 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 4c68b4f2ae2ca0ff178fceeda0ea0dc340c218a3
+Subproject commit 8ccc274c81bebcf777359bdfba27e25ea760494b
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 53a35fa9..f8690686 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -4,6 +4,8 @@ unbind C-g
 set -g prefix C-o
 bind-key C-o send-prefix
 
+set -gw mode-keys emacs
+
 set-option -g status on
 bind-key @ command-prompt -p "create pane from:"  "join-pane -s ':%%'"
 bind-key ^ command-prompt -p "swap window:,with window:" "swap-window -s %1 -t %2"
@@ -21,4 +23,6 @@ bind-key + resize-pane -D 3
 bind-key / resize-pane -L 3
 bind-key - resize-pane -U 3
 bind-key * resize-pane -R 3
+
+bind-key -t emacs-copy M-w copy-pipe "zsh -c 'clipboard'"
 source ~/.tmux.powerline
\ No newline at end of file