From 5c169d04febb84a122cad9c82bae1aba7260bf60 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Fri, 21 Jan 2022 10:09:46 -0500
Subject: [PATCH] Merged separate Xresources files

---
 Xresources.zenburn => Xresources | 42 +++++++++++++++-
 Xresources.gruvbox               | 86 --------------------------------
 install.sh                       |  3 +-
 3 files changed, 41 insertions(+), 90 deletions(-)
 rename Xresources.zenburn => Xresources (73%)
 delete mode 100644 Xresources.gruvbox

diff --git a/Xresources.zenburn b/Xresources
similarity index 73%
rename from Xresources.zenburn
rename to Xresources
index 3647f22..9574923 100644
--- a/Xresources.zenburn
+++ b/Xresources
@@ -1,7 +1,7 @@
 ! -----------------------------------------------------------------------------
-! Based on: gruvbox-dark.xresources
-! Description: Retro groove colorscheme generalized
+! Based on: gruvbox-dark and zenburn 
 ! Source: https://github.com/morhetz/gruvbox-generalized
+!         https://github.com/jnurmine/Zenburn
 ! -----------------------------------------------------------------------------
 
 ! Laptop screen DPI
@@ -14,6 +14,44 @@ Xft.hinting: 1
 Xft.antialias: 1
 Xft.rgba: rgb
 
+!---------!
+! Gruvbox !
+! --------!
+
+! hard contrast: *background: #1d2021
+! medium contrast: *background: #282828
+! soft contrast: *background: #32302f
+! *background: #1d2021
+! *foreground: #ebdbb2
+! ! Black + DarkGrey
+! *color0:  #282828
+! *color8:  #928374
+! ! DarkRed + Red
+! *color1:  #cc241d
+! *color9:  #fb4934
+! ! DarkGreen + Green
+! *color2:  #98971a
+! *color10: #b8bb26
+! ! DarkYellow + Yellow
+! *color3:  #d79921
+! *color11: #fabd2f
+! ! DarkBlue + Blue
+! *color4:  #458588
+! *color12: #83a598
+! ! DarkMagenta + Magenta
+! *color5:  #b16286
+! *color13: #d3869b
+! ! DarkCyan + Cyan
+! *color6:  #689d6a
+! *color14: #8ec07c
+! ! LightGrey + White
+! *color7:  #a89984
+! *color15: #ebdbb2
+
+!---------!
+! Zenburn !
+!---------!
+
 *background: #3f3f3f
 *foreground: #dcdccc
 ! Black + DarkGrey
diff --git a/Xresources.gruvbox b/Xresources.gruvbox
deleted file mode 100644
index d752566..0000000
--- a/Xresources.gruvbox
+++ /dev/null
@@ -1,86 +0,0 @@
-! -----------------------------------------------------------------------------
-! Based on: gruvbox-dark.xresources
-! Description: Retro groove colorscheme generalized
-! Source: https://github.com/morhetz/gruvbox-generalized
-! -----------------------------------------------------------------------------
-
-! Laptop screen DPI
-Xft.dpi:   216
-
-Xft.autohint: 0
-Xft.lcdfilter:  lcddefault
-Xft.hintstyle:  hintfull
-Xft.hinting: 1
-Xft.antialias: 1
-Xft.rgba: rgb
-
-! hard contrast: *background: #1d2021
-! medium contrast: *background: #282828
-! soft contrast: *background: #32302f
-*background: #1d2021
-*foreground: #ebdbb2
-! Black + DarkGrey
-*color0:  #282828
-*color8:  #928374
-! DarkRed + Red
-*color1:  #cc241d
-*color9:  #fb4934
-! DarkGreen + Green
-*color2:  #98971a
-*color10: #b8bb26
-! DarkYellow + Yellow
-*color3:  #d79921
-*color11: #fabd2f
-! DarkBlue + Blue
-*color4:  #458588
-*color12: #83a598
-! DarkMagenta + Magenta
-*color5:  #b16286
-*color13: #d3869b
-! DarkCyan + Cyan
-*color6:  #689d6a
-*color14: #8ec07c
-! LightGrey + White
-*color7:  #a89984
-*color15: #ebdbb2
-
-!!! urxvt
-URxvt.perl-ext-common: default,matcher
-URxvt*buffered: true
-URxvt*saveLines: 5000
-URxvt*cursorBlink: true
-URxvt*borderless: 1
-URxvt*internalBorder: 20
-URxvt*scrollBar: false
-URxvt.url-launcher: /usr/bin/xdg-open
-URxvt.matcher.button: 1
-URxvt.clipboard.autocopy: true
-
-! do not scroll with output
-URxvt*scrollTtyOutput: false
-! scroll in relation to buffer (with mouse scroll or Shift+Page Up)
-URxvt*scrollWithBuffer: true
-! scroll back to the bottom on keypress
-URxvt*scrollTtyKeypress: true
-! disable scrollback buffer in secondary screen (allows scrolling pager when using 'less' etc)
-URxvt.secondaryScreen: 1
-URxvt.secondaryScroll: 0
-! Disable printing the terminal contents when pressing PrintScreen.
-URxvt.print-pipe: "cat > /dev/null"
-!! copy/paste
-! disable default ctrl-shift binding
-URxvt.iso14755: false
-URxvt.iso14755_52: false
-! disable default copy/paste bindings
-URxvt.keysym.Control-Meta-c: builtin-string:
-URxvt.keysym.Control-Meta-v: builtin-string:
-! new copy/paste bindings
-URxvt.keysym.Shift-Control-V: eval:paste_clipboard
-URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard
-!! font
-!URxvt.letterSpace: -1
-URxvt.font: xft:Hack:regular:size=12, \
-            xft:Font Awesome 5 Brands:Regular:size=10, \
-            xft:Font Awesome 5 Free:Solid:size=10, \
-            xft:Font Awesome 5 Free:Regular:size=10
-
diff --git a/install.sh b/install.sh
index aec875d..e368b12 100755
--- a/install.sh
+++ b/install.sh
@@ -48,8 +48,7 @@ ln -sf $dotfiles_dir/profile ~/.profile
 ln -sf $dotfiles_dir/emacs.d ~/.emacs.d
 ln -sf $dotfiles_dir/xinitrc ~/.xinitrc
 ln -sf $dotfiles_dir/vimrc ~/.vimrc
-#ln -sf $dotfiles_dir/Xresources.gruvbox ~/.Xresources
-ln -sf $dotfiles_dir/Xresources.zenburn ~/.Xresources
+ln -sf $dotfiles_dir/Xresources ~/.Xresources
 
 # Create $config_dir, sub-directories, and symlinks
 mkdir -p $config_dir/{bspwm,dunst,kitty,nvim,polybar,rofi,sxhkd}