diff options
-rw-r--r-- | .config/zsh/.gitignore (renamed from .zsh/.gitignore) | 0 | ||||
-rw-r--r-- | .config/zsh/.zprofile (renamed from .zprofile) | 0 | ||||
-rw-r--r-- | .config/zsh/.zshrc (renamed from .zshrc) | 50 | ||||
-rw-r--r-- | .config/zsh/functions/chpwd_show_todo (renamed from .zsh/functions/chpwd_show_todo) | 0 | ||||
-rwxr-xr-x | .config/zsh/functions/chpwd_update_git_vars (renamed from .zsh/functions/chpwd_update_git_vars) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/env (renamed from .zsh/functions/env) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/get_cnt (renamed from .zsh/functions/get_cnt) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/line (renamed from .zsh/functions/line) | 0 | ||||
-rwxr-xr-x | .config/zsh/functions/precmd_update_git_vars (renamed from .zsh/functions/precmd_update_git_vars) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/precmd_update_updates (renamed from .zsh/functions/precmd_update_updates) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/preexec_update_vars (renamed from .zsh/functions/preexec_update_vars) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/prompt (renamed from .zsh/functions/prompt) | 0 | ||||
-rwxr-xr-x | .config/zsh/functions/prompt_git_info (renamed from .zsh/functions/prompt_git_info) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/rprompt (renamed from .zsh/functions/rprompt) | 0 | ||||
-rwxr-xr-x | .config/zsh/functions/update_current_git_vars (renamed from .zsh/functions/update_current_git_vars) | 0 | ||||
-rw-r--r-- | .config/zsh/functions/welcome (renamed from .zsh/functions/welcome) | 0 | ||||
-rw-r--r-- | .gitmodules | 4 | ||||
-rw-r--r-- | .zshenv | 21 |
18 files changed, 29 insertions, 46 deletions
diff --git a/.zsh/.gitignore b/.config/zsh/.gitignore index b9fd690..b9fd690 100644 --- a/.zsh/.gitignore +++ b/.config/zsh/.gitignore diff --git a/.zprofile b/.config/zsh/.zprofile index 631e8a0..631e8a0 100644 --- a/.zprofile +++ b/.config/zsh/.zprofile diff --git a/.zshrc b/.config/zsh/.zshrc index 38c4fd7..564f395 100644 --- a/.zshrc +++ b/.config/zsh/.zshrc @@ -1,42 +1,46 @@ -# -*- Mode: shell-script; eval: (git-auto-commit-mode 1) -*- +# -*- Mode: shell-script; -*- # Setup variables -HISTFILE=~/.zsh/histfile +HISTFILE=$ZDOTDIR/histfile HISTSIZE=1000 SAVEHIST=1000 +LESSCMD="/usr/bin/less -FXRS" + +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=$LESSCMD + +# 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 less=$LESSCMD +alias ls="ls -F --color=always" +alias mysql="mysql --pager" +alias reboot="systemctl reboot" +alias poweroff="systemctl poweroff" setopt notify # Allow for functions in the prompt setopt PROMPT_SUBST setopt EXTENDED_GLOB -zstyle :compinstall filename '/home/slash/.zshrc' +zstyle :compinstall filename '$ZDOTDIR/.zshrc' autoload -Uz compinit compinit -function shutdown() -{ - dbus-send --system --print-reply \ - --dest="org.freedesktop.ConsoleKit" \ - /org/freedesktop/ConsoleKit/Manager \ - org.freedesktop.ConsoleKit.Manager.Stop -} - -function reboot() -{ - dbus-send --system --print-reply \ - --dest="org.freedesktop.ConsoleKit" \ - /org/freedesktop/ConsoleKit/Manager \ - org.freedesktop.ConsoleKit.Manager.Restart -} - # Initialize colors. autoload -U colors colors # Autoload zsh functions. -fpath=(~/.zsh/functions $fpath) -autoload -U ~/.zsh/functions/*(:t) +fpath=($ZDOTDIR/functions $fpath) +autoload -U $ZDOTDIR/functions/*(:t) # Enable auto-execution of functions typeset -ga preexec_functions @@ -53,7 +57,7 @@ chpwd_functions+='chpwd_update_git_vars' PROMPT='$(prompt)' RPROMPT='$(rprompt)' -# Set terminal name to current runnign application +# Set terminal name to current running application case $TERM in rxvt*) precmd () { print -Pn "\e]0;%~\a" } @@ -88,7 +92,7 @@ bindkey "^W" backward-delete-char # Show syntax highlighting when we're not running in emacs if [ -z $EMACS ]; then - source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh + source $ZDOTDIR/syntax-highlighting/zsh-syntax-highlighting.zsh ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue' ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue' diff --git a/.zsh/functions/chpwd_show_todo b/.config/zsh/functions/chpwd_show_todo index 88ee853..88ee853 100644 --- a/.zsh/functions/chpwd_show_todo +++ b/.config/zsh/functions/chpwd_show_todo diff --git a/.zsh/functions/chpwd_update_git_vars b/.config/zsh/functions/chpwd_update_git_vars index 0ef846a..0ef846a 100755 --- a/.zsh/functions/chpwd_update_git_vars +++ b/.config/zsh/functions/chpwd_update_git_vars diff --git a/.zsh/functions/env b/.config/zsh/functions/env index 6eb728a..6eb728a 100644 --- a/.zsh/functions/env +++ b/.config/zsh/functions/env diff --git a/.zsh/functions/get_cnt b/.config/zsh/functions/get_cnt index 5fc3d4f..5fc3d4f 100644 --- a/.zsh/functions/get_cnt +++ b/.config/zsh/functions/get_cnt diff --git a/.zsh/functions/line b/.config/zsh/functions/line index 58f7aed..58f7aed 100644 --- a/.zsh/functions/line +++ b/.config/zsh/functions/line diff --git a/.zsh/functions/precmd_update_git_vars b/.config/zsh/functions/precmd_update_git_vars index 172456a..172456a 100755 --- a/.zsh/functions/precmd_update_git_vars +++ b/.config/zsh/functions/precmd_update_git_vars diff --git a/.zsh/functions/precmd_update_updates b/.config/zsh/functions/precmd_update_updates index 639fd5c..639fd5c 100644 --- a/.zsh/functions/precmd_update_updates +++ b/.config/zsh/functions/precmd_update_updates diff --git a/.zsh/functions/preexec_update_vars b/.config/zsh/functions/preexec_update_vars index 105d240..105d240 100644 --- a/.zsh/functions/preexec_update_vars +++ b/.config/zsh/functions/preexec_update_vars diff --git a/.zsh/functions/prompt b/.config/zsh/functions/prompt index 6fe927b..6fe927b 100644 --- a/.zsh/functions/prompt +++ b/.config/zsh/functions/prompt diff --git a/.zsh/functions/prompt_git_info b/.config/zsh/functions/prompt_git_info index 76d889a..76d889a 100755 --- a/.zsh/functions/prompt_git_info +++ b/.config/zsh/functions/prompt_git_info diff --git a/.zsh/functions/rprompt b/.config/zsh/functions/rprompt index 3392379..3392379 100644 --- a/.zsh/functions/rprompt +++ b/.config/zsh/functions/rprompt diff --git a/.zsh/functions/update_current_git_vars b/.config/zsh/functions/update_current_git_vars index 71f37e7..71f37e7 100755 --- a/.zsh/functions/update_current_git_vars +++ b/.config/zsh/functions/update_current_git_vars diff --git a/.zsh/functions/welcome b/.config/zsh/functions/welcome index bd6aacd..bd6aacd 100644 --- a/.zsh/functions/welcome +++ b/.config/zsh/functions/welcome diff --git a/.gitmodules b/.gitmodules index 2c0dce7..e368c11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule ".zsh/syntax-highlighting"] - path = .zsh/syntax-highlighting +[submodule ".config/zsh/syntax-highlighting"] + path = .config/zsh/syntax-highlighting url = git://github.com/zsh-users/zsh-syntax-highlighting diff --git a/.zshenv b/.zshenv deleted file mode 100644 index d515549..0000000 --- a/.zshenv +++ /dev/null @@ -1,21 +0,0 @@ -LESSCMD="less -FXRS" - -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=$LESSCMD - -# 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 less=$LESSCMD -alias ls="ls -F --color=always" -alias mysql="mysql --pager" -alias reboot="systemctl reboot" -alias poweroff="systemctl poweroff" |