Cleanup ZSH config

.zsh/functions/Makefile

@@ -1,7 +1,4 @@
 SUBDIR=functions
-objects=chpwd_show_todo chpwd_update_git_vars env get_cnt line \
+objects=env venv add-to-list
-	precmd_maybe_festival precmd_update_git_vars precmd_update_updates \
-	preexec_update_vars prompt prompt_git_info rprompt \
-	update_current_git_vars welcome venv add-to-list
 
 include ../../dotfiles.mk

.zsh/functions/chpwd_show_todo

@@ -1,7 +0,0 @@
-# -*- mode: Shell-script -*-
-
-if [ -e ".toudou" ]; then
-    toudou
-elif [ "$PWD" = "$HOME" ]; then
-    toudou list -g
-fi

.zsh/functions/chpwd_update_git_vars

@@ -1,2 +0,0 @@
-# -*- mode: shell-script -*-
-update_current_git_vars

.zsh/functions/env

@@ -1,3 +1,3 @@
 # -*- mode: shell-script -*-
 
-/usr/bin/env "$@" | grep -v ^LESS_TERMCAP_
+/usr/bin/env "$@" | grep -v \^LESS_TERMCAP_

.zsh/functions/get_cnt

@@ -1,15 +0,0 @@
-# -*- mode: shell-script -*-
-
-if [ -n "$1" ]; then
-    if [ -e "$HOME/.local/share/$1.cnt" ]; then
-        cnt=$(/bin/cat "$HOME/.local/share/$1.cnt")
-    fi
-
-    if [ -z "$cnt" ]; then
-        cnt=0
-    fi
-
-    echo $cnt
-else
-    echo "No count name specified" >&2
-fi

.zsh/functions/line

@@ -1,8 +0,0 @@
-# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
-
-let start=$(expr $1 + 1)
-let width=$(expr $COLUMNS - $2)
-
-for i in {$start..$width}; do
-    echo -n \\x2d
-done

.zsh/functions/precmd_maybe_festival

@@ -1,15 +0,0 @@
-cmdstatus=$?
-
-if [ -n "$__COMMAND_EXECUTING" -a $__COMMAND_EXECUTING -gt 0 \
-        -a -n "$__COMMAND_EXEC_TIME" ]; then
-    __COMMAND_EXECUTING=0
-    duration=$(expr $(date +%s) - $__COMMAND_EXEC_TIME)
-
-    if [ $duration -gt 30 ]; then
-        if [ $cmdstatus -eq 0 ]; then
-            echo "done" | festival --tts
-        else
-            echo "failed" | festival --tts
-        fi
-    fi
-fi

.zsh/functions/precmd_update_git_vars

@@ -1,6 +0,0 @@
-# -*- mode: shell-script -*-
-
-if [ -n "$__EXECUTED_GIT_COMMAND" ]; then
-    update_current_git_vars
-    unset __EXECUTED_GIT_COMMAND
-fi

.zsh/functions/precmd_update_updates

@@ -1,11 +0,0 @@
-# -*- mode: shell-script -*-
-
-if [ -n "$__EXECUTED_PACMAN_COMMAND" ]; then
-    update_pac_cnt
-    unset __EXECUTED_PACMAN_COMMAND
-fi
-
-if [ -n "$__EXECUTED_COWER_COMMAND" ]; then
-    update_aur_cnt
-    unset __EXECUTED_COWER_COMMAND
-fi

.zsh/functions/preexec_update_vars

@@ -1,16 +0,0 @@
-# -*- mode: shell-script -*-
-
-case "$1" in
-    git*)
-        __EXECUTED_GIT_COMMAND=1
-        ;;
-    cower*)
-        __EXECUTED_COWER_COMMAND=1
-        ;;
-    *pacman*)
-        __EXECUTED_PACMAN_COMMAND=1
-        ;;
-esac
-
-__COMMAND_EXEC_TIME=$(date +%s)
-__COMMAND_EXECUTING=1

.zsh/functions/prompt

@@ -1,15 +0,0 @@
-# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
-
-local pac_cnt=$(get_cnt updates)
-local aur_cnt=$(get_cnt aur)
-local hostname=$(hostname | cut -d . -f 1)
-
-if [ $pac_cnt -gt 0 -o $aur_cnt -gt 0 ]; then
-    printf "%s%d%s/%s%d%s:" \
-        "%{${fg[cyan]}%}" $pac_cnt "%{${fg[default]}%}" \
-        "%{${fg[cyan]}%}" $aur_cnt "%{${fg[default]}%}"
-fi
-
-printf '%s%s%s:%s%s%s%s ' \
-    "%{${fg[magenta]}%}" $hostname "%{${fg[default]}%}" \
-    "%(?.%{${fg[green]}%}.%{${fg[red]}%})" "%~" "%{${fg[default]}%}"

