X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/8de4107b0f14f5ea0e7817f96f0829fb8cea46ba..152474f63f971b4c543a896c11f2c6db5a4c2d41:/base/.xinitrc?ds=sidebyside diff --git a/base/.xinitrc b/base/.xinitrc old mode 100755 new mode 100644 index 12a9dc0..97c5c14 --- a/base/.xinitrc +++ b/base/.xinitrc @@ -1,9 +1,10 @@ -#!/bin/sh +#!/bin/zsh +# using zsh to load .zshenv (eg. for PATH) but file is sh-compatible sysmodmap=/usr/local/etc/X11/xinit/.Xmodmap sysresources=/usr/local/etc/X11/xinit/.Xresources -usermodmap="$HOME/.Xmodmap" -userresources="$HOME/.Xresources" +usermodmap=~/.Xmodmap +userresources=~/.Xresources if [ -f $sysresources ]; then xrdb -merge $sysresources @@ -28,10 +29,15 @@ xset m 1/1 0 & xset s off xset dpms 0 0 600 +find -L "${XDG_DATA_HOME:-~/share}/fonts" -type d -mindepth 1 -maxdepth 2 | while read -r x; do + [ -f "$x/fonts.dir" ] && xset +fp $x +done +xset fp rehash + # 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,22 +45,26 @@ volumeicon & # daemons dunst & -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 /usr/bin/urxvtd -o -x /usr/local/bin/urxvtd \) ]; 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 2>/dev/null 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 @@ -64,10 +74,10 @@ fi # try to wait for session to start (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") & +# 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`") & # load any global scripts if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then @@ -78,7 +88,7 @@ if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then fi # start session -if [ ! -n "$1" ]; then +if [ -z "$1" ]; then session=i3 else session=$1