diff options
-rw-r--r-- | .config/Synergy/Synergy.conf | 118 | ||||
-rw-r--r-- | .config/bash/rc.d/10_aliases.sh | 42 | ||||
-rw-r--r-- | .config/ssh/config | 9 | ||||
l--------- | .config/systemd/user/wmii@.service.wants/rbar@98_wifi.service | 1 | ||||
l--------- | .config/systemd/user/wmii@.service.wants/redshift@.service | 1 | ||||
l--------- | .config/systemd/user/wmii@.service.wants/x0vncserver@.service | 1 | ||||
-rw-r--r-- | .config/systemd/user/xresources-dpi@.service | 2 | ||||
-rw-r--r-- | .config/systemd/user/xresources@.service | 2 | ||||
-rw-r--r-- | .config/wmii-hg/config.sh | 6 | ||||
-rwxr-xr-x | .local/bin/backlight | 6 | ||||
-rwxr-xr-x | .local/bin/c | 2 | ||||
-rwxr-xr-x | .local/bin/m | 7 |
12 files changed, 173 insertions, 24 deletions
diff --git a/.config/Synergy/Synergy.conf b/.config/Synergy/Synergy.conf new file mode 100644 index 0000000..0835cfc --- /dev/null +++ b/.config/Synergy/Synergy.conf @@ -0,0 +1,118 @@ +[General] +activateEmail= +autoConfig=true +autoConfigPrompted=true +autoHide=true +configFile=/home/lukeshu-parabola/synergy.conf +cryptoEnabled=false +edition=2 +elevateMode=false +groupClientChecked=false +groupServerChecked=true +interface= +language=en +logFilename=/var/log/synergy.log +logLevel=3 +logToFile=false +port=24800 +screenName=lukeshu-gluglugt60 +serverHostname= +startedBefore=true +useExternalConfig=false +useInternalConfig=true +userToken= +wizardLastRun=7 + +[internalConfig] +hasHeartbeat=false +hasSwitchDelay=false +hasSwitchDoubleTap=false +heartbeat=5000 +hotkeys\size=0 +ignoreAutoConfigClient=false +numColumns=5 +numRows=3 +relativeMouseMoves=false +screenSaverSync=true +screens\1\name= +screens\10\name= +screens\11\name= +screens\12\name= +screens\13\name= +screens\14\name= +screens\15\name= +screens\2\name= +screens\3\name= +screens\4\name= +screens\5\name= +screens\6\name= +screens\7\aliasArray\size=0 +screens\7\fixArray\1\fix=false +screens\7\fixArray\2\fix=false +screens\7\fixArray\3\fix=false +screens\7\fixArray\4\fix=false +screens\7\fixArray\size=4 +screens\7\modifierArray\1\modifier=0 +screens\7\modifierArray\2\modifier=1 +screens\7\modifierArray\3\modifier=2 +screens\7\modifierArray\4\modifier=3 +screens\7\modifierArray\5\modifier=4 +screens\7\modifierArray\6\modifier=5 +screens\7\modifierArray\size=6 +screens\7\name=build64-par +screens\7\switchCornerArray\1\switchCorner=false +screens\7\switchCornerArray\2\switchCorner=false +screens\7\switchCornerArray\3\switchCorner=false +screens\7\switchCornerArray\4\switchCorner=false +screens\7\switchCornerArray\size=4 +screens\7\switchCornerSize=0 +screens\8\aliasArray\size=0 +screens\8\fixArray\1\fix=false +screens\8\fixArray\2\fix=false +screens\8\fixArray\3\fix=false +screens\8\fixArray\4\fix=false +screens\8\fixArray\size=4 +screens\8\modifierArray\1\modifier=0 +screens\8\modifierArray\2\modifier=1 +screens\8\modifierArray\3\modifier=2 +screens\8\modifierArray\4\modifier=3 +screens\8\modifierArray\5\modifier=4 +screens\8\modifierArray\6\modifier=5 +screens\8\modifierArray\size=6 +screens\8\name=lukeshu-gluglugt60 +screens\8\switchCornerArray\1\switchCorner=false +screens\8\switchCornerArray\2\switchCorner=false +screens\8\switchCornerArray\3\switchCorner=false +screens\8\switchCornerArray\4\switchCorner=false +screens\8\switchCornerArray\size=4 +screens\8\switchCornerSize=0 +screens\9\aliasArray\size=0 +screens\9\fixArray\1\fix=false +screens\9\fixArray\2\fix=false +screens\9\fixArray\3\fix=false +screens\9\fixArray\4\fix=false +screens\9\fixArray\size=4 +screens\9\modifierArray\1\modifier=0 +screens\9\modifierArray\2\modifier=1 +screens\9\modifierArray\3\modifier=2 +screens\9\modifierArray\4\modifier=3 +screens\9\modifierArray\5\modifier=4 +screens\9\modifierArray\6\modifier=5 +screens\9\modifierArray\size=6 +screens\9\name=android +screens\9\switchCornerArray\1\switchCorner=false +screens\9\switchCornerArray\2\switchCorner=false +screens\9\switchCornerArray\3\switchCorner=false +screens\9\switchCornerArray\4\switchCorner=false +screens\9\switchCornerArray\size=4 +screens\9\switchCornerSize=0 +screens\size=15 +switchCornerArray\1\switchCorner=false +switchCornerArray\2\switchCorner=false +switchCornerArray\3\switchCorner=false +switchCornerArray\4\switchCorner=false +switchCornerArray\size=4 +switchCornerSize=16 +switchDelay=250 +switchDoubleTap=250 +win32KeepForeground=false 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/wmii@.service.wants/rbar@98_wifi.service b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service new file mode 120000 index 0000000..286989e --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service @@ -0,0 +1 @@ +../rbar@.service
\ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/redshift@.service b/.config/systemd/user/wmii@.service.wants/redshift@.service new file mode 120000 index 0000000..59234a7 --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/redshift@.service @@ -0,0 +1 @@ +../redshift@.service
\ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/x0vncserver@.service b/.config/systemd/user/wmii@.service.wants/x0vncserver@.service new file mode 120000 index 0000000..bc3be20 --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/x0vncserver@.service @@ -0,0 +1 @@ +../x0vncserver@.service
\ No newline at end of file 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) ;; diff --git a/.local/bin/backlight b/.local/bin/backlight new file mode 100755 index 0000000..0657030 --- /dev/null +++ b/.local/bin/backlight @@ -0,0 +1,6 @@ +#!/bin/bash + +backlight=intel_backlight +pct=$1 +read max < /sys/class/backlight/$backlight/max_brightness +bc <<<"scale=2; $max * ($pct/100)" | cut -d. -f1 > /sys/class/backlight/$backlight/brightness diff --git a/.local/bin/c b/.local/bin/c new file mode 100755 index 0000000..7342845 --- /dev/null +++ b/.local/bin/c @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +exec xdotool click "${1:-1}" diff --git a/.local/bin/m b/.local/bin/m new file mode 100755 index 0000000..9f4b4c6 --- /dev/null +++ b/.local/bin/m @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +if [[ $# -gt 0 ]]; then + exec xdotool mousemove_relative -- "$@" +else + xdotool mousemove_relative -- 1 1 + xdotool mousemove_relative -- -1 -1 +fi |