urxvt block cursor + root term; zsh, dunst changes

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 51f3a34c618bce353f58410c23f080194b473e2d..51fcf1e4557612dfd003ca767aa9a068e89b9d14 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -5,22 +5,56 @@ zstyle ':vcs_info:*' get-revision true
 zstyle ':vcs_info:git*' formats "(%F{green}%r/%b%f) %m%u%c "
 
 function precmd {
-    print -Pn "\e]0;${SSH_CLIENT+$USER@$HOST}%#zsh%(1j,:%j,):%~\a"
+    print -Pn "\e]0;%(1j,%j,)%#${SSH_CLIENT+$USER@$HOST}:%~\a"
     vcs_info
     if ((SECONDS - _exectime >= 5)) {
-        # bell after long exec
+        # bell if exec takes 5s
         print "\a"
     }
 }
 function preexec {
-    printf "\033]0;%s\a" "$1"
+    # change Xorg title
+    print -Pnf "\033]0;%s\a" "%#$1"
+    # save last exec time
     _exectime=$SECONDS
 }
 
+# options
+setopt autocd extendedglob
+unsetopt beep
+
+# history
+setopt appendhistory
+HISTFILE=~/.histfile
+HISTSIZE=100
+SAVEHIST=100
+
+# keys
+bindkey -v
+# xorg
+bindkey    "^[[7~" beginning-of-line #Home
+bindkey -a "^[[7~" beginning-of-line
+bindkey    "^[[8~" end-of-line       #End
+bindkey -a "^[[8~" end-of-line
+bindkey    "^[[3~" delete-char       #Del
+bindkey -a "^[[3~" delete-char
+# bsd vt
+bindkey    "^[[H" beginning-of-line #Home
+bindkey -a "^[[H" beginning-of-line
+bindkey    "^[[F" end-of-line       #End
+bindkey -a "^[[F" end-of-line
+
+autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search
+[[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
+[[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
+
 # prompt
 setopt prompt_subst
 PROMPT='%F{$VICOL}%n%f@%F{$VICOL}%m%f%(?../%F{red}$?%f)%# '
 RPROMPT='${vcs_info_msg_0_}%F{yellow}%~%f %T'
+KEYTIMEOUT=1
 
 function zle-line-init zle-keymap-select {
     VICOL="${${KEYMAP:/vicmd/red}:/(main|viins)/green}"
@@ -32,11 +66,12 @@ zle -N zle-keymap-select
 # common aliases
 alias h="history -25"
 alias j="jobs -l"
-alias la="ls -aF"
-alias lf="ls -AF"
-alias ll="ls -lhAF"
+alias la="ls -AF"
+alias lf="ls -Fdf .* [A-Z]* [^A-Z]*"
+alias ll="ls -AFlho"
+alias LL="ls -Flhodf .* [A-Z]* [^A-Z]*"
 alias pa="sudo ps -Sudax"
-function s { sysctl hw.snd.default_unit=$1 }
+function s { sysctl hw.snd.default_unit${1:+=$1} }
 
 # be paranoid
 alias cp='cp -ip'
@@ -54,23 +89,10 @@ function portpkg {
             echo "Usage: \`portpkg <build|run>' in a port directory"
             return 1;;
     }
-    sudo pkg install -AU $(make ${1}-depends-list | sed 's_/usr/ports/_ _' | tr -d '\n')
+    sudo pkg install -AU $(make ${1}-depends-list |
+                           sed 's_/usr/ports/_ _' | tr -d '\n')
 }
 
-# keys
-bindkey "^[[7~" beginning-of-line #Home
-bindkey "^[[8~" end-of-line       #End
-bindkey "^[[3~" delete-char       #Del
-# vt keys
-bindkey "^[[H" beginning-of-line #Home
-bindkey "^[[F" end-of-line       #End
-
-autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-[[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
-[[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
-
 # The following lines were added by compinstall
 zstyle ':completion:*' auto-description 'specify: %d'
 zstyle ':completion:*' expand suffix
@@ -92,13 +114,4 @@ autoload -Uz compinit
 compinit
 # End of lines added by compinstall
 
-# Lines configured by zsh-newuser-install
-HISTFILE=~/.histfile
-HISTSIZE=100
-SAVEHIST=100
-setopt appendhistory autocd extendedglob
-unsetopt beep
-bindkey -v
-# End of lines configured by zsh-newuser-install
-
 # vim: ts=8:sts=4:sw=4:et:tw=79