actually set PINENTRY_USER_DATA, fix invocation

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 96f14c5157c4db28a88f3a8a8cba4c6d34181150..644e1789e8a43a72b8585fa345ae31fd17bfad50 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -1,9 +1,6 @@
 ### imports
 source ~/bin/.check-busybox
 
-### user-local fpath
-fpath=(~/.zsh ~/.zsh/functions/Prompts "${fpath[@]}")
-
 ### options
 setopt NO_BEEP NO_CLOBBER
 ## cd
@@ -18,9 +15,6 @@ setopt PROMPT_SUBST
 setopt AUTO_CONTINUE
 ## history
 setopt NO_HIST_SAVE_BY_COPY HIST_IGNORE_DUPS SHARE_HISTORY
-HISTFILE=~/.histfile
-HISTSIZE=1000
-SAVEHIST=1000
 
 ### keys
 bindkey -v
@@ -54,6 +48,7 @@ if [[ "$OSTYPE" =~ '^(free|net)bsd' ]] {
 } else {
     alias ll="ls -lAFh"
 }
+alias se=sudoedit
 ## ps
 local p=
 if which pstree >/dev/null 2>&1 && ! check-busybox pstree; then
@@ -131,6 +126,10 @@ case "$OSTYPE"; in
         bindkey    "^[[F" end-of-line        #End
         bindkey -a "^[[F" end-of-line
 
+        # colors
+        export CLICOLOR=
+        export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
+
         ## sound
         function s { sysctl hw.snd.default_unit${1:+\=$1} }
         alias vol mixer
@@ -178,14 +177,13 @@ esac
 
 ### modules & styles
 ## vcs
-autoload -Uz vcs_info
 zstyle ':vcs_info:*' enable git
 #zstyle ':vcs_info:git*' check-for-changes true #too slow
 zstyle ':vcs_info:git*:dotfiles' check-for-changes true
 zstyle ':vcs_info:git*' check-for-staged-changes true
+autoload -Uz vcs_info
 
 ## compinit
-# The following lines were added by compinstall
 zstyle ':completion:*' auto-description '[arg] %d'
 zstyle ':completion:*' expand suffix
 zstyle ':completion:*' format '# %d'
@@ -200,17 +198,15 @@ zstyle ':completion:*' menu select=1
 zstyle ':completion:*' original false
 zstyle ':completion:*' select-prompt '%B%l%b'
 zstyle ':completion:*' verbose true
-zstyle :compinstall filename '/home/ds6/.zshrc'
-
-autoload -Uz compinit
-compinit
-# End of lines added by compinstall
+autoload -Uz compinit && compinit
 
 ## prompt
-# do this last so prompt can potentially override
+# do this last so prompt can potentially override other settings
 autoload -Uz promptinit && promptinit
 prompt arrows
 
+### load site-specific
+if [[ -f ~/.zshrc.local ]] { source ~/.zshrc.local }
 
 ### unset imports
 unfunction check-busybox