From b51e95e236b375d1b06321278769304b9d1dcc4d Mon Sep 17 00:00:00 2001
From: Ayaz Badouraly <ayaz.badouraly@via.ecp.fr>
Date: Mon, 19 Dec 2016 22:33:24 +0100
Subject: [PATCH] Gathering variables initializations

---
 via.zsh-theme | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/via.zsh-theme b/via.zsh-theme
index f2808ec..799899c 100644
--- a/via.zsh-theme
+++ b/via.zsh-theme
@@ -17,12 +17,24 @@ source $OHMYVIA_INSTALLATION_PATH/functions/utils.zsh
 source $OHMYVIA_INSTALLATION_PATH/functions/vcs_themes.zsh
 source $OHMYVIA_INSTALLATION_PATH/functions/vcs_utils.zsh
 
+#################################################################################
+# Variables initialization
+#################################################################################
+
+set_default OHMYVIA_TIME_FORMAT          "%D{%H:%M}"
+
+set_default OHMYVIA_VCS_COLOR_UNSTAGED   "red"
+set_default OHMYVIA_VCS_COLOR_STAGED     "yellow"
+set_default OHMYVIA_VCS_COLOR_UNTRACKED  "blue"
+set_default OHMYVIA_VCS_COLOR_STASH      "cyan"
+set_default OHMYVIA_VCS_COLOR_CLEAN      "green"
+set_default OHMYVIA_VCS_THEME            "default"
+
 #################################################################################
 # Setup prompts
 #################################################################################
 
-local time_format=${OHMYVIA_TIME_FORMAT:-"%D{%H:%M}"}
-local clock="%B%F{cyan}$time_format%f%b"
+local clock="%B%F{cyan}$OHMYVIA_TIME_FORMAT%f%b"
 
 # Check the UID
 if [[ $UID -ne 0 ]];
@@ -50,19 +62,12 @@ zstyle ':vcs_info:*' max-exports 1		# vcs_info only sets vcs_info_msg_0_
 zstyle ':vcs_info:*' enable git
 zstyle ':vcs_info:*' check-for-changes true	# enable %c and %u sequences usage
 
-set_default OHMYVIA_VCS_COLOR_UNSTAGED  "red"
-set_default OHMYVIA_VCS_COLOR_STAGED    "yellow"
-set_default OHMYVIA_VCS_COLOR_UNTRACKED "blue"
-set_default OHMYVIA_VCS_COLOR_STASH     "cyan"
-set_default OHMYVIA_VCS_COLOR_CLEAN     "green"
-
 zstyle ':vcs_info:*' unstagedstr $OHMYVIA_VCS_COLOR_UNSTAGED
 zstyle ':vcs_info:*' stagedstr   $OHMYVIA_VCS_COLOR_STAGED
 
 zstyle ':vcs_info:git*+set-message:*' hooks misc-init git-stash git-untracked
 
 # Load VCS theme
-set_default OHMYVIA_VCS_THEME "default"
 eval +vi-theme-$OHMYVIA_VCS_THEME
 
 zstyle ':vcs_info:*' formats       " $OHMYVIA_VCS_PROMPT_NORMAL"
-- 
GitLab