X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=618e7d1d9d9a2c72a0bb44e7b1272ca261f5c35e;hb=9cf091bb3e53c11fea5ba956d724fd8806cd2a0d;hp=76d0b29830b67ff65a72f58302025d5417a340d0;hpb=0cff6e93883566cedfc863e615887339514553aa;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 76d0b29..618e7d1 100644 --- a/zsh/rc +++ b/zsh/rc @@ -36,12 +36,13 @@ setopt correct autoload -U colors && colors # Set the default prompt. The current host and working directory is displayed, -# the exit code of the last command if it wasn't 0 and a + if this shell is -# running inside another shell. +# the exit code of the last command if it wasn't 0, the number of running jobs +# if not 0 and a + if this shell is running inside another shell. # The prompt is in green and blue to make easily detectable, the error exit -# code in red and bold. +# code in red and bold and the job count in yellow. PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\ -%{${fg[blue]}%}%B%~%b%{${fg[default]}%} %(2L.+.)%# \ +%{${fg[blue]}%}%B%~%b%{${fg[default]}%} \ +%(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \ %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )" # Use new completion system. @@ -73,6 +74,9 @@ zstyle ':completion:*' list-prompt '%p' # Enable zsh's extended glob abilities. setopt extendedglob +# Don't exit if is pressed. +setopt ignoreeof + # If ^C is pressed while typing a command, add it to the history so it can be # easily retrieved later and then abort like ^C normally does. This is useful # when I want to abort an command to do something in between and then finish @@ -107,11 +111,5 @@ function ll() { } -# If a rc file for the current hostname (first part before a dot) exists load -# it, otherwise load rc.local if available. -host=${$(hostname)//.*/} -if [[ -f ~/.zsh/rc.$host ]]; then; - source ~/.zsh/rc.$host -elif [[ -f ~/.zsh/rc.local ]]; then; - source ~/.zsh/rc.local -fi +# Load rc file for current hostname (first part before a dot) or rc.local. +source_config ~/.zsh "" rc ${$(hostname)//.*/}