summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.zshrc16
1 files changed, 6 insertions, 10 deletions
diff --git a/.zshrc b/.zshrc
index 00565ca..e17ebd2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -8,6 +8,8 @@ stty -echo
ZDOTDIR="$HOME/.zsh"
+export LC_ALL=en_US.utf8
+
export PATH=$HOME/bin:$PATH
if [[ -d $HOME/misc/scripts ]]; then
export PATH=${HOME}/misc/scripts:${PATH}
@@ -214,12 +216,7 @@ prompt_eof_setup() {
prompt_eof_setup "$@"
# }}}
# Prompt {{{
-EXITCODE="%(?..(%?%1) )"
-# function to show the current git branch in prompt
-parse_git_branch() {
- git branch 2> /dev/null | sed -n 's/\* \(.*\)/\(\1\)/p'
-}
# necessary if you want to use functions in the prompt
# without this they wouldn't be run again
#precmd () {
@@ -232,11 +229,9 @@ else
fi
local host_color=$p_GREEN
local path_color=$p_BLUE
-local gitbranch_color=$p_magenta
-local exitcode_color=$p_red
PROMPT="${username_color}$USERNAME${p_nc}@${host_color}%m${p_nc}\
- ${path_color}%~${p_nc} ${gitbranch_color}"'$(parse_git_branch)'"${p_nc}
-${exitcode_color}$EXITCODE${p_nc}> "
+ ${path_color}%~${p_nc}
+> "
#}
## Spelling prompt
@@ -552,9 +547,10 @@ setopt inc_append_history
setopt no_bg_nice
setopt share_history
setopt bang_hist
-setopt extended_history
+setopt no_extended_history
setopt hist_reduce_blanks
setopt hist_ignore_space
+setopt hist_find_no_dups
setopt nohistverify
setopt prompt_subst
setopt hist_fcntl_lock