From 0f6d360a943b836c774876398f13e9ba9d38cacd Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 31 Jan 2023 06:23:40 +1300
Subject: Move URxvt resources back into main .Xresources

There isn't an existence conditional for Xresources files, so
realistically it makes the most sense to define the resources all in one
hit, even if URxvt isn't going to be used on this system.
---
 urxvt/Xresources.d/URxvt | 32 --------------------------
 x/Xresources             | 60 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 58 insertions(+), 34 deletions(-)
 delete mode 100644 urxvt/Xresources.d/URxvt

diff --git a/urxvt/Xresources.d/URxvt b/urxvt/Xresources.d/URxvt
deleted file mode 100644
index f4c30d54..00000000
--- a/urxvt/Xresources.d/URxvt
+++ /dev/null
@@ -1,32 +0,0 @@
-! URxvt
-URxvt.cursorBlink: on
-URxvt.cutchars: <>│
-URxvt.internalBorder: 0
-URxvt.iso14755: false
-URxvt.iso14755_52: false
-URxvt.perl-ext-common: select
-URxvt.pointerBlank: true
-URxvt.saveLines: 10000
-URxvt.scrollBar: false
-URxvt.scrollTTyKeypress: true
-URxvt.scrollTTyOutput: false
-URxvt.secondaryScroll: true
-URxvt.urgentOnBell: true
-URxvt.background: #030303
-URxvt.foreground: #E0E0E0
-URxvt.color0: #030303
-URxvt.color1: #CC0000
-URxvt.color2: #3EAA06
-URxvt.color3: #C4A000
-URxvt.color4: #3465A4
-URxvt.color5: #75507B
-URxvt.color6: #06989A
-URxvt.color7: #D3D7CF
-URxvt.color8: #303030
-URxvt.color9: #EF2929
-URxvt.color10: #7AF234
-URxvt.color11: #FCE94F
-URxvt.color12: #729FCF
-URxvt.color13: #AD7FA8
-URxvt.color14: #34E2E2
-URxvt.color15: #EEEEEC
diff --git a/x/Xresources b/x/Xresources
index 3f586a87..d89a2360 100644
--- a/x/Xresources
+++ b/x/Xresources
@@ -1,2 +1,58 @@
-#include ".Xresources.d/URxvt"
-#include ".Xresources.d/XTerm"
+! XTerm
+XTerm.termName: xterm-256color
+XTerm.vt100.bellIsUrgent: true
+XTerm.vt100.charClass: 0-32:0,33-59:1,60:2,61:1,62:2,63-65535:1
+XTerm.vt100.internalBorder: 0
+XTerm.vt100.eightBitInput: false
+XTerm.vt100.metaSendsEscape: true
+XTerm.vt100.background: #030303
+XTerm.vt100.foreground: #E0E0E0
+XTerm.vt100.color0: #030303
+XTerm.vt100.color1: #CC0000
+XTerm.vt100.color2: #3EAA06
+XTerm.vt100.color3: #C4A000
+XTerm.vt100.color4: #3465A4
+XTerm.vt100.color5: #75507B
+XTerm.vt100.color6: #06989A
+XTerm.vt100.color7: #D3D7CF
+XTerm.vt100.color8: #303030
+XTerm.vt100.color9: #EF2929
+XTerm.vt100.color10: #7AF234
+XTerm.vt100.color11: #FCE94F
+XTerm.vt100.color12: #729FCF
+XTerm.vt100.color13: #AD7FA8
+XTerm.vt100.color14: #34E2E2
+XTerm.vt100.color15: #EEEEEC
+
+! URxvt
+URxvt.cursorBlink: on
+URxvt.cutchars: <>│
+URxvt.internalBorder: 0
+URxvt.iso14755: false
+URxvt.iso14755_52: false
+URxvt.perl-ext-common: select
+URxvt.pointerBlank: true
+URxvt.saveLines: 10000
+URxvt.scrollBar: false
+URxvt.scrollTTyKeypress: true
+URxvt.scrollTTyOutput: false
+URxvt.secondaryScroll: true
+URxvt.urgentOnBell: true
+URxvt.background: #030303
+URxvt.foreground: #E0E0E0
+URxvt.color0: #030303
+URxvt.color1: #CC0000
+URxvt.color2: #3EAA06
+URxvt.color3: #C4A000
+URxvt.color4: #3465A4
+URxvt.color5: #75507B
+URxvt.color6: #06989A
+URxvt.color7: #D3D7CF
+URxvt.color8: #303030
+URxvt.color9: #EF2929
+URxvt.color10: #7AF234
+URxvt.color11: #FCE94F
+URxvt.color12: #729FCF
+URxvt.color13: #AD7FA8
+URxvt.color14: #34E2E2
+URxvt.color15: #EEEEEC
-- 
cgit v1.2.3


From d39bd1880c566f71171a275a82b851bff266949c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 31 Jan 2023 06:24:52 +1300
Subject: Bump VERSION

---
 VERSION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 2574151a..1febe27e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v12.25.0
-Mon, 30 Jan 2023 16:24:14 +0000
+tejr dotfiles v12.26.0
+Mon, 30 Jan 2023 17:24:51 +0000
-- 
cgit v1.2.3