From 23add7e27637beca0608618d4718607ac414a7d4 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 11 Apr 2019 21:40:51 -0700
Subject: [PATCH] Preserve DPI settings when updating conky

---
 .linux_items/include_x/airootfs/etc/skel/.update_x | 11 +++++++----
 .linux_items/include_x/airootfs/etc/skel/.zlogin   |  3 ---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.linux_items/include_x/airootfs/etc/skel/.update_x b/.linux_items/include_x/airootfs/etc/skel/.update_x
index 650d3162..c1f67cf4 100755
--- a/.linux_items/include_x/airootfs/etc/skel/.update_x
+++ b/.linux_items/include_x/airootfs/etc/skel/.update_x
@@ -32,10 +32,10 @@ offset_urxvt="24"
 # Update settings if necessary
 if [[ "${dpi}" -ge 192 ]]; then
   # Conky
-  sed -i 's/minimum_size 180 0/minimum_size 360 0/' "${HOME}/.conkyrc"
-  sed -i 's/maximum_width 180/maximum_width 360/' "${HOME}/.conkyrc"
-  sed -i 's/gap_x 20/gap_x 40/' "${HOME}/.conkyrc"
-  sed -i 's/gap_y 24/gap_y 48/' "${HOME}/.conkyrc"
+  sed -i 's/minimum_size 180 0/minimum_size 360 0/' "${HOME}/.conkyrc_base"
+  sed -i 's/maximum_width 180/maximum_width 360/' "${HOME}/.conkyrc_base"
+  sed -i 's/gap_x 20/gap_x 40/' "${HOME}/.conkyrc_base"
+  sed -i 's/gap_y 24/gap_y 48/' "${HOME}/.conkyrc_base"
 
   # Fonts
   sed -i 's/!Xft.dpi: 192/Xft.dpi: 192/' "${HOME}/.Xresources"
@@ -67,6 +67,9 @@ fi
 urxvt_geometry="${width_urxvt}x${height_urxvt}+${offset_urxvt}+${offset_urxvt}"
 sed -i -r "s/${REGEX_URXVT}/\1${urxvt_geometry}/" "${HOME}/.Xresources"
 
+# Update conky
+$HOME/.update_conky
+
 # Update X
 xset s off
 xset -dpms
diff --git a/.linux_items/include_x/airootfs/etc/skel/.zlogin b/.linux_items/include_x/airootfs/etc/skel/.zlogin
index 04b1316e..8901bb31 100644
--- a/.linux_items/include_x/airootfs/etc/skel/.zlogin
+++ b/.linux_items/include_x/airootfs/etc/skel/.zlogin
@@ -9,9 +9,6 @@ if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
         sed -i -r 's/openbox-session/i3/' ~/.xinitrc
     fi
 
-    # Update Conky
-    $HOME/.update_conky
-
     # Start X or HW-diags
     if ! fgrep -q "nox" /proc/cmdline; then
         # Kill Xorg after 30 seconds if it doesn't fully initialize