diff -Nru regolith-gnome-flashback-1.37/debian/changelog regolith-gnome-flashback-1.38/debian/changelog --- regolith-gnome-flashback-1.37/debian/changelog 2019-08-16 15:59:48.000000000 +0000 +++ regolith-gnome-flashback-1.38/debian/changelog 2019-08-18 16:09:38.000000000 +0000 @@ -1,3 +1,9 @@ +regolith-gnome-flashback (1.38-1ubuntu1ppa1) disco; urgency=medium + + * Load ~/.Xresources if exists. + + -- Ken Gilmer Sun, 18 Aug 2019 09:09:38 -0700 + regolith-gnome-flashback (1.37-1ubuntu1ppa1) disco; urgency=medium * Script cleanup diff -Nru regolith-gnome-flashback-1.37/i3-gnome-flashback regolith-gnome-flashback-1.38/i3-gnome-flashback --- regolith-gnome-flashback-1.37/i3-gnome-flashback 2019-08-16 15:56:13.000000000 +0000 +++ regolith-gnome-flashback-1.38/i3-gnome-flashback 2019-08-18 16:09:19.000000000 +0000 @@ -8,6 +8,9 @@ # File Locations - System Defaults DEFAULT_XRESOURCE_FILE="/etc/regolith/styles/root" DEFAULT_I3_CONFIG_FILE="/etc/regolith/i3/config" + +# File Locations - Baseline +BASELINE_XRESOURCE_FILE="$HOME/.Xresources" BASELINE_I3_CONFIG_FILE="/etc/i3/config" # Register with gnome-session so that it does not kill the whole session thinking it is dead. @@ -16,6 +19,9 @@ fi # Load Xresources +if [ -f "$BASELINE_XRESOURCE_FILE"]; then + xrdb -merge $BASELINE_XRESOURCE_FILE +fi if [ -f "$USER_XRESOURCE_FILE" ]; then xrdb -merge $USER_XRESOURCE_FILE else