oh-my-zsh.sh

@@ -97,12 +97,25 @@ done
 unset config_file
 
 # Load the theme
-if [ ! "$ZSH_THEME" = ""  ]; then
-  if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
-    source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
-  elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then
-    source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
+if [[ "$ZSH_THEME" == "random" ]]; then
+  if [[ "${(t)ZSH_THEME_RANDOM_CANDIDATES}" = "array" ]] && [[ "${#ZSH_THEME_RANDOM_CANDIDATES[@]}" -gt 0 ]]; then
+    themes=($ZSH/themes/${^ZSH_THEME_RANDOM_CANDIDATES}.zsh-theme)
   else
-    source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+    themes=($ZSH/themes/*zsh-theme)
+  fi
+  N=${#themes[@]}
+  ((N=(RANDOM%N)+1))
+  RANDOM_THEME=${themes[$N]}
+  source "$RANDOM_THEME"
+  echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
+else
+  if [ ! "$ZSH_THEME" = ""  ]; then
+    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
+      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
+    elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then
+      source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
+    else
+      source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+    fi
   fi
 fi

plugins/themes/_theme

@@ -0,0 +1,3 @@
+#compdef theme
+
+_arguments "1: :($(lstheme | tr "\n" " "))"

plugins/themes/themes.plugin.zsh

@@ -1,27 +1,26 @@
-function theme {
-    : ${1:=random} # Use random theme if none provided
-
-    if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
-        source "$ZSH_CUSTOM/$1.zsh-theme"
-    elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
-        source "$ZSH_CUSTOM/themes/$1.zsh-theme"
-    elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
-        source "$ZSH/themes/$1.zsh-theme"
+function theme
+{
+    if [ -z "$1" ] || [ "$1" = "random" ]; then
+	themes=($ZSH/themes/*zsh-theme)
+	N=${#themes[@]}
+	((N=(RANDOM%N)+1))
+	RANDOM_THEME=${themes[$N]}
+	source "$RANDOM_THEME"
+	echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
     else
-        echo "$0: Theme '$1' not found"
-        return 1
+	if [ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]
+	then
+	    source "$ZSH_CUSTOM/themes/$1.zsh-theme"
+	else
+	    source "$ZSH/themes/$1.zsh-theme"
+	fi
     fi
 }
 
-function _theme {
-    _arguments "1: :($(lstheme))"
-}
-
-compdef _theme theme
-
-function lstheme {
+function lstheme
+{
     # Resources:
     # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Modifiers
     # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Qualifiers
-    print "$ZSH_CUSTOM"/*.zsh-theme(N:t:r) {"$ZSH_CUSTOM","$ZSH"}/themes/*.zsh-theme(N:t:r)
+    print -l {$ZSH,$ZSH_CUSTOM}/themes/*.zsh-theme(N:t:r)
 }

themes/avit.zsh-theme

@@ -29,7 +29,7 @@ function _user_host() {
 # use a neutral color, otherwise colors will vary according to time.
 function _git_time_since_commit() {
   local last_commit now seconds_since_last_commit
-  local minutes hours days years commit_age
+  local minutes hours commit_age
   # Only proceed if there is actually a commit.
   if last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null); then
     now=$(date +%s)
@@ -37,16 +37,12 @@ function _git_time_since_commit() {
 
     # Totals
     minutes=$((seconds_since_last_commit / 60))
-    hours=$((minutes / 60))
-    days=$((hours / 24))
-    years=$((days / 365))
+    hours=$((seconds_since_last_commit / 3600))
 
-    if [[ $years -gt 0 ]]; then
-      commit_age="${years}y$((days % 365 ))d"
-    elif [[ $days -gt 0 ]]; then
-      commit_age="${days}d$((hours % 24))h"
+    if [[ $hours -ge 24 ]]; then
+      commit_age="$(( hours / 24 ))d"
     elif [[ $hours -gt 0 ]]; then
-      commit_age+="${hours}h$(( minutes % 60 ))m"
+      commit_age+="$(( hours % 24 ))h$(( minutes % 60 ))m"
     else
       commit_age="${minutes}m"
     fi

themes/random.zsh-theme

@@ -1,38 +0,0 @@
-# Make themes a unique array
-typeset -Ua themes
-
-if [[ "${(t)ZSH_THEME_RANDOM_CANDIDATES}" = array && ${#ZSH_THEME_RANDOM_CANDIDATES[@]} -gt 0 ]]; then
-  # Use ZSH_THEME_RANDOM_CANDIDATES if properly defined
-  themes=($ZSH_THEME_RANDOM_CANDIDATES)
-else
-  # Look for themes in $ZSH_CUSTOM and $ZSH and add only the theme name
-  themes=(
-    "$ZSH_CUSTOM"/*.zsh-theme(N:t:r)
-    "$ZSH_CUSTOM"/themes/*.zsh-theme(N:t:r)
-    "$ZSH"/themes/*.zsh-theme(N:t:r)
-  )
-  # Remove blacklisted themes from the list
-  for theme in ${ZSH_THEME_RANDOM_BLACKLIST[@]}; do
-    themes=("${(@)themes:#$theme}")
-  done
-fi
-
-# Choose a theme out of the pool of candidates
-N=${#themes[@]}
-(( N = (RANDOM%N) + 1 ))
-RANDOM_THEME="${themes[$N]}"
-unset N themes theme
-
-# Source theme
-if [[ -f "$ZSH_CUSTOM/$RANDOM_THEME.zsh-theme" ]]; then
-  source "$ZSH_CUSTOM/$RANDOM_THEME.zsh-theme"
-elif [[ -f "$ZSH_CUSTOM/themes/$RANDOM_THEME.zsh-theme" ]]; then
-  source "$ZSH_CUSTOM/themes/$RANDOM_THEME.zsh-theme"
-elif [[ -f "$ZSH/themes/$RANDOM_THEME.zsh-theme" ]]; then
-  source "$ZSH/themes/$RANDOM_THEME.zsh-theme"
-else
-  echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' not found"
-  return 1
-fi
-
-echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded"