X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/ba63cd0158e197430b326c7ecac884b285bab1c0..dd4c892b92f1dd0d11e35b5e0861ea5901de16f3:/base/.xinitrc?ds=sidebyside

diff --git a/base/.xinitrc b/base/.xinitrc
index cd5b9cc..30db18b 100644
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -1,37 +1,27 @@
-#!/bin/sh
-
-sysmodmap=/usr/local/etc/X11/xinit/.Xmodmap
-sysresources=/usr/local/etc/X11/xinit/.Xresources
-usermodmap="$HOME/.Xmodmap"
-userresources="$HOME/.Xresources"
-
-if [ -f $sysresources ]; then
-	xrdb -merge $sysresources
-fi
-if [ -f $sysmodmap ]; then
-	xmodmap $sysmodmap
-fi
-if [ -f "$userresources" ]; then
-	xrdb -merge "$userresources"
-fi
-if [ -f "$usermodmap" ]; then
-	xmodmap "$usermodmap"
-fi
-
-# redshift, root image
-redon &
-"$HOME/.fehbg"
+#!/bin/zsh
+# using zsh to load .zshenv (eg. for PATH) but file is sh-compatible
 
 # Xorg settings
+# TODO: create shim for cpp
+xrdb -merge ~/.Xresources
+xmodmap ~/.Xmodmap
 xset r rate 290 26 &
 xset m 1/1 0 &
 xset s off
 xset dpms 0 0 600
+find -L "${XDG_DATA_HOME:-~/share}/fonts" -mindepth 1 -maxdepth 2 -type d | while read -r x; do
+	[ -f "$x/fonts.dir" ] && xset +fp $x
+done
+xset fp rehash
+
+# redshift, root image
+redon &
+wall &
 
 # root terminal
 urxvt -name TermBg1 -override-redirect -geometry x5+0--1 \
       -e tail -F /var/log/messages &
-xdotool search --limit 1 --sync --classname TermBg1 windowsize -usehints 100% 6
+xdotool search --limit 1 --sync --classname TermBg1 windowsize --usehints 100% 6
 
 # tray icons
 #"$HOME/src/phwmon/phwmon.py" --mem --mem_percent --net --io --bg \#0000 &
@@ -39,23 +29,25 @@ volumeicon &
 
 # daemons
 dunst &
-mpc-notify &
-xautolock -time 10 -locker "$HOME/bin/l" &
+mpc-notify -d &
+xautolock -time 10 -locker "$HOME/bin/lck" &
 xbanish &
-eval `ssh-agent`
 
-if [ -x /usr/local/bin/urxvtd ]; then
+if [ -z "$TERMINAL" -a \( -x $(which -a urxvtd | head -1) \) ]; then
 	for i in 1 2; do
 		# try to start client twice, once before checking for daemon
 		# and another after trying to start it
-		urxvtc -e exit
+		urxvtc -e exit >/dev/null 2>&1
 		if [ $? -eq 2 ]; then
 			# daemon not started, attempt to start once
 			if [ $i -eq 1 ]; then
 				urxvtd -q -o -f
+			else
+				TERMINAL=urxvt
+				export TERMINAL
 			fi
 		else
-			TERMINAL=/usr/local/bin/urxvtc
+			TERMINAL=urxvtc
 			export TERMINAL
 			break
 		fi
@@ -63,30 +55,20 @@ if [ -x /usr/local/bin/urxvtd ]; then
 	unset i
 fi
 
-# try to wait for session to start
+# taskbar
+# sleep to wait for session to start fully
 (sleep 0.1 && tint2) &
-#x220t
-(sleep 0.1 && [ -x "$HOME/bin/acpi_ac" ] && \
-	"$HOME/bin/acpi_ac" "0x0`sysctl -n hw.acpi.acline`") &
-(sleep 1.5 && [ -x /usr/local/bin/conky ] && conky -c "$HOME/.conkyrc.d/dock") &
 
-# load any global scripts
-if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
-	for f in /usr/local/etc/X11/xinit/xinitrc.d/?*.sh; do
-		[ -x "$f" ] && . "$f"
-	done
-	unset f
-fi
+# x220t
+# TODO: check hostname to load auxillary things
+# TODO: reformat for linux
+#(sleep 0.1 "$HOME/bin/acpi_ac" "0x0`sysctl -n hw.acpi.acline`") &
 
 # start session
-if [ ! -n "$1" ]; then
+if [ -z "$1" ]; then
 	session=i3
 else
 	session=$1
 	shift
 fi
 exec $session "$@"
-
-# cleanup
-#TODO: trap this
-ssh-agent -k