diff --git a/.bashrc b/.bashrc
index 1985b42..31ccb19 100644
--- a/.bashrc
+++ b/.bashrc
@@ -4,11 +4,6 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]
-then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=''
-        exec fish $LOGIN_OPTION
-fi
 
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 8081414..471d17d 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -8,9 +8,21 @@ vim.o.smartindent = true -- Automatically indent new lines
 vim.o.wrap = false -- Disable line wrapping
 vim.o.cursorline = true -- Highlight the current line
 vim.o.termguicolors = true -- Enable 24-bit RGB colors
-vim.o.clipboard = "unnamedplus"
 vim.filetype.add({extension = {svx = "markdown"}})
 
+local kitten = vim.fn.expand("~/.local/share/kitty-ssh-kitten/kitty/bin/kitten")
+vim.opt.clipboard = "unnamedplus"
+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('*'),
+  },
+}
 -- Syntax highlighting and filetype plugins
 vim.cmd('syntax enable')
 vim.cmd('filetype plugin indent on')
diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..5cdb71c
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,8 @@
+#set-option -g remain-on-exit on
+set-option -g default-shell /bin/zsh
+set -g history-limit 30000
+# Allow Tmux to pass through OSC 52 escape sequences
+set -g allow-passthrough on
+
+set -g mouse on
+set -g set-clipboard on