Browse Source

[#23, Fix #80] Move themes into the prompt module

master
Sorin Ionescu 13 years ago
parent
commit
66c14486c6
  1. 15
      init.zsh
  2. 0
      modules/prompt/functions/prompt_minimal_setup
  3. 0
      modules/prompt/functions/prompt_nicoulaj_setup
  4. 0
      modules/prompt/functions/prompt_sorin_setup
  5. 0
      modules/prompt/functions/prompt_steeef_setup
  6. 19
      modules/prompt/init.zsh
  7. 6
      templates/zshrc

15
init.zsh

@ -41,21 +41,6 @@ zstyle -a ':omz:load' omodule 'omodules' @@ -41,21 +41,6 @@ zstyle -a ':omz:load' omodule 'omodules'
omodload "$omodules[@]"
unset omodules
# Add themes to fpath.
fpath=(${0:h}/themes/*(/FN) $fpath)
# Load and run the prompt theming system.
autoload -Uz promptinit && promptinit
# Load the prompt theme.
zstyle -a ':omz:prompt' theme 'prompt_argv'
if (( $#prompt_argv > 0 )); then
prompt "$prompt_argv[@]"
else
prompt 'off'
fi
unset prompt_argv
# Set environment variables for launchd processes.
if [[ "$OSTYPE" == darwin* ]]; then
for env_var in PATH MANPATH; do

0
themes/minimal/prompt_minimal_setup → modules/prompt/functions/prompt_minimal_setup

0
themes/nicoulaj/prompt_nicoulaj_setup → modules/prompt/functions/prompt_nicoulaj_setup

0
themes/sorin/prompt_sorin_setup → modules/prompt/functions/prompt_sorin_setup

0
themes/steeef/prompt_steeef_setup → modules/prompt/functions/prompt_steeef_setup

19
modules/prompt/init.zsh

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
#
# Loads prompt themes.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
#
# Load and run the prompt theming system.
autoload -Uz promptinit && promptinit
# Load the prompt theme.
zstyle -a ':omz:module:prompt' theme 'prompt_argv'
if (( $#prompt_argv > 0 )); then
prompt "$prompt_argv[@]"
else
prompt 'off'
fi
unset prompt_argv

6
templates/zshrc

@ -30,13 +30,13 @@ zstyle ':omz:module:terminal' auto-title 'yes' @@ -30,13 +30,13 @@ zstyle ':omz:module:terminal' auto-title 'yes'
# zstyle ':omz:load' zfunction 'zargs' 'zmv'
# Set the Oh My Zsh modules to load (browse modules).
zstyle ':omz:load' omodule 'environment' 'terminal' 'editor' \
'completion' 'history' 'directory' 'spectrum' 'alias' 'utility'
zstyle ':omz:load' omodule 'environment' 'terminal' 'editor' 'completion' \
'history' 'directory' 'spectrum' 'alias' 'utility' 'prompt'
# Set the prompt theme to load.
# Setting it to 'random' loads a random theme.
# Auto set to 'off' on dumb terminals.
zstyle ':omz:prompt' theme 'sorin'
zstyle ':omz:module:prompt' theme 'sorin'
# This will make you shout: OH MY ZSHELL!
source "$OMZ/init.zsh"

Loading…
Cancel
Save