diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/Synergy/Synergy.conf | 2 | ||||
| -rw-r--r-- | .config/bash/rc.d/10_aliases.sh | 18 | ||||
| -rw-r--r-- | .config/login.d/02_xdg_runtime_dir.sh | 27 | ||||
| -rw-r--r-- | .config/login.d/90_dot-runtime.sh | 2 | ||||
| -rw-r--r-- | .config/ssh/config | 4 | ||||
| -rw-r--r-- | .config/wmii-hg/rules | 1 |
6 files changed, 24 insertions, 30 deletions
diff --git a/.config/Synergy/Synergy.conf b/.config/Synergy/Synergy.conf index 3366735..0835cfc 100644 --- a/.config/Synergy/Synergy.conf +++ b/.config/Synergy/Synergy.conf @@ -21,7 +21,7 @@ startedBefore=true useExternalConfig=false useInternalConfig=true userToken= -wizardLastRun=5 +wizardLastRun=7 [internalConfig] hasHeartbeat=false diff --git a/.config/bash/rc.d/10_aliases.sh b/.config/bash/rc.d/10_aliases.sh index f34230b..03ece7e 100644 --- a/.config/bash/rc.d/10_aliases.sh +++ b/.config/bash/rc.d/10_aliases.sh @@ -101,6 +101,24 @@ mvln() { return 1 fi } +cpln() { + local target link + if [[ ! -L "$1" ]]; then + libremessages error 'Not a soft link: %s' "$1" + return 1 + fi + if [[ -d "$2" ]]; then + link="$2/${1##*/}" + else + link="$2" + fi + target=$(readlink -f -- "$1") || return 1 + ln -srT -- "$target" "$link" + if ! cmp -- "$1" "$link"; then + libremessages error 'Failed copying link: %s -> %s' "$1" "$link" + return 1 + fi +} jarls() { jar tf "$1" | sed -n 's/\.class$//p' | diff --git a/.config/login.d/02_xdg_runtime_dir.sh b/.config/login.d/02_xdg_runtime_dir.sh deleted file mode 100644 index 86f1232..0000000 --- a/.config/login.d/02_xdg_runtime_dir.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/hint/sh -# Set XDG_RUNTIME_DIR if we can -if [ -z "$XDG_RUNTIME_DIR" ] && type flock &>/dev/null; then - _diy_xdg_runtime_login() { - export XDG_RUNTIME_DIR="$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME.dir" - if ! [ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME.lock" ]; then - mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir" - exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME.lock" - if flock -xn 7; then - if [ ! -d "$XDG_RUNTIME_DIR" ]; then - local tmp="$(mktemp -d --tmpdir -- "${USER}@${HOSTNAME}-runtime.XXXXXXXXXX")" - ln -sfT -- "$tmp" "$XDG_RUNTIME_DIR" - fi - # Unfortunately this doesn't survive across exec(1). - trap _diy_xdg_runtime_logout EXIT - flock -sn 7 - fi - fi - } - _diy_xdg_runtime_logout() { - if flock -xn 7; then - rm -rf -- "$(readlink "$XDG_RUNTIME_DIR")" - rm -f -- "$XDG_RUNTIME_DIR" - fi - } - _diy_xdg_runtime_login -fi diff --git a/.config/login.d/90_dot-runtime.sh b/.config/login.d/90_dot-runtime.sh index 9536fb4..bf0ddcc 100644 --- a/.config/login.d/90_dot-runtime.sh +++ b/.config/login.d/90_dot-runtime.sh @@ -4,6 +4,4 @@ mkdir -p -- ~/.r if [ -n "$XDG_RUNTIME_DIR" ]; then ln -sfT -- "$XDG_RUNTIME_DIR" ~/.r/"$HOSTNAME" -else - ln -sfT -- /tmp ~/.r/"$HOSTNAME" fi diff --git a/.config/ssh/config b/.config/ssh/config index a243c5d..19ed217 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -35,3 +35,7 @@ Host build64-par Port 1864 ForwardX11 no ForwardX11Trusted no + +Host 192.168.*.1 10.* + StrictHostKeyChecking no + UserKnownHostsFile /dev/null diff --git a/.config/wmii-hg/rules b/.config/wmii-hg/rules index 6334a7c..65f8339 100644 --- a/.config/wmii-hg/rules +++ b/.config/wmii-hg/rules @@ -4,4 +4,5 @@ /^FLTK:FLTK:/ floating=always /Emacs|Navigator/ force-tags=+sel floating=never +/^Eclipse:Eclipse:/ floating=never /.*/ floating=off |