X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=b16a5ca5918138e40de74fc8a46d77b7d4aa7691;hb=044ed79a3c32ea656b80a3dc933400e585e23d67;hp=18ffa0ca062159a0a1235706df889816ecb53d46;hpb=4bc13409c58702de4e6d90de9e45705cac20e3f6;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 18ffa0c..b16a5ca 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -4,6 +4,9 @@
 # Use Vi(m) style key bindings.
 bindkey -v
 
+# Be paranoid, new files are readable/writable by me only.
+umask 077
+
 # Use history and store it in ~/.zsh/history.
 HISTSIZE=1000
 SAVEHIST=1000
@@ -29,19 +32,24 @@ setopt autocd
 # one.
 setopt correct
 
-# Use colorized output.
+# Use colorized output, necessary for prompts and completions.
 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.
 autoload -U compinit && compinit
+# Load the complist module which provides additions to completion lists
+# (coloring, scrollable).
+zmodload zsh/complist
 # Make sure the list of possible completions is displayed after pressing <TAB>
 # the first time.
 setopt nolistambiguous
@@ -57,10 +65,18 @@ zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
 zstyle ':completion:*:functions' ignored-patterns '_*'
 # Ignore parent directory.
 zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
+# Use ls like colors for completions.
+zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+# Make completion lists scrollable so "do you wish to see all n possibilities"
+# is no longer displayed.
+zstyle ':completion:*' list-prompt '%p'
 
 # Enable zsh's extended glob abilities.
 setopt extendedglob
 
+# Don't exit if <C-d> 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
@@ -82,6 +98,17 @@ alias -g G='| grep'
 
 # Improved ls which displays the files in columns (-C), visualises directories,
 # links and other special files (-F) and pages everything through less (L).
+#
+# If available use GNU ls with colorized output. If it isn't available use
+# normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
+# pager.
+ls --color &> /dev/null
+if [[ $? -eq 0 ]]; then
+    alias ls='ls --color'
+else
+    alias ls='CLICOLOR_FORCE=1 ls -G'
+fi
+# Main ls function.
 function ls() {
     command ls -C -F $* L
 }
@@ -95,11 +122,5 @@ function ll() {
 }
 
 
-# If a rc.local file exists load it, otherwise load a rc file for the current
-# hostname (first part before a dot) if it exists.
-host=${$(hostname)//.*/}
-if [[ -f ~/.zsh/rc.local ]]; then;
-    source ~/.zsh/rc.local
-elif [[ -f ~/.zsh/rc.$host ]]; then;
-    source ~/.zsh/rc.$host
-fi
+# Load rc file for current hostname (first part before a dot) or rc.local.
+source_config ~/.zsh "" rc ${$(hostname)//.*/}