Merge branch 'master' into build64-par/master

5 files changed, 37 insertions, 24 deletions

diff --git a/.config/bash/rc.d/10_aliases.sh b/.config/bash/rc.d/10_aliases.sh
index da214e9..2e28a5d 100644
--- a/.config/bash/rc.d/10_aliases.sh
+++ b/.config/bash/rc.d/10_aliases.sh
@@ -22,15 +22,20 @@ if [ -x "`which dircolors`" ]; then
 
 	wdiff() {
 		if [[ -t 1 ]]; then
-			local red="$(tput setaf 1)"
-			local blue="$(tput setaf 4)"
-			local bold="$(tput bold)"
-			local reset="$(tput sgr0)"
+			local old new off
+			if type colordiff &>/dev/null; then
+				eval "$(colordiff <(echo old) <(echo new)|sed -rn 's@(.*)[<>] (old|new)(.*)@\2='\''\1'\''\noff='\''\3'\''\n@p')"
+			else
+				new="$(tput setaf 2)"
+				old="$(tput setaf 1)"
+				off="$(tput sgr0)"
+			fi
 			command wdiff \
-				-w "$bold$red[-" \
-				-x "-]$reset" \
-				-y "$bold$blue{+" \
-				-z "+}$reset" "$@"
+				-w "$old[-" \
+				-x "-]$off" \
+				-y "$new{+" \
+				-z "+}$off" \
+				"$@"
 		else
 			command wdiff "$@"
 		fi
@@ -38,15 +43,20 @@ if [ -x "`which dircolors`" ]; then
 
 	chardiff() {
 		if [[ -t 1 ]]; then
-			local red="$(tput setaf 1)"
-			local blue="$(tput setaf 4)"
-			local bold="$(tput bold)"
-			local reset="$(tput sgr0)"
+			local old new off
+			if type colordiff &>/dev/null; then
+				eval "$(colordiff <(echo old) <(echo new)|sed -rn 's@(.*)[<>] (old|new)(.*)@\2='\''\1'\''\noff='\''\3'\''\n@p')"
+			else
+				new="$(tput setaf 2)"
+				old="$(tput setaf 1)"
+				off="$(tput sgr0)"
+			fi
 			command chardiff \
-				-w "$bold$red[-" \
-				-x "-]$reset" \
-				-y "$bold$blue{+" \
-				-z "+}$reset" "$@"
+				-w "$old[-" \
+				-x "-]$off" \
+				-y "$new{+" \
+				-z "+}$off" \
+				"$@"
 		else
 			command chardiff "$@"
 		fi
diff --git a/.config/ssh/config b/.config/ssh/config
index 61f4862..9dbf510 100644
--- a/.config/ssh/config
+++ b/.config/ssh/config
@@ -23,18 +23,19 @@ Host parabola.nu *.parabola.nu
 Host lukeshu.com
 	Port 1863
 	User lukeshu
+Host ssl.lukeshu.com
+	User lukeshu
+	ProxyCommand proxytunnel --proxy=lukeshu.com:8443 --proxyauth=frc4272:password --encrypt-proxy --dest=lukeshu.com:1863
 
 Match host build64-par exec "nslookup %n.lan."
 	HostName build64-par
 	Port 22
-	ForwardX11 yes
-	ForwardX11Trusted yes
 Host build64-par
 	User luke
 	HostName lukeshu.com
 	Port 1864
-	ForwardX11 no
-	ForwardX11Trusted no
+	ForwardX11 yes
+	ForwardX11Trusted yes
 
 Host 192.168.*.1 10.*
 	StrictHostKeyChecking no
diff --git a/.config/systemd/user/xresources-dpi@.service b/.config/systemd/user/xresources-dpi@.service
index 51bb1d5..a112825 100644
--- a/.config/systemd/user/xresources-dpi@.service
+++ b/.config/systemd/user/xresources-dpi@.service
@@ -8,7 +8,7 @@ Requisite=X11@%i.target
 Environment=DISPLAY=%I
 
 Type=oneshot
-ExecStart=/usr/bin/env flock ${XDG_RUNTIME_DIR}/x11-xrdb@%I -c xrdb-set-dpi
+ExecStart=/usr/bin/env flock %t/x11-xrdb@%I -c xrdb-set-dpi
 
 [Install]
 WantedBy=X11@%i.target
diff --git a/.config/systemd/user/xresources@.service b/.config/systemd/user/xresources@.service
index 3d723c6..83e4523 100644
--- a/.config/systemd/user/xresources@.service
+++ b/.config/systemd/user/xresources@.service
@@ -8,7 +8,7 @@ Requisite=X11@%i.target
 Environment=DISPLAY=%I
 
 Type=oneshot
-ExecStart=/usr/bin/env flock ${XDG_RUNTIME_DIR}/x11-xrdb@%I -c 'xrdb -merge ${XDG_CONFIG_HOME}/X11/resources'
+ExecStart=/usr/bin/env flock %t/x11-xrdb@%I -c 'xrdb -merge ${XDG_CONFIG_HOME}/X11/resources'
 
 [Install]
 WantedBy=X11@%i.target
diff --git a/.config/wmii-hg/config.sh b/.config/wmii-hg/config.sh
index ade2dfe..1b48cc4 100644
--- a/.config/wmii-hg/config.sh
+++ b/.config/wmii-hg/config.sh
@@ -123,11 +123,13 @@ Event() {
 				2) ;;
 				3)
 					{
-						case $(wmii9menu Delete Fullscreen) in
+						case $(wmii9menu Delete Fullscreen ToggleFloat) in
 							Delete)
 								echo kill >> $WMII_DIR/client/$client/ctl;;
 							Fullscreen)
-								echo Fullscreen on >> $WMII_DIR/client/$1/ctl;;
+								echo Fullscreen on >> $WMII_DIR/client/$client/ctl;;
+							ToggleFloat)
+								echo send $client toggle >> $WMII_DIR/tag/sel/ctl;;
 						esac
 					}& ;;
 				4) ;;