.zsh/functions/prompt_git_info

@@ -1,23 +0,0 @@
-# -*- mode: shell-script -*-
-
-if [ -n "$__CURRENT_GIT_BRANCH" ]; then
-    local s="("
-    s+="$__CURRENT_GIT_BRANCH"
-    case "$__CURRENT_GIT_BRANCH_STATUS" in
-        ahead)
-            s+="↑"
-            ;;
-        diverged)
-            s+="↕"
-            ;;
-        behind)
-            s+="↓"
-            ;;
-    esac
-    if [ -n "$__CURRENT_GIT_BRANCH_IS_DIRTY" ]; then
-        s+="⚡"
-    fi
-    s+=")"
-
-    printf " %s%s" "%{${fg[yellow]}%}" $s
-fi

.zsh/functions/rprompt

@@ -1,4 +0,0 @@
-# -*- mode: shell-script -*-
-
-local git_info="$(prompt_git_info)"
-printf '%s%s' $git_info "%{${fg[default]}%}"

.zsh/functions/update_current_git_vars

@@ -1,30 +0,0 @@
-# -*- mode: Shell-script -*-
-unset __CURRENT_GIT_BRANCH
-unset __CURRENT_GIT_BRANCH_STATUS
-unset __CURRENT_GIT_BRANCH_IS_DIRTY
-
-local st="$(git status 2>/dev/null)"
-if [[ -n "$st" ]]; then
-    local -a arr
-    arr=(${(f)st})
-
-    if [[ $arr[1] =~ 'Not currently on any branch.' ]]; then
-        __CURRENT_GIT_BRANCH='no-branch'
-    else
-        __CURRENT_GIT_BRANCH="${arr[1][(w)4]}"
-    fi
-
-    if [[ $arr[2] =~ 'Your branch is' ]]; then
-        if [[ $arr[2] =~ 'ahead' ]]; then
-            __CURRENT_GIT_BRANCH_STATUS='ahead'
-        elif [[ $arr[2] =~ 'devirged' ]]; then
-            __CURRENT_GIT_BRANCH_STATUS='diverged'
-        else
-            __CURRENT_GIT_BRANCH_STATUS='behind'
-        fi
-    fi
-
-    if [[ ! $st =~ 'nothing to commit' ]]; then
-        __CURRENT_GIT_BRANCH_IS_DIRTY='1'
-    fi
-fi

.zsh/functions/welcome

@@ -1,10 +0,0 @@
-# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
-
-echo "        ,                       _     _ _                      |"
-echo "       /#\\        __ _ _ __ ___| |__ | (_)_ __  _   ___  __    |"
-echo "      /###\\      / _\` | '__/ __| '_ \\| | | '_ \\| | | \\ \\/ /    |"
-echo "     /#####\\    | (_| | | | (__| | | | | | | | | |_| |>  <     |"
-echo "    /##,-,##\\    \\__,_|_|  \\___|_| |_|_|_|_| |_|\\__,_/_/\\_\\    |"
-echo "   /##(   )##\\                                                 |"
-echo "  /#.--   --.#\\   A simple, lightweight linux distribution.    |"
-echo " /\`           \`\\                                               |"

.zshrc

@@ -35,7 +35,7 @@ alias mysql="mysql --pager"
 alias -s pdf="zathura"
 alias -s xls="libreoffice"
 
-setopt notify
+setopt NOTIFY
 setopt PROMPT_SUBST             # Allow for functions in the prompt
 setopt EXTENDED_GLOB
 
@@ -46,12 +46,7 @@ typeset -ga preexec_functions
 typeset -ga precmd_functions
 typeset -ga chpwd_functions
 
-add-zsh-hook preexec preexec_update_vars
-add-zsh-hook precmd precmd_update_git_vars
-add-zsh-hook precmd precmd_update_updates
-add-zsh-hook precmd precmd_maybe_festival
 add-zsh-hook precmd vcs_info
-add-zsh-hook chpwd chpwd_update_git_vars
 
 zstyle ':vcs_info:*' actionformats '%B%F{1}%a%f%%b (%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f'
 zstyle ':vcs_info:*' enable bzr git hg svn