X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Fenv;h=2eced63afa66170440ccbd1b9ac8137331d62eb2;hb=b7ff27cb60530eeebcfb9bdef1b68f548e1d88ed;hp=93480281f2fe9c1ffe23ae467cc83088d7fc165c;hpb=df39157fd0b6c0ea512beb2a57cf8c6f88c5db11;p=config%2Fdotfiles.git

diff --git a/zsh/env b/zsh/env
index 9348028..2eced63 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,38 +1,35 @@
 # Zsh configuration file for environment related options.
 
 
-# Get the current hostname (first part before a dot).
-host=${$(hostname)//.*/}
+. ~/.shell/functions
 
-# Load environmental related settings used by all shells.
-if [[ -f ~/.shell/env ]]; then
-    . ~/.shell/env
-# Fallback functions as ~/.shell/env couldn't be loaded.
-else
-    function source_debug() {
-        echo $@
-    }
-    function source_config() {
-        echo "Couldn't load source_config(), can't source files." >&2
-    }
-fi
+source_debug ". ~/.zsh/env"
 
-source_debug "sourcing ~/.zsh/env"
+source_config ~/.shell/env
 
 
 # Make sure elements in PATH are unique.
 typeset -U path PATH
 
+# Color man pages viewed with less, thanks to
+# http://nion.modprobe.de/blog/archives/572-less-colors-for-man-pages.html
+#
+# Color bold strings in bold blue.
+export LESS_TERMCAP_md=$'\e[01;34m'
+export LESS_TERMCAP_me=$'\e[0m'
+# Color underlined strings in bold yellow and underlined.
+export LESS_TERMCAP_us=$'\e[04;1;33m'
+export LESS_TERMCAP_ue=$'\e[0m'
 
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
 
-# Load rc file for current OS.
-source_config ~/.zsh os env $(uname) nolocal
-# Load env file for current hostname (first part before a dot) or env.local.
-source_config ~/.zsh host env $host
+# Setup lesspipe to view multiple file-types (like .gz, .zip, etc.) with less.
+# Useful in combination with the "p" alias. Taken from Debian's default bash
+# files. Thanks.
+[[ -x /usr/bin/lesspipe ]] && eval "$(SHELL=/bin/sh lesspipe)"
 
-source_debug "finished sourcing ~/.zsh/env"
+
+source_config ~/.zsh/env.local
+
+source_debug ". ~/.zsh/env (done)"
 
 # vim: ft=zsh