Refactor Emacs module

modules/emacs/init.zsh

@@ -4,17 +4,22 @@
 # Authors: Sebastian Wiesner <lunaryorn@gmail.com>
 #
 
-# Enable Carton
-if [[ -d "$HOME/.carton" ]]; then
-    path=($HOME/.carton/bin $path)
+# Return if requirements are not found.
+if [[ ! -d "$HOME/.carton" ]]; then
+  return 1
+fi
 
-    alias cai='carton install'
-    alias cau='carton update'
-    alias caI='carton init'
-    alias cae='carton exec'
+# Prepend Carton bin directory.
+path=($HOME/.carton/bin $path)
 
-    local completion="$HOME/.carton/etc/carton_completion.zsh"
-    if [[ -e "${completion}" ]]; then
-      source "${completion}"
-    fi
-fi
+# Load Carton completion
+source "$HOME/.carton/etc/carton_completion.zsh" 2> /dev/null
+
+#
+# Aliases
+#
+
+alias cai='carton install'
+alias cau='carton update'
+alias caI='carton init'
+alias cae='carton exec'