2 files changed, 34 insertions, 31 deletions
diff --git a/etc/alias/default b/etc/alias/default
index 4766580..0dd7bfd 100644
--- a/etc/alias/default
+++ b/etc/alias/default
@@ -51,7 +51,6 @@ linux: salias netstat='netstat --program --all --tcp --extend' ||
 #
 
 alias cal='cal -m'
-alias calendar='calendar -A 14'
 alias cp='cp -i'
 alias fbi='fbi -readahead'
 alias feh='feh --quiet --verbose'
@@ -78,7 +77,7 @@ alias screen='screen -ADRUa'
 alias tilp='gksudo "tilp --calc=ti84+ --cable=DirectLink"'
 
 # Don't collapse trees
-alias todo='todo -f +children'
+alias todo='noglob todo -f +children'
 
 # smooth scrolling
 alias xload='xload -jumpscroll 1'
diff --git a/etc/alias/short b/etc/alias/short
index cb15df2..164b0ac 100644
--- a/etc/alias/short
+++ b/etc/alias/short
@@ -21,38 +21,42 @@ alias fbif='fbi -a'
 alias fbij='fbi -a -u'
 
 ## Git
-alias gita='git add'
-alias gitc='git commit -v'
-alias gitd='git diff --color'
-alias gitdc='gitd --cached'
-alias gitf='git pull'
-alias gitl='git log'
-alias gitp='git push'
-alias gits='git status'
-alias grep-nogit='grep --exclude-dir=.git -r'
-alias git-serve='git-daemon --verbose --export-all --base-path=. .'
+if check_com -c git; then
+	alias gita='git add'
+	alias gitc='git commit -v'
+	alias gitd='git diff --color'
+	alias gitdc='gitd --cached'
+	alias gitf='git pull'
+	alias gitl='git log'
+	alias gitp='git push'
+	alias gits='git status'
+	alias grep-nogit='grep --exclude-dir=.git -r'
+	alias git-serve='git-daemon --verbose --export-all --base-path=. .'
+fi
 
-alias gtd-later='todo --database ~/var/gtd/later'
-alias gtd-todo='todo --database ~/var/gtd/todo'
-alias gtd-wait='todo --database ~/var/gtd/waiting-for'
+for i in ~/var/gtd/*(.N); {
+	alias gtd-${i:t}='todo --database '$i
+}
 
 ## Mercurial (hg)
-alias hga='hg add'
-alias hgar='hg addremove'
-alias hgc='hg commit'
-alias hgd='hg diff | less'
-alias hgf='hg fetch'
-alias hgg='hg glog | less'
-alias hgh='hg heads'
-alias hgi='hg incoming'
-alias hgl='hg log | less'
-alias hgm='hg merge'
-alias hgp='hg push'
-alias hgrm='hg remove'
-alias hgrv='hg revert'
-alias hgs='hg status'
-alias hgu='hg update'
-alias hgv='hg verify'
+if check_com -c hg; then
+	alias hga='hg add'
+	alias hgar='hg addremove'
+	alias hgc='hg commit'
+	alias hgd='hg diff | less'
+	alias hgf='hg fetch'
+	alias hgg='hg glog | less'
+	alias hgh='hg heads'
+	alias hgi='hg incoming'
+	alias hgl='hg log | less'
+	alias hgm='hg merge'
+	alias hgp='hg push'
+	alias hgrm='hg remove'
+	alias hgrv='hg revert'
+	alias hgs='hg status'
+	alias hgu='hg update'
+	alias hgv='hg verify'
+fi
 
 # File listings
 alias lsb='tar tvjf'