diff --git a/nvim/init.vim b/nvim/init.vim
index 91c5b9e..3d57d06 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -244,7 +244,33 @@ nmap <Leader>t :call TextWrapToggle()<CR>
 "Copying
 if !exists('g:vscode')
 lua << EOF
-    vim.g.clipboard = 'osc52'
+vim.g.clipboard = {
+  name = 'OSC 52',
+  copy = {
+    ['+'] = require('vim.ui.clipboard.osc52').copy('+'),
+    ['*'] = require('vim.ui.clipboard.osc52').copy('*'),
+  },
+  paste = {
+    ['+'] = require('vim.ui.clipboard.osc52').paste('+'),
+    ['*'] = require('vim.ui.clipboard.osc52').paste('*'),
+  },
+}
+if vim.env.TMUX ~= nil then
+  local copy = {'tmux', 'load-buffer', '-w', '-'}
+  local paste = {'bash', '-c', 'tmux refresh-client -l && sleep 0.05 && tmux save-buffer -'}
+  vim.g.clipboard = {
+    name = 'tmux',
+    copy = {
+      ['+'] = copy,
+      ['*'] = copy,
+    },
+    paste = {
+      ['+'] = paste,
+      ['*'] = paste,
+    },
+    cache_enabled = 0,
+  }
+end
 EOF
 endif
 set clipboard=unnamedplus,unnamed " Copy/Paste
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 7eb0b62..13c5c00 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -74,7 +74,8 @@ bind-key C-o send-keys C-o
 # move tmux copy buffer into x clipboard
 # Vi copypaste mode
 set-window-option -g mode-keys vi
-set-option -s set-clipboard on
+set -g allow-passthrough on
+set-option -g set-clipboard on
 set -g @yank_with_mouse off
 set -g @yank_action 'copy-pipe'
 bind-key -Tcopy-mode-vi 'C-right' send -X next-word