From 1a673fc1d582463c17168557b95fe6a55e0757e5 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 1 Dec 2010 18:07:28 +0100 Subject: [PATCH 1/2] Don't export oh-my-zsh configuration paramaters to the environment These variables are only used by oh-my-zsh, so there's no need to populate the environment of all children with them. --- templates/zshrc.zsh-template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 8022b3506..69cbbb0fe 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -1,18 +1,18 @@ # Path to your oh-my-zsh configuration. -export ZSH=$HOME/.oh-my-zsh +ZSH=$HOME/.oh-my-zsh # Set to the name theme to load. # Look in ~/.oh-my-zsh/themes/ -export ZSH_THEME="robbyrussell" +ZSH_THEME="robbyrussell" # Set to this to use case-sensitive completion -# export CASE_SENSITIVE="true" +# CASE_SENSITIVE="true" # Comment this out to disable weekly auto-update checks -# export DISABLE_AUTO_UPDATE="true" +# DISABLE_AUTO_UPDATE="true" # Uncomment following line if you want to disable colors in ls -# export DISABLE_LS_COLORS="true" +# DISABLE_LS_COLORS="true" # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Example format: plugins=(rails git textmate ruby lighthouse) From 7ca0afd6861fe0c9e6903a08f0e469746df627e0 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 1 Dec 2010 19:48:07 +0100 Subject: [PATCH 2/2] Load theme after loading all libraries By not loading the theme at the end of lib/appearance.zsh, but rather after loading all libraries, a theme can rely on/override not just the basic appearance stuff like PS1. For example the 'dieter' theme intercepts (but does not alter) the accept-line widget to change the display on the relevant keystroke. Features like these are impossible or subject to race conditions without this rearrangement. --- lib/appearance.zsh | 3 --- oh-my-zsh.sh | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/appearance.zsh b/lib/appearance.zsh index ffee52b5e..f89ea195c 100644 --- a/lib/appearance.zsh +++ b/lib/appearance.zsh @@ -33,6 +33,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is c # Setup the prompt with pretty colors setopt prompt_subst - -# Load the theme -source "$ZSH/themes/$ZSH_THEME.zsh-theme" \ No newline at end of file diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 848e48eb5..f237ddf45 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -7,6 +7,9 @@ fpath=($ZSH/functions $fpath) # TIP: Add files you don't want in git to .gitignore for config_file ($ZSH/lib/*.zsh) source $config_file +# Load theme +source "$ZSH/themes/$ZSH_THEME.zsh-theme" + # Load all of your custom configurations from custom/ for config_file ($ZSH/custom/*.zsh) source $config_file