From 432524aa4d63bbccac75e25abfb813be0dd5e5fa Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sat, 10 Nov 2012 12:57:14 +0100 Subject: [PATCH] Undo move --- .config/zsh/.zprofile => .zprofile | 0 {.config/zsh => .zsh}/.gitignore | 0 {.config/zsh => .zsh}/functions/chpwd_show_todo | 0 {.config/zsh => .zsh}/functions/chpwd_update_git_vars | 0 {.config/zsh => .zsh}/functions/env | 0 {.config/zsh => .zsh}/functions/get_cnt | 0 {.config/zsh => .zsh}/functions/line | 0 {.config/zsh => .zsh}/functions/precmd_update_git_vars | 0 {.config/zsh => .zsh}/functions/precmd_update_updates | 0 {.config/zsh => .zsh}/functions/preexec_update_vars | 0 {.config/zsh => .zsh}/functions/prompt | 0 {.config/zsh => .zsh}/functions/prompt_git_info | 0 {.config/zsh => .zsh}/functions/rprompt | 0 {.config/zsh => .zsh}/functions/update_current_git_vars | 0 {.config/zsh => .zsh}/functions/welcome | 0 {.config/zsh => .zsh}/syntax-highlighting | 0 .zshenv | 1 - .config/zsh/.zshrc => .zshrc | 8 ++++---- 18 files changed, 4 insertions(+), 5 deletions(-) rename .config/zsh/.zprofile => .zprofile (100%) rename {.config/zsh => .zsh}/.gitignore (100%) rename {.config/zsh => .zsh}/functions/chpwd_show_todo (100%) rename {.config/zsh => .zsh}/functions/chpwd_update_git_vars (100%) rename {.config/zsh => .zsh}/functions/env (100%) rename {.config/zsh => .zsh}/functions/get_cnt (100%) rename {.config/zsh => .zsh}/functions/line (100%) rename {.config/zsh => .zsh}/functions/precmd_update_git_vars (100%) rename {.config/zsh => .zsh}/functions/precmd_update_updates (100%) rename {.config/zsh => .zsh}/functions/preexec_update_vars (100%) rename {.config/zsh => .zsh}/functions/prompt (100%) rename {.config/zsh => .zsh}/functions/prompt_git_info (100%) rename {.config/zsh => .zsh}/functions/rprompt (100%) rename {.config/zsh => .zsh}/functions/update_current_git_vars (100%) rename {.config/zsh => .zsh}/functions/welcome (100%) rename {.config/zsh => .zsh}/syntax-highlighting (100%) delete mode 100644 .zshenv rename .config/zsh/.zshrc => .zshrc (92%) diff --git a/.config/zsh/.zprofile b/.zprofile similarity index 100% rename from .config/zsh/.zprofile rename to .zprofile diff --git a/.config/zsh/.gitignore b/.zsh/.gitignore similarity index 100% rename from .config/zsh/.gitignore rename to .zsh/.gitignore diff --git a/.config/zsh/functions/chpwd_show_todo b/.zsh/functions/chpwd_show_todo similarity index 100% rename from .config/zsh/functions/chpwd_show_todo rename to .zsh/functions/chpwd_show_todo diff --git a/.config/zsh/functions/chpwd_update_git_vars b/.zsh/functions/chpwd_update_git_vars similarity index 100% rename from .config/zsh/functions/chpwd_update_git_vars rename to .zsh/functions/chpwd_update_git_vars diff --git a/.config/zsh/functions/env b/.zsh/functions/env similarity index 100% rename from .config/zsh/functions/env rename to .zsh/functions/env diff --git a/.config/zsh/functions/get_cnt b/.zsh/functions/get_cnt similarity index 100% rename from .config/zsh/functions/get_cnt rename to .zsh/functions/get_cnt diff --git a/.config/zsh/functions/line b/.zsh/functions/line similarity index 100% rename from .config/zsh/functions/line rename to .zsh/functions/line diff --git a/.config/zsh/functions/precmd_update_git_vars b/.zsh/functions/precmd_update_git_vars similarity index 100% rename from .config/zsh/functions/precmd_update_git_vars rename to .zsh/functions/precmd_update_git_vars diff --git a/.config/zsh/functions/precmd_update_updates b/.zsh/functions/precmd_update_updates similarity index 100% rename from .config/zsh/functions/precmd_update_updates rename to .zsh/functions/precmd_update_updates diff --git a/.config/zsh/functions/preexec_update_vars b/.zsh/functions/preexec_update_vars similarity index 100% rename from .config/zsh/functions/preexec_update_vars rename to .zsh/functions/preexec_update_vars diff --git a/.config/zsh/functions/prompt b/.zsh/functions/prompt similarity index 100% rename from .config/zsh/functions/prompt rename to .zsh/functions/prompt diff --git a/.config/zsh/functions/prompt_git_info b/.zsh/functions/prompt_git_info similarity index 100% rename from .config/zsh/functions/prompt_git_info rename to .zsh/functions/prompt_git_info diff --git a/.config/zsh/functions/rprompt b/.zsh/functions/rprompt similarity index 100% rename from .config/zsh/functions/rprompt rename to .zsh/functions/rprompt diff --git a/.config/zsh/functions/update_current_git_vars b/.zsh/functions/update_current_git_vars similarity index 100% rename from .config/zsh/functions/update_current_git_vars rename to .zsh/functions/update_current_git_vars diff --git a/.config/zsh/functions/welcome b/.zsh/functions/welcome similarity index 100% rename from .config/zsh/functions/welcome rename to .zsh/functions/welcome diff --git a/.config/zsh/syntax-highlighting b/.zsh/syntax-highlighting similarity index 100% rename from .config/zsh/syntax-highlighting rename to .zsh/syntax-highlighting diff --git a/.zshenv b/.zshenv deleted file mode 100644 index 558223f..0000000 --- a/.zshenv +++ /dev/null @@ -1 +0,0 @@ -ZDOTDIR=$HOME/.config/zsh diff --git a/.config/zsh/.zshrc b/.zshrc similarity index 92% rename from .config/zsh/.zshrc rename to .zshrc index 564f395..1a166e5 100644 --- a/.config/zsh/.zshrc +++ b/.zshrc @@ -29,7 +29,7 @@ setopt notify setopt PROMPT_SUBST setopt EXTENDED_GLOB -zstyle :compinstall filename '$ZDOTDIR/.zshrc' +zstyle :compinstall filename '$HOME/.zshrc' autoload -Uz compinit compinit @@ -39,8 +39,8 @@ autoload -U colors colors # Autoload zsh functions. -fpath=($ZDOTDIR/functions $fpath) -autoload -U $ZDOTDIR/functions/*(:t) +fpath=($HOME/.zsh/functions $fpath) +autoload -U $HOME/.zsh/functions/*(:t) # Enable auto-execution of functions typeset -ga preexec_functions @@ -92,7 +92,7 @@ bindkey "^W" backward-delete-char # Show syntax highlighting when we're not running in emacs if [ -z $EMACS ]; then - source $ZDOTDIR/syntax-highlighting/zsh-syntax-highlighting.zsh + source $HOME/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue' ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue'