From 6a05fdf6caef8eeb5977b3d14e9898b8f4a06821 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 19 Dec 2013 09:48:28 -0500
Subject: [PATCH] Combine alias files

---
 zsh/alias/git                 | 11 -----------
 zsh/alias/tmux                |  7 -------
 zsh/alias/transmission-remote |  8 --------
 zsh/alias/vagrant             |  3 ---
 zsh/aliases                   | 33 +++++++++++++++++++++++++++------
 zsh/welcome                   |  3 ---
 6 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 zsh/alias/git
 delete mode 100644 zsh/alias/tmux
 delete mode 100644 zsh/alias/transmission-remote
 delete mode 100644 zsh/alias/vagrant
 delete mode 100644 zsh/welcome

diff --git a/zsh/alias/git b/zsh/alias/git
deleted file mode 100644
index 5d670048..00000000
--- a/zsh/alias/git
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# git
-# On top of oh-my-zsh's git aliases
-alias gs='git status'
-alias gst='git stash'
-alias gap='git add -p'
-alias gf='git ls-files | grep -i'
-alias gt='git tag'
-alias gtl='git describe --tags --abbrev=0'
-
-# find oh-my-zsh's here: ~/.oh-my-zsh/plugins/git/git.plugin.zsh
diff --git a/zsh/alias/tmux b/zsh/alias/tmux
deleted file mode 100644
index a8e71080..00000000
--- a/zsh/alias/tmux
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# tmux
-alias t='tmux'
-alias tn='tmux new -s'
-alias ta='tmux attach -t'
-alias tl='tmux list-sessions'
-alias td='tmux detach'
diff --git a/zsh/alias/transmission-remote b/zsh/alias/transmission-remote
deleted file mode 100644
index d15827c1..00000000
--- a/zsh/alias/transmission-remote
+++ /dev/null
@@ -1,8 +0,0 @@
-
-alias bt="transmission-remote dev"
-alias btl="bt -l"
-alias bta="bt --add"
-
-function btr {
-    bt -t$1 -r
-}
diff --git a/zsh/alias/vagrant b/zsh/alias/vagrant
deleted file mode 100644
index 9dd7f23c..00000000
--- a/zsh/alias/vagrant
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# vagrant
-alias va='vagrant'
diff --git a/zsh/aliases b/zsh/aliases
index a6778405..94e238bf 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -1,10 +1,31 @@
-#############
-#  Aliases  #
-#############
+# GIT
+if command_exists 'git'; then
+    # On top of oh-my-zsh's git aliases
+    alias gs='git status'
+    alias gst='git stash'
+    alias gap='git add -p'
+    alias gf='git ls-files | grep -i'
+    alias gt='git tag'
+    alias gtl='git describe --tags --abbrev=0'
 
-for file in ~/.zsh/alias/*; do
-    command_exists `basename "$file"` && source $file
-done
+    # find oh-my-zsh's here: ~/.oh-my-zsh/plugins/git/git.plugin.zsh
+fi
+
+# Tmux
+command_exists 'tmux' && alias t='tmux'
+
+# transmission-remote
+if command_exists 'transmission-remote'; then
+    alias bt="transmission-remote dev"
+    alias btl="bt -l"
+    alias bta="bt --add"
+
+    function btr {
+        bt -t$1 -r
+    }
+fi
+
+alias va='vagrant'
 
 # Interpreters
 command_exists "ruby" && alias rb='ruby'
diff --git a/zsh/welcome b/zsh/welcome
deleted file mode 100644
index 6dc37254..00000000
--- a/zsh/welcome
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nothing here yet
-
-# vim:set ft=zsh: