From 2ee034eb2b93ca5a6cb788e2882da3fec7aa9b7d Mon Sep 17 00:00:00 2001
From: katherine <ageha@airen-no-jikken.icu>
Date: Sat, 2 Dec 2023 21:17:34 -0700
Subject: run all xorg setup stuff from hlfwm

test-ran a wayland compositor and it borked some kind of settings
something, but shift everything this way seems to function and is
probably anyways cleaner
---
 .config/herbstluftwm/autostart | 66 ++++++++++++++++++++++++++++++++++++++++++
 .xinitrc                       | 56 -----------------------------------
 .zprofile                      |  5 +++-
 3 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 049e084..75ecf9b 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -1,7 +1,70 @@
 #!/usr/bin/env zsh
 
+###########
+# X setup #
+###########
+
 source ~/.config/init/vars
 
+#merge Xresources
+if [ -s "$HOME/.Xresources" ]
+then
+	xrdb -override "$HOME/.Xresources"
+fi
+
+if [ -s $tmpdir/x-theme ]
+then
+	xrdb -override $tmpdir/x-theme
+fi
+
+#theme
+export QT_STYLE_OVERRIDE=adwaita-dark
+export GTK_THEME=Adwaita:dark
+
+#input!
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export SDL_IM_MODULE=fcitx
+export XMODIFIERS="@im=fcitx"
+fcitx5 &
+
+#keyrate
+xset r rate $kbdelay $kbrate
+
+#store sxiv cache in ram
+export XDG_CACHE_HOME="$HOME/.cache"
+mkdir -p "$HOME/.cache"
+if [ -d $tmpdir ]; then
+    mkdir -p $tmpdir/sxiv
+    cd "$HOME/.cache/"
+    ln -sf $tmpdir/sxiv .
+    cd
+fi
+
+#load more fonts
+xset +fp /usr/share/fonts/local
+xset +fp /usr/share/fonts/misc
+xset +fp "$HOME/.fonts"
+xset fp rehash
+
+#disable power saving, so screen doesn't power off
+xset -dpms
+xset s off
+
+#daemons
+picom -b --backend glx --vsync --glx-no-stencil --glx-no-rebind-pixmap
+
+xsetroot -cursor_name left_ptr
+nitrogen --restore
+xbanish &
+
+redshift -b 0.8:0.6 -t 5400K:4400K &
+
+
+###############
+# HSWM BASICS #
+###############
+
 # always start frames max (pt. 1)
 hc set default_frame_layout 2
 hc set_layout max
@@ -10,6 +73,7 @@ hc set tree_style '╾│ ├└╼─┐'
 
 hc emit_hook reload
 
+
 ###########
 #  THEME  #
 ###########
@@ -34,6 +98,7 @@ hc set frame_padding 0
 hc set smart_frame_surroundings 1
 hc set smart_window_surroundings 1
 
+
 #################
 #  KEYBINDINGS  #
 #################
@@ -215,6 +280,7 @@ fi
 # unlock, just to be sure
 hc unlock
 
+
 ##############
 #  CHILDREN  #
 ##############
diff --git a/.xinitrc b/.xinitrc
index 1d837a8..8be3f8f 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,58 +1,2 @@
-#pull inna vars
 source "$HOME/.config/init/vars"
-
-#merge Xresources
-if [ -s "$HOME/.Xresources" ]
-then
-	xrdb -override "$HOME/.Xresources"
-fi
-
-if [ -s $tmpdir/x-theme ]
-then
-	xrdb -override $tmpdir/x-theme
-fi
-
-#theme
-export QT_STYLE_OVERRIDE=adwaita-dark
-export GTK_THEME=Adwaita:dark
-
-#input!
-export GTK_IM_MODULE=fcitx
-export QT_IM_MODULE=fcitx
-export SDL_IM_MODULE=fcitx
-export XMODIFIERS="@im=fcitx"
-fcitx5 &
-
-#keyrate
-xset r rate $kbdelay $kbrate
-
-#store sxiv cache in ram
-export XDG_CACHE_HOME="$HOME/.cache"
-mkdir -p "$HOME/.cache"
-if [ -d $tmpdir ]; then
-    mkdir -p $tmpdir/sxiv
-    cd "$HOME/.cache/"
-    ln -sf $tmpdir/sxiv .
-    cd
-fi
-
-#load more fonts
-xset +fp /usr/share/fonts/local
-xset +fp /usr/share/fonts/misc
-xset +fp "$HOME/.fonts"
-xset fp rehash
-
-#disable power saving, so screen doesn't power off
-xset -dpms
-xset s off
-
-#daemons
-picom -b --backend glx --vsync --glx-no-stencil --glx-no-rebind-pixmap
-
-xsetroot -cursor_name left_ptr
-nitrogen --restore
-xbanish &
-
-redshift -b 0.8:0.6 -t 5400K:4400K &
-
 exec herbstluftwm
diff --git a/.zprofile b/.zprofile
index 2cbba29..64a72f3 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,6 +1,8 @@
 [[ -f /etc/profile ]] && \
 	emulate sh -c 'source /etc/profile'
 
+source "$HOME/.config/init/vars"
+
 ################# SET TERMCMD #################
 if [[ ! -z $(whence alacritty) ]] then
 	export TERMCMD=alacritty
@@ -17,7 +19,8 @@ elif [[ ! -z $(whence vi) ]] then
 	export EDITOR=vi
 fi
 
-[[ $USER -ne "root" ]] || return
+############### ROOT BAILS HERE ###############
+[[ $USER -ne "root" ]] && return
 
 ############# STORE VIMTAGS IN TMP ############
 [[ -d $tmpdir ]] && \
-- 
cgit v1.2.3