From 6c2db7df0e40962537ce74d6f6213fac1782bd1b Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Wed, 15 May 2013 17:35:51 +0200 Subject: Update dotfiles --- .zsh/Makefile | 2 +- .zsh/functions/Makefile | 7 ++----- .zsh/functions/add-to-list | 10 ++++++++++ .zsh/functions/chpwd_show_todo | 7 ------- .zsh/functions/chpwd_update_git_vars | 2 -- .zsh/functions/env | 2 +- .zsh/functions/get_cnt | 15 --------------- .zsh/functions/line | 8 -------- .zsh/functions/precmd_maybe_festival | 15 --------------- .zsh/functions/precmd_update_git_vars | 6 ------ .zsh/functions/precmd_update_updates | 11 ----------- .zsh/functions/preexec_update_vars | 16 ---------------- .zsh/functions/prompt | 15 --------------- .zsh/functions/prompt_git_info | 23 ----------------------- .zsh/functions/rprompt | 4 ---- .zsh/functions/update_current_git_vars | 30 ------------------------------ .zsh/functions/welcome | 10 ---------- 17 files changed, 14 insertions(+), 169 deletions(-) create mode 100644 .zsh/functions/add-to-list delete mode 100644 .zsh/functions/chpwd_show_todo delete mode 100755 .zsh/functions/chpwd_update_git_vars delete mode 100644 .zsh/functions/get_cnt delete mode 100644 .zsh/functions/line delete mode 100644 .zsh/functions/precmd_maybe_festival delete mode 100755 .zsh/functions/precmd_update_git_vars delete mode 100644 .zsh/functions/precmd_update_updates delete mode 100644 .zsh/functions/preexec_update_vars delete mode 100644 .zsh/functions/prompt delete mode 100755 .zsh/functions/prompt_git_info delete mode 100644 .zsh/functions/rprompt delete mode 100755 .zsh/functions/update_current_git_vars delete mode 100644 .zsh/functions/welcome (limited to '.zsh') diff --git a/.zsh/Makefile b/.zsh/Makefile index 077367e..acd5e4e 100644 --- a/.zsh/Makefile +++ b/.zsh/Makefile @@ -1,4 +1,4 @@ -DESTDIR:=$(DESTDIR)/.zsh +SUBDIR=.zsh modules=functions include ../dotfiles.mk diff --git a/.zsh/functions/Makefile b/.zsh/functions/Makefile index baf5c6b..f71df23 100644 --- a/.zsh/functions/Makefile +++ b/.zsh/functions/Makefile @@ -1,7 +1,4 @@ -DESTDIR:=$(DESTDIR)/functions -objects=chpwd_show_todo chpwd_update_git_vars env get_cnt line \ - precmd_maybe_festival precmd_update_git_vars precmd_update_updates \ - preexec_update_vars prompt prompt_git_info rprompt \ - update_current_git_vars welcome venv +SUBDIR=functions +objects=env venv add-to-list include ../../dotfiles.mk diff --git a/.zsh/functions/add-to-list b/.zsh/functions/add-to-list new file mode 100644 index 0000000..18720e0 --- /dev/null +++ b/.zsh/functions/add-to-list @@ -0,0 +1,10 @@ +# -*- mode: sh; -*- +if [[ ! "${(P)${1}}" =~ (^|:)"$2"(:|$) ]]; then + if [ -n "$3" ]; then + # Append + typeset -g $1="${(P)${1}}:$2" + else + # Prepend + typeset -g $1="$2:${(P)${1}}" + fi +fi diff --git a/.zsh/functions/chpwd_show_todo b/.zsh/functions/chpwd_show_todo deleted file mode 100644 index 88ee853..0000000 --- a/.zsh/functions/chpwd_show_todo +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: Shell-script -*- - -if [ -e ".toudou" ]; then - toudou -elif [ "$PWD" = "$HOME" ]; then - toudou list -g -fi diff --git a/.zsh/functions/chpwd_update_git_vars b/.zsh/functions/chpwd_update_git_vars deleted file mode 100755 index 0ef846a..0000000 --- a/.zsh/functions/chpwd_update_git_vars +++ /dev/null @@ -1,2 +0,0 @@ -# -*- mode: shell-script -*- -update_current_git_vars diff --git a/.zsh/functions/env b/.zsh/functions/env index 6eb728a..a79fd5d 100644 --- a/.zsh/functions/env +++ b/.zsh/functions/env @@ -1,3 +1,3 @@ # -*- mode: shell-script -*- -/usr/bin/env "$@" | grep -v ^LESS_TERMCAP_ +/usr/bin/env "$@" | grep -v \^LESS_TERMCAP_ diff --git a/.zsh/functions/get_cnt b/.zsh/functions/get_cnt deleted file mode 100644 index 5fc3d4f..0000000 --- a/.zsh/functions/get_cnt +++ /dev/null @@ -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 diff --git a/.zsh/functions/line b/.zsh/functions/line deleted file mode 100644 index 58f7aed..0000000 --- a/.zsh/functions/line +++ /dev/null @@ -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 diff --git a/.zsh/functions/precmd_maybe_festival b/.zsh/functions/precmd_maybe_festival deleted file mode 100644 index 3f8baa3..0000000 --- a/.zsh/functions/precmd_maybe_festival +++ /dev/null @@ -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 diff --git a/.zsh/functions/precmd_update_git_vars b/.zsh/functions/precmd_update_git_vars deleted file mode 100755 index 172456a..0000000 --- a/.zsh/functions/precmd_update_git_vars +++ /dev/null @@ -1,6 +0,0 @@ -# -*- mode: shell-script -*- - -if [ -n "$__EXECUTED_GIT_COMMAND" ]; then - update_current_git_vars - unset __EXECUTED_GIT_COMMAND -fi diff --git a/.zsh/functions/precmd_update_updates b/.zsh/functions/precmd_update_updates deleted file mode 100644 index 639fd5c..0000000 --- a/.zsh/functions/precmd_update_updates +++ /dev/null @@ -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 diff --git a/.zsh/functions/preexec_update_vars b/.zsh/functions/preexec_update_vars deleted file mode 100644 index f8c1b44..0000000 --- a/.zsh/functions/preexec_update_vars +++ /dev/null @@ -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 diff --git a/.zsh/functions/prompt b/.zsh/functions/prompt deleted file mode 100644 index 6fe927b..0000000 --- a/.zsh/functions/prompt +++ /dev/null @@ -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]}%}" diff --git a/.zsh/functions/prompt_git_info b/.zsh/functions/prompt_git_info deleted file mode 100755 index 76d889a..0000000 --- a/.zsh/functions/prompt_git_info +++ /dev/null @@ -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 diff --git a/.zsh/functions/rprompt b/.zsh/functions/rprompt deleted file mode 100644 index 3392379..0000000 --- a/.zsh/functions/rprompt +++ /dev/null @@ -1,4 +0,0 @@ -# -*- mode: shell-script -*- - -local git_info="$(prompt_git_info)" -printf '%s%s' $git_info "%{${fg[default]}%}" diff --git a/.zsh/functions/update_current_git_vars b/.zsh/functions/update_current_git_vars deleted file mode 100755 index 71f37e7..0000000 --- a/.zsh/functions/update_current_git_vars +++ /dev/null @@ -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 diff --git a/.zsh/functions/welcome b/.zsh/functions/welcome deleted file mode 100644 index bd6aacd..0000000 --- a/.zsh/functions/welcome +++ /dev/null @@ -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 " /\` \`\\ |" -- cgit v1.2.3-54-g00ecf