Not using it currently

4 files changed, 3 insertions, 32 deletions

diff --git a/tmate.conf b/tmate.conf
deleted file mode 100644
index 61ea16c..0000000
--- a/tmate.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# tmate uses default C=b (whilst my tmux uses C-a)
-#
-#  ln -s ~/.vim/tmate.conf ~/.tmate.conf
-#
-# 1. detach your existing tmux session
-# 2. start tmate
-# 3. inside tmate: TMUX='' tmux attach
-
-# invisible
-set -g status off
-
-# avoid delay and ESC behaving weird
-set -s escape-time 0
-
-# for vim themes
-set -g default-terminal "tmux-256color"
-
-# For vim plugins relaying on focus events
-set -g focus-events on
diff --git a/tmate.md b/tmate.md
deleted file mode 100644
index 7270a59..0000000
--- a/tmate.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Use tmate (and tmate.io) for pair programming
-
-    ln -s ~/.vim/tmate.conf ~/.tmate.conf
-
-1. detach your existing tmux session
-2. start tmate
-3. inside tmate: `TMUX='' tmux attach`
-
-My conf uses C-b for tmate (because I use C-a for tmux!).
-
diff --git a/wezterm.lua b/wezterm.lua
index 6b4b99d..9db2ab2 100644
--- a/wezterm.lua
+++ b/wezterm.lua
@@ -8,7 +8,7 @@
 --
 -- or Adwaita or whatever is the theme you use.
 --
--- Reload with: xrdb ~/.Xresources
+-- Reload with: xrdb -merge ~/.Xresources
 --
 local wezterm = require 'wezterm';
 return {
diff --git a/xterm.md b/xterm.md
index f28fb68..723aac0 100644
--- a/xterm.md
+++ b/xterm.md
@@ -2,7 +2,7 @@ Copy (or merge) `xresources` to `~/.Xresources`.
 
 Then load the config:
 
-     xrdb .Xresources
+     xrdb -merge .Xresources
 
-And that should give you a usable xterm.
+And that should give you an usable xterm.