update submodules, cache icons when installing

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 6cbdfe0e31788b66d05a3d7856212d2c73b2c2aa..eec9016b9b2cb3fa1dc5bda1d0c85dba38990559 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -1,15 +1,26 @@
+### imports
+source ~/bin/.check-busybox
+

 ### user-local fpath
 fpath=(~/.zsh ~/.zsh/functions/Prompts "${fpath[@]}")
 
 ### options
 ### user-local fpath
 fpath=(~/.zsh ~/.zsh/functions/Prompts "${fpath[@]}")
 
 ### options

-setopt autocd extendedglob promptsubst
-unsetopt beep
-
-### history
-setopt appendhistory
+setopt NO_BEEP NO_CLOBBER
+## cd
+setopt AUTO_CD CDABLE_VARS
+## completion
+setopt GLOB_COMPLETE
+## line
+setopt EXTENDED_GLOB GLOB_DOTS MARK_DIRS NOMATCH NUMERIC_GLOB_SORT
+## prompt
+setopt PROMPT_SUBST
+## jobs
+setopt AUTO_CONTINUE
+## history
+setopt NO_HIST_SAVE_BY_COPY HIST_IGNORE_DUPS SHARE_HISTORY

 HISTFILE=~/.histfile
 HISTFILE=~/.histfile

-HISTSIZE=100
-SAVEHIST=100
+HISTSIZE=1000
+SAVEHIST=1000

 
 ### keys
 bindkey -v
 
 ### keys
 bindkey -v


@@ -45,14 +56,13 @@ if [[ "$OSTYPE" =~ '^(free|net)bsd' ]] {
 }
 ## ps
 local p=
 }
 ## ps
 local p=

-if { which pstree >/dev/null 2>&1 && \
-  [[ ! "$(readlink -f $(which pstree))" =~ "/busybox" ]] } {
+if which pstree >/dev/null 2>&1 && ! check-busybox pstree {

     # use pstree, but NOT busybox pstree because it kinda sucks
     p="pstree -wg3"
 } elif [[ "$OSTYPE" =~ '^freebsd' ]] {
     p="ps -aSdfxwwouser=USR -ogroup=GRP -opid,nice=NI \
        -o%cpu,%mem,tty,stat,start=START -oetime,command"
     # use pstree, but NOT busybox pstree because it kinda sucks
     p="pstree -wg3"
 } elif [[ "$OSTYPE" =~ '^freebsd' ]] {
     p="ps -aSdfxwwouser=USR -ogroup=GRP -opid,nice=NI \
        -o%cpu,%mem,tty,stat,start=START -oetime,command"

-} elif [[ "$(readlink -f $(which ps))" =~ "/busybox" ]] {
+} elif check-busybox ps {

     # busybox compatible
     p="ps -eouser='USR     ' -ogroup='GRP     ' \
        -opid='  PID' -onice=' NI' -ovsz=' MEM' \
     # busybox compatible
     p="ps -eouser='USR     ' -ogroup='GRP     ' \
        -opid='  PID' -onice=' NI' -ovsz=' MEM' \


@@ -159,6 +169,7 @@ case "$OSTYPE"; in
         ## sound
         # TODO: test alsa/oss/sndio/portaudio/pulse in order of importance
         function s() {}
         ## sound
         # TODO: test alsa/oss/sndio/portaudio/pulse in order of importance
         function s() {}

+        function vol() {}

 esac
 
 ### modules & styles
 esac
 
 ### modules & styles


@@ -196,4 +207,8 @@ compinit
 autoload -Uz promptinit && promptinit
 prompt ds6
 
 autoload -Uz promptinit && promptinit
 prompt ds6
 

+
+### unset imports
+unfunction check-busybox
+

 # vim: set et sts=4 sw=4 ts=8 tw=79 :
 # vim: set et sts=4 sw=4 ts=8 tw=79 :