update

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

myremotegit

@@ -24,21 +24,27 @@
 host=git.schottelius.org
 dir="/home/services/git"
 
-if [ $# -ne 2 ]; then
+if [ $# -lt 2 ]; then
-   echo "$0 name description"
+   echo "$0 name description [remotename]"
    exit 1
 fi
 
 name=$1; shift
 desc=$1; shift
 
+if [ $# -ge 1 ]; then
+    remote=$1; shift
+else
+    remote=origin
+fi
+
 remote_dir="$dir/$name"
-remote="$host:$remote_dir"
+remote_url="$host:$remote_dir"
 
 # Create on remote side
 ssh "$host" "GIT_DIR=$remote_dir git init"
 ssh "$host" "echo $desc > $remote_dir/description"
 
 # Initialise git
-git remote add origin "$remote"
+git remote add "$remote" "$remote_url"
-git push origin master
+git push "$remote" master

securemail

@@ -19,17 +19,20 @@ HOST="213.146.113.242"
 HOST="nico@62.65.138.78"
 HOST="home.schottelius.org"
 HOST="nico@77.109.138.222"
+# HOST="root@backup1.ungleich.ch"
 
 if [ $# -ge 1 ]; then
     HOST=$1; shift
 fi
+    #-L2323:mx3.schottelius.org:$IMAPS   \
+    #-L4241:mx3.schottelius.org:$SMTP    \
 
 ssh -T -f -C -N \
-    -L2323:mx3.schottelius.org:$IMAPS   \
+    -L2323:77.109.138.221:$IMAPS   \
-    -L4241:mx3.schottelius.org:$SMTP    \
+    -L4241:77.109.138.221:$SMTP    \
     -L2324:imap.googlemail.com:$IMAPS   \
     -L2325:mail.zhaw.ch:$IMAPS          \
-    -R :4242:localhost:22 \
+    -R :4242:localhost:22               \
     -D 12345                            \
     "$HOST" "$@"
 

show_calendar

@@ -13,16 +13,17 @@
 # -----------------------
 #
 
-CALDIR=~/.calendar
+CALDIR=~/.calendar/
 
 if [ $# -lt 1 ]; then
    echo `basename $0` 'day.month [day.month.year]'
    exit 1
 fi
 
-grep_param="-e ^TO.DO:"
+# grep_param="-e ^TO.DO:"
 for arg in "$@"; do
     grep_param="${grep_param} -e ^${arg}:"
 done
 
-find "$CALDIR" -type f -exec egrep --with-filename -A 2 "$grep_param" {} \;
+# set -x
+find "$CALDIR" -type f -exec egrep --with-filename -A 2 $grep_param {} \;

sync-to

@@ -11,8 +11,8 @@ case "$dsthost" in
     loch)
         dst=root@loch:/home/services/backup/bento-manuell
     ;;
-    zuhause)
+    luchsingen)
-	    dst=root@zuhause.schottelius.org:/home/services/backup/bento-manuell
+	    dst=root@luchsingen.schottelius.org:/home/services/backup/bento-manuell
     ;;
     *)
         echo "Unknown $1" >&2
@@ -26,6 +26,9 @@ rsync -avS --delete --progress 	\
 	--exclude '/tmp/*' 	\
 	--exclude '/sys/*' 	\
 	--exclude '/dev/*' 	\
+	--exclude '/run/*' 	\
+	--exclude '/home/services/usbhd' 	\
+	--exclude '/home/users/nico/.cache/chromium/' \
 	--exclude '/home/users/nico/.bitcoin/blocks/' 	\
 	--exclude '/home/users/nico/.bitcoin/chainstate/' 	\
 	"$@" 			\

wake-up

@@ -6,6 +6,9 @@ case "$host" in
     blank)
         mac=60:a4:4c:cf:f0:25
     ;;
+    zucker)
+        mac=d4:9a:20:f8:cc:b4
+    ;;
     *)
         echo "Unknown host $host" >&2
         exit 1

wlan

@@ -12,8 +12,14 @@
 #ip link set wlp0s3 up
 #iwconfig wlp0s3 essid public
 
-dev=wlp2s0
+if [ "$#" -ge 1 ]; then
-dev=wlp3s0
+	dev=$1; shift
+else
+	dev=wlp2s0
+	dev=wlp3s0
+	dev=wlan0
+	dev=wlp1s0
+fi
 
 set -x
 set +e

x-links

@@ -1,5 +1,5 @@
 #!/bin/sh
 x-off
 
-xrandr --output HDMI1 --auto --rotate normal --left-of LVDS1
+xrandr --output HDMI1 --auto --rotate normal --left-of eDP1
-xrandr --output DP1 --auto --rotate normal --left-of LVDS1
+xrandr --output DP1 --auto --rotate normal --left-of eDP1

x-oben

@@ -1,6 +1,6 @@
 #!/bin/sh
 x-off
 
-xrandr --output HDMI1 --auto --rotate normal --above LVDS1
+xrandr --output HDMI1 --auto --rotate normal --above eDP1
-xrandr --output DP1 --auto --rotate normal --above LVDS1
+xrandr --output DP1 --auto --rotate normal --above eDP1
-xrandr --output VGA1 --auto --rotate normal --above LVDS1
+xrandr --output VGA1 --auto --rotate normal --above eDP1

x-rechts

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 x-off
-xrandr --output DP1 --auto --rotate normal --right-of LVDS1
+xrandr --output DP1 --auto --rotate normal --right-of eDP1
-xrandr --output HDMI1 --auto --rotate normal --right-of LVDS1
+xrandr --output HDMI1 --auto --rotate normal --right-of eDP1