summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <benjaminfranzke@googlemail.com>2010-10-16 10:42:46 +0200
committerben <benjaminfranzke@googlemail.com>2010-10-16 10:42:46 +0200
commit74f640c9d0e4ec840a6374587c2f9c82a5640d3c (patch)
treeb5d825d63a84fc0a2699329ef97e6a82749668ff
parent6904814c2318d5eb52824ef2f8e580f4c97337ef (diff)
parent3c2f5ae4eba59d8658c5550ff47a89336569640f (diff)
downloaddotfiles-74f640c9d0e4ec840a6374587c2f9c82a5640d3c.tar.gz
dotfiles-74f640c9d0e4ec840a6374587c2f9c82a5640d3c.tar.bz2
dotfiles-74f640c9d0e4ec840a6374587c2f9c82a5640d3c.zip
Merge branch 'master' of github.com:benf/dotfiles
-rw-r--r--.config/awesome/awesome.lua1
-rw-r--r--.config/bash/alias.sh3
-rw-r--r--.config/bash/functions.sh7
3 files changed, 11 insertions, 0 deletions
diff --git a/.config/awesome/awesome.lua b/.config/awesome/awesome.lua
index 3743381..247f35d 100644
--- a/.config/awesome/awesome.lua
+++ b/.config/awesome/awesome.lua
@@ -18,6 +18,7 @@ local runonce = require("runonce")
runonce.run("urxvtd -q -o -f")
runonce.run("start-pulseaudio-x11")
runonce.run("synergys")
+runonce.run("synergyc 127.0.0.1:24801")
runonce.run("pidgin")
runonce.run(os.getenv("HOME") .. "/.local/bin/swIcon.py")
diff --git a/.config/bash/alias.sh b/.config/bash/alias.sh
index d5a6c71..18f8cb7 100644
--- a/.config/bash/alias.sh
+++ b/.config/bash/alias.sh
@@ -26,3 +26,6 @@ alias tv="~/.scripts/tv.sh"
# typos
alias sl=ls
+# connect to
+alias syn_c="ssh -f -N -R 24801:127.0.0.1:24800"
+
diff --git a/.config/bash/functions.sh b/.config/bash/functions.sh
index ae7329b..c644247 100644
--- a/.config/bash/functions.sh
+++ b/.config/bash/functions.sh
@@ -232,3 +232,10 @@ die() {
echo " * ${*:-(no error message)}"
}
+wscan() {
+ local dev=$1
+ local pattern=$2
+
+ iw $dev scan | \
+ sed -e '/^[^\t]/{x;p;x;}' | sed -e '/./{H;$!d;}' -e "x;/$pattern/!d;" | sed "/^$/d"
+}