diff --git a/nvim/init.lua b/nvim/init.lua
index fa0c578..bd02ef8 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,3 +1,7 @@
+local function is_ssh()
+   return vim.env.SSH_TTY ~= nil or vim.env.SSH_CONNECTION ~= nil
+end
+
 vim.loader.enable()
 
 vim.scriptencoding = "utf-8"
@@ -264,3 +268,17 @@ vim.api.nvim_set_hl(0, "WinSeparator", { fg = "#FFFFFF", bg = "#1e1e2e" })
 vim.api.nvim_set_hl(0, "StatusLine", { bg = "#87afff", fg = "#000000", bold = true })
 vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "#87afff", fg = "#000000" })
 vim.opt.fillchars:append({ vert = "│" })
+
+if is_ssh() then
+   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('*'),
+     },
+   }
+end
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 2074e0a..eec2942 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,3 +1,4 @@
+if-shell '[ -n "#{env:TMUX_SHELL}" ]' 'set-option -g default-shell "#{env:TMUX_SHELL}"'
 set-option -g default-terminal screen-256color
 set-option -ga terminal-overrides ",xterm-256color:Tc"