Merge branch 'master' into build64-par/master

10 files changed, 54 insertions, 13 deletions

diff --git a/.config/X11/clientrc b/.config/X11/clientrc
index d18d714..9488ec8 100755
--- a/.config/X11/clientrc
+++ b/.config/X11/clientrc
@@ -19,7 +19,7 @@ fi
 
 #exec wmii
 wm=wmii
-systemctl --user start "${wm}@${DISPLAY}.service"
 mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}"
+trap "rm $(printf %q "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}")" EXIT
+systemctl --user start "${wm}@${DISPLAY}.service"
 cat "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" >/dev/null
-rm "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}"
diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh
index fe4f2c6..28b9923 100644
--- a/.config/bash/aliases.sh
+++ b/.config/bash/aliases.sh
@@ -6,10 +6,11 @@
 # Set up colors and settings for ls/dir/vdir                         #
 ######################################################################
 if [ -x "`which dircolors`" ]; then
-	eval "`dircolors -b`"
+	eval "$(dircolors -p | cat - "${XDG_CONFIG_HOME}/dir_colors" |
+		dircolors -b -)"
 	alias ls='ls -1v --color=auto'
 	alias dir='dir -v --color=auto'
-	alias vdir='vdir -v--color=auto'
+	alias vdir='vdir -v --color=auto'
 
 	for xgrep in ${PATH//:/\/*grep }/*grep; do
 		if [ -f "$xgrep" ]; then
diff --git a/.config/dir_colors b/.config/dir_colors
new file mode 100644
index 0000000..80484e8
--- /dev/null
+++ b/.config/dir_colors
@@ -0,0 +1 @@
+OTHER_WRITABLE 01;34;45
diff --git a/.config/pacman/makepkg.conf b/.config/pacman/makepkg.conf
index 8dc4536..8389fb5 100644
--- a/.config/pacman/makepkg.conf
+++ b/.config/pacman/makepkg.conf
@@ -1,3 +1,5 @@
+#!/phony/bash
+
 PKGDEST="${LIBREHOME:-$HOME}/packages/pkgdest"
 SRCDEST="${LIBREHOME:-$HOME}/packages/srcdest"
 SRCPKGDEST="${LIBREHOME:-$HOME}/packages/srcpkgdest"
@@ -6,3 +8,17 @@ LOGDEST="${LIBREHOME:-$HOME}/packages/logdest"
 PACKAGER="Luke Shumaker <lukeshu@sbcglobal.net>"
 
 MAKEFLAGS="-j3"
+
+if type ccache &>/dev/null; then
+	f=false
+	for i in "${!BUILDENV[@]}"; do
+		if [[ "${BUILDENV[$i]}" == '!ccache' ]]; then
+			BUILDENV[$i]='ccache'
+			f=true
+		fi
+	done
+	if [[ $f == false ]]; then
+		BUILDENV+=('ccache')
+	fi
+	unset f i
+fi
diff --git a/.config/redshift.conf b/.config/redshift.conf
index 25e731a..7f19a99 100644
--- a/.config/redshift.conf
+++ b/.config/redshift.conf
@@ -3,7 +3,7 @@
 temp-day=6500K
 temp-night=6500K
 brightness-day=1.0
-brightness-night=0.45
+brightness-night=0.5
 
 location-provider=manual
 transition=0
diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service
index 10fc4e9..3902627 100644
--- a/.config/systemd/user/wmii@.service
+++ b/.config/systemd/user/wmii@.service
@@ -7,6 +7,5 @@ Type=simple
 Restart=no
 
 Environment=DISPLAY=%I
-ExecStart=/usr/bin/bash -l -c /usr/bin/wmii
+ExecStart=/usr/bin/bash -l -c 'exec 8>${XDG_RUNTIME_DIR}/x11-wm@%I; exec /usr/bin/wmii'
 ExecStop=/usr/bin/wmiir xwrite /ctl Quit
-ExecStopPost=/usr/bin/bash -c ": > ${XDG_RUNTIME_DIR}/x11-wm@%I"
diff --git a/.config/wmii-hg/config.sh b/.config/wmii-hg/config.sh
index be75d65..ad4d2fe 100644
--- a/.config/wmii-hg/config.sh
+++ b/.config/wmii-hg/config.sh
@@ -25,6 +25,8 @@ Event() {
 		##   1 = left
 		##   2 = middle
 		##   3 = right
+		##   4 = scroll up
+		##   5 = scroll down
 
 		## Custom (non-WMII-generated) events
 		WmiircStart) ## No args
@@ -109,6 +111,8 @@ Event() {
 								echo Fullscreen on >> $WMII_DIR/client/$1/ctl;;
 						esac
 					}& ;;
+				4) ;;
+				5) ;;
 			esac;;
 		ClientClick) ## $1=client $2=button
 			;;
diff --git a/.config/wmii-hg/rbar.sh b/.config/wmii-hg/rbar.sh
index 8297b71..4f6faf1 100644
--- a/.config/wmii-hg/rbar.sh
+++ b/.config/wmii-hg/rbar.sh
@@ -14,5 +14,7 @@ case "$1" in
 	1) left-click;;
 	2) middle-click;;
 	3) right-click;;
-	*) update "$1";;
+	4) scroll-up;;
+	5) scroll-down;;
+	[0-9][0-9]_*) update "$1";;
 esac
diff --git a/.config/wmii-hg/rbar_wifi b/.config/wmii-hg/rbar_wifi
index 63dc653..195df7c 100755
--- a/.config/wmii-hg/rbar_wifi
+++ b/.config/wmii-hg/rbar_wifi
@@ -29,7 +29,7 @@ right-click() {
 	IFS=''
 	while read -r line; do
 		list+=("$line")
-	done < <(netctl-auto list | sed 's,$,$,' | column -s '$' -t)
+	done < <({ netctl-auto list; printf '> %s\n' 'New Network' 'Disable All' 'Enable All';} | sed 's,$,$,' | column -s '$' -t)
 
 	cur=''
 	for item in "${list[@]}"; do
@@ -39,9 +39,27 @@ right-click() {
 	done
 
 	item=$(wmii9menu -i "$cur" "${list[@]}")
-	if [[ -n $item ]] && [[ "$item" != '* '* ]]; then
-		netctl-auto switch-to "$item"
-	fi
+	case "$item" in
+	'')
+		# Nothing selected
+		;;
+	'* '*)
+		# Already selected; do nothing
+		;;
+	'> New Network'*)
+		urxvt +sb -title wifi-menu -e sudo wifi-menu
+		;;
+	'> Disable All'*)
+		sudo netctl-auto disable-all
+		;;
+	'> Enable All'*)
+		sudo netctl-auto enable-all
+		;;
+	*)
+		# NB: do NOT quote $item; we need to strip whitespace
+		sudo netctl-auto switch-to $item
+		;;
+	esac
 }
 
 . "$(dirname "$0")/rbar.sh"
diff --git a/.local/bin/xmessage b/.local/bin/xmessage
index 08fd95e..46647e0 100755
--- a/.local/bin/xmessage
+++ b/.local/bin/xmessage
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec gxmessage $@ -fn 'Monospace'
+exec gxmessage "$@" -fn 'Monospace'