diff options
author | Tom Willemse | 2014-08-21 00:14:54 +0200 |
---|---|---|
committer | Tom Willemse | 2014-08-21 00:14:54 +0200 |
commit | e53667c7ee8d6fde268dfd48b308f0e38f729013 (patch) | |
tree | 585e20f63c73ac4f0d059c2321edb29ac1454925 /zsh | |
parent | 98b55322b42c784580b6e6fc787d7ce97af033d8 (diff) | |
download | dotfiles-e53667c7ee8d6fde268dfd48b308f0e38f729013.tar.gz dotfiles-e53667c7ee8d6fde268dfd48b308f0e38f729013.zip |
Restore zsh config
Diffstat (limited to 'zsh')
l--------- | zsh/.bash_profile | 1 | ||||
-rw-r--r-- | zsh/.zprofile | 19 | ||||
-rw-r--r-- | zsh/.zsh/functions/add-to-list (renamed from zsh/functions/add-to-list) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/add_to_list (renamed from zsh/functions/add_to_list) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/chpwd_show_todo (renamed from zsh/functions/chpwd_show_todo) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/chpwd_update_git_vars (renamed from zsh/functions/chpwd_update_git_vars) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/emacs-backward-kill-word (renamed from zsh/functions/emacs-backward-kill-word) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/env (renamed from zsh/functions/env) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/get_cnt (renamed from zsh/functions/get_cnt) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/insert-sudo (renamed from zsh/functions/insert-sudo) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/line (renamed from zsh/functions/line) | 0 | ||||
-rwxr-xr-x | zsh/.zsh/functions/mailcount (renamed from zsh/functions/mailcount) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/precmd_maybe_festival (renamed from zsh/functions/precmd_maybe_festival) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/precmd_update_git_vars (renamed from zsh/functions/precmd_update_git_vars) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/precmd_update_updates (renamed from zsh/functions/precmd_update_updates) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/preexec_update_vars (renamed from zsh/functions/preexec_update_vars) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/prompt (renamed from zsh/functions/prompt) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/prompt_git_info (renamed from zsh/functions/prompt_git_info) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/rprompt (renamed from zsh/functions/rprompt) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/shorten-dir (renamed from zsh/functions/shorten-dir) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/update_current_git_vars (renamed from zsh/functions/update_current_git_vars) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/venv (renamed from zsh/functions/venv) | 0 | ||||
-rw-r--r-- | zsh/.zsh/functions/welcome (renamed from zsh/functions/welcome) | 0 | ||||
-rw-r--r-- | zsh/.zshrc | 155 |
24 files changed, 175 insertions, 0 deletions
diff --git a/zsh/.bash_profile b/zsh/.bash_profile new file mode 120000 index 0000000..c1abe3f --- /dev/null +++ b/zsh/.bash_profile @@ -0,0 +1 @@ +.zprofile
\ No newline at end of file diff --git a/zsh/.zprofile b/zsh/.zprofile new file mode 100644 index 0000000..290b7c1 --- /dev/null +++ b/zsh/.zprofile @@ -0,0 +1,19 @@ +export BROWSER=conkeror +export EDITOR="emacsclient -c -a emacs" + +PATH="$HOME/usr/bin:$PATH" +PATH="/usr/local/heroku/bin:$PATH" +export PATH + +INFOPATH="$HOME/documents/info:$INFOPATH" +INFOPATH="$HOME/.emacs.d/vendor-lisp/org/doc:$INFOPATH" +INFOPATH="$INFOPATH:/usr/share/info" +INFOPATH="$INFOPATH:/usr/local/share/info" +export INFOPATH + +DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/`id -u`/bus" +export DBUS_SESSION_BUS_ADDRESS + +if [ -z "$SSH_AGENT_PID" ]; then + eval `ssh-agent` +fi diff --git a/zsh/functions/add-to-list b/zsh/.zsh/functions/add-to-list index 18720e0..18720e0 100644 --- a/zsh/functions/add-to-list +++ b/zsh/.zsh/functions/add-to-list diff --git a/zsh/functions/add_to_list b/zsh/.zsh/functions/add_to_list index 801e662..801e662 100644 --- a/zsh/functions/add_to_list +++ b/zsh/.zsh/functions/add_to_list diff --git a/zsh/functions/chpwd_show_todo b/zsh/.zsh/functions/chpwd_show_todo index 88ee853..88ee853 100644 --- a/zsh/functions/chpwd_show_todo +++ b/zsh/.zsh/functions/chpwd_show_todo diff --git a/zsh/functions/chpwd_update_git_vars b/zsh/.zsh/functions/chpwd_update_git_vars index 0ef846a..0ef846a 100644 --- a/zsh/functions/chpwd_update_git_vars +++ b/zsh/.zsh/functions/chpwd_update_git_vars diff --git a/zsh/functions/emacs-backward-kill-word b/zsh/.zsh/functions/emacs-backward-kill-word index 8453454..8453454 100644 --- a/zsh/functions/emacs-backward-kill-word +++ b/zsh/.zsh/functions/emacs-backward-kill-word diff --git a/zsh/functions/env b/zsh/.zsh/functions/env index a79fd5d..a79fd5d 100644 --- a/zsh/functions/env +++ b/zsh/.zsh/functions/env diff --git a/zsh/functions/get_cnt b/zsh/.zsh/functions/get_cnt index 5fc3d4f..5fc3d4f 100644 --- a/zsh/functions/get_cnt +++ b/zsh/.zsh/functions/get_cnt diff --git a/zsh/functions/insert-sudo b/zsh/.zsh/functions/insert-sudo index 4fc68e6..4fc68e6 100644 --- a/zsh/functions/insert-sudo +++ b/zsh/.zsh/functions/insert-sudo diff --git a/zsh/functions/line b/zsh/.zsh/functions/line index 58f7aed..58f7aed 100644 --- a/zsh/functions/line +++ b/zsh/.zsh/functions/line diff --git a/zsh/functions/mailcount b/zsh/.zsh/functions/mailcount index afe6736..afe6736 100755 --- a/zsh/functions/mailcount +++ b/zsh/.zsh/functions/mailcount diff --git a/zsh/functions/precmd_maybe_festival b/zsh/.zsh/functions/precmd_maybe_festival index 3f8baa3..3f8baa3 100644 --- a/zsh/functions/precmd_maybe_festival +++ b/zsh/.zsh/functions/precmd_maybe_festival diff --git a/zsh/functions/precmd_update_git_vars b/zsh/.zsh/functions/precmd_update_git_vars index 172456a..172456a 100644 --- a/zsh/functions/precmd_update_git_vars +++ b/zsh/.zsh/functions/precmd_update_git_vars diff --git a/zsh/functions/precmd_update_updates b/zsh/.zsh/functions/precmd_update_updates index 639fd5c..639fd5c 100644 --- a/zsh/functions/precmd_update_updates +++ b/zsh/.zsh/functions/precmd_update_updates diff --git a/zsh/functions/preexec_update_vars b/zsh/.zsh/functions/preexec_update_vars index f8c1b44..f8c1b44 100644 --- a/zsh/functions/preexec_update_vars +++ b/zsh/.zsh/functions/preexec_update_vars diff --git a/zsh/functions/prompt b/zsh/.zsh/functions/prompt index 6fe927b..6fe927b 100644 --- a/zsh/functions/prompt +++ b/zsh/.zsh/functions/prompt diff --git a/zsh/functions/prompt_git_info b/zsh/.zsh/functions/prompt_git_info index 76d889a..76d889a 100644 --- a/zsh/functions/prompt_git_info +++ b/zsh/.zsh/functions/prompt_git_info diff --git a/zsh/functions/rprompt b/zsh/.zsh/functions/rprompt index 3392379..3392379 100644 --- a/zsh/functions/rprompt +++ b/zsh/.zsh/functions/rprompt diff --git a/zsh/functions/shorten-dir b/zsh/.zsh/functions/shorten-dir index a630971..a630971 100644 --- a/zsh/functions/shorten-dir +++ b/zsh/.zsh/functions/shorten-dir diff --git a/zsh/functions/update_current_git_vars b/zsh/.zsh/functions/update_current_git_vars index 71f37e7..71f37e7 100644 --- a/zsh/functions/update_current_git_vars +++ b/zsh/.zsh/functions/update_current_git_vars diff --git a/zsh/functions/venv b/zsh/.zsh/functions/venv index 03ec83d..03ec83d 100644 --- a/zsh/functions/venv +++ b/zsh/.zsh/functions/venv diff --git a/zsh/functions/welcome b/zsh/.zsh/functions/welcome index bd6aacd..bd6aacd 100644 --- a/zsh/functions/welcome +++ b/zsh/.zsh/functions/welcome diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 100644 index 0000000..5083a19 --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1,155 @@ +# -*- Mode: shell-script; -*- +autoload -Uz add-zsh-hook +autoload -Uz compinit +autoload -U colors +autoload -Uz vcs_info + +# Autoload zsh functions. +fpath=($HOME/.zsh/functions $fpath) +autoload -U $HOME/.zsh/functions/*(:t) + +# Setup variables +HISTFILE=$HOME/.zsh/histfile +HISTSIZE=1000 +SAVEHIST=1000 + +export LESS="iFXRS" +export LESS_TERMCAP_mb=$'\e[1;37m' +export LESS_TERMCAP_md=$'\e[1;37m' +export LESS_TERMCAP_me=$'\e[0m' +export LESS_TERMCAP_se=$'\e[0m' +export LESS_TERMCAP_so=$'\e[1;47;30m' +export LESS_TERMCAP_ue=$'\e[0m' +export LESS_TERMCAP_us=$'\e[0;36m' +export PAGER="less" + +# Aliases +alias alpine="alpine -p ""{imap.gmail.com/ssl/user=tom.willemsen@archlinux.us}remote_pinerc""" +alias evolus-pencil="/usr/lib/evolus-pencil-svn/evolus-pencil.sh" +alias grep="grep --color=always" +alias ls="ls -F --color=always" +alias mysql="mysql --pager" +alias sbcl="rlwrap sbcl" +alias scrot="/usr/bin/scrot -e 'mv \$f ~/pictures/screenshots/'" + +# Suffix aliases +alias -s pdf="zathura" +alias -s xls="libreoffice" + +setopt AUTO_PUSHD # Automatically add to directory stack +setopt CORRECT # Offer to correct my mistakes +setopt EXTENDED_GLOB # Add extra globbing patterns +setopt NOTIFY # Don't wait to show status of jobs +setopt PROMPT_SUBST # Allow for functions in the prompt +setopt HIST_IGNORE_ALL_DUPS # Don't story any duplicate commands + +zstyle :compinstall filename '$HOME/.zshrc' + +# Enable auto-execution of functions +typeset -ga preexec_functions +typeset -ga precmd_functions +typeset -ga chpwd_functions + +add-zsh-hook precmd vcs_info + +zstyle ':vcs_info:*' actionformats '%u%c %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 +zstyle ':vcs_info:*' formats '%u%c (%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f' +zstyle ':vcs_info:*' nvcsformats '%F{2}%~%f' +zstyle ':vcs_info:bzr:*' branchformat '%b' +zstyle ':vcs_info:git:*' check-for-changes 1 +zstyle ':vcs_info:*' stagedstr '%F{2}Δ%f' +zstyle ':vcs_info:*' unstagedstr '%F{1}Δ%f' + +# Set the prompt. +PROMPT='${vcs_info_msg_0_} +%B%(?.%F{2}.%F{1})→%b ' + +# Set terminal name to current running application +case $TERM in + eterm-color*) + # Make {{ansi,multi}-,}term change Emacs' `default-directory' + # and keep track of the current user and host. + precmd () { print -P "\eAnSiTu %n\n\eAnSiTc %~" } + ;; + rxvt*) + precmd () { print -Pn "\e]0;%m: %~\a" } + preexec () { print -Pn "\e]0;%m: $1\a" } + ;; + screen) + # Make screen show the current running command as window title + # or the shell if no command is running. The running command + # is presented as the first sequence of characters without a + # space on the given command line, possibly prefixed with + # `sudo '. + preexec () { print -Pn "\ek$(basename $1 | sed -e 's/^\(\(sudo \)\?[^ ]\+\).*/\1/')\e\\" } + precmd () { print -Pn "\ek$(basename $SHELL)\e\\" } + ;; +esac + +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" + +zle -N emacs-backward-kill-word +zle -N insert-sudo + +# Set terminal keys +bindkey "\e[1~" beginning-of-line +bindkey "\e[4~" end-of-line +bindkey "\e[5~" beginning-of-history +bindkey "\e[6~" end-of-history +bindkey "\e[3~" delete-char +bindkey "\e[2~" quoted-insert +bindkey "\e[5C" forward-word +bindkey "\e0c" emacs-forward-word +bindkey "\e[5D" backward-word +bindkey "\e0d" emacs-backward-word +bindkey "\e\e[C" forward-word +bindkey "\e\e[D" backward-word +## for rxvt +bindkey "\e[8~" end-of-line +bindkey "\e[7~" beginning-of-line +## for non RH/Debian xterm, can't hurt for RH/Debian xterm +bindkey "\e0H" beginning-of-line +bindkey "\e0F" end-of-line +## for freebsd console +bindkey "\e[H" beginning-of-line +bindkey "\e[F" end-of-line + +bindkey "^W" backward-delete-char +bindkey "^\b" emacs-backward-kill-word +bindkey "^[#" insert-sudo + +source /usr/share/zsh/scripts/antigen/antigen.zsh +antigen bundle zsh-users/zsh-syntax-highlighting + +# Show syntax highlighting when we're not running in emacs +if [ -z $EMACS ]; then + # source $HOME/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh + + ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets) + + ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red' + ZSH_HIGHLIGHT_STYLES[builtin]='fg=cyan' + ZSH_HIGHLIGHT_STYLES[function]='fg=blue' + ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue' + ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue' + ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=cyan' + ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=cyan' + ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=cyan' + ZSH_HIGHLIGHT_STYLES[assign]='fg=yellow' + + ZSH_HIGHLIGHT_STYLES[bracket-level-1]='fg=red' + ZSH_HIGHLIGHT_STYLES[bracket-level-2]='fg=yellow' + ZSH_HIGHLIGHT_STYLES[bracket-level-3]='fg=green' + ZSH_HIGHLIGHT_STYLES[bracket-level-4]='fg=cyan' + ZSH_HIGHLIGHT_STYLES[bracket-level-5]='fg=blue' + ZSH_HIGHLIGHT_STYLES[bracket-level-6]='fg=magenta' +fi + +compinit +colors # Initialize colors. + +# Setup rbenv +eval "$(rbenv init -)" |