several updates

zshrc

@@ -69,9 +69,7 @@ alias minbox="mdirs /data/mail | mlist -ndt | mpick -t 'flagged || ! seen' | mso
 export MBLAZE_PAGER='less -RF'
 
 # There is only one vis
-alias vim="vis"
 alias vi="vis"
-alias nano="vis"
 
 # Ready for ssh'ing
 alias agent='eval "$(ssh-agent)" && ssh-add'
@@ -79,12 +77,12 @@ alias unlock='gpg-connect-agent <<<bye'
 
 alias weechat="ssh -t weechat@Hetzner ./weechat.sh"
 
-function agenda() {
-	khal calendar --format '{calendar-color}{cancelled}{start-end-time-style}{repeat-symbol} {title}{reset}' ${@:-today 2d}
+agenda() {
+	khal calendar --format '{calendar-color}{cancelled}{start-end-time-style}{repeat-symbol} {title}{reset}' ${@:-now 2d}
 }
 
-function magnet() {
-	ssh Tumbrel "transmission-remote --add '$(xclip -o -sel c)'"
+magnet() {
+	ssh Tumbrel "transmission-remote --add '$(xclip -sel c -o)'"
 }
 
 # Ledger