From 81b70af9d3450b6db80bf3e189769e2371378a66 Mon Sep 17 00:00:00 2001 From: Christian Baer Date: Sun, 11 Oct 2020 19:25:48 +0200 Subject: [PATCH] Move zsh config to ~/.config --- {.zsh => .config/zsh}/.zlogin | 0 {.zsh => .config/zsh}/.zshrc | 0 {.zsh => .config/zsh}/functions/extract | 0 {.zsh => .config/zsh}/functions/tmix | 0 {.zsh => .config/zsh}/lib/10-path.zsh | 0 {.zsh => .config/zsh}/lib/20-aliases.zsh | 0 {.zsh => .config/zsh}/lib/20-completion.zsh | 0 {.zsh => .config/zsh}/lib/20-correction.zsh | 0 {.zsh => .config/zsh}/lib/20-directories.zsh | 0 {.zsh => .config/zsh}/lib/20-functions.zsh | 0 {.zsh => .config/zsh}/lib/20-history.zsh | 0 {.zsh => .config/zsh}/lib/20-key_bindings.zsh | 0 {.zsh => .config/zsh}/lib/20-shortcuts.zsh | 0 {.zsh => .config/zsh}/lib/30-appearance.zsh | 0 {.zsh => .config/zsh}/lib/30-colors.zsh | 0 {.zsh => .config/zsh}/lib/30-extras.zsh | 0 {.zsh => .config/zsh}/lib/30-misc.zsh | 0 {.zsh => .config/zsh}/lib/30-prompt.zsh | 0 {.zsh => .config/zsh}/lib/30-rprompt.zsh | 0 .zshenv | 6 +++++- 20 files changed, 5 insertions(+), 1 deletion(-) rename {.zsh => .config/zsh}/.zlogin (100%) rename {.zsh => .config/zsh}/.zshrc (100%) rename {.zsh => .config/zsh}/functions/extract (100%) rename {.zsh => .config/zsh}/functions/tmix (100%) rename {.zsh => .config/zsh}/lib/10-path.zsh (100%) rename {.zsh => .config/zsh}/lib/20-aliases.zsh (100%) rename {.zsh => .config/zsh}/lib/20-completion.zsh (100%) rename {.zsh => .config/zsh}/lib/20-correction.zsh (100%) rename {.zsh => .config/zsh}/lib/20-directories.zsh (100%) rename {.zsh => .config/zsh}/lib/20-functions.zsh (100%) rename {.zsh => .config/zsh}/lib/20-history.zsh (100%) rename {.zsh => .config/zsh}/lib/20-key_bindings.zsh (100%) rename {.zsh => .config/zsh}/lib/20-shortcuts.zsh (100%) rename {.zsh => .config/zsh}/lib/30-appearance.zsh (100%) rename {.zsh => .config/zsh}/lib/30-colors.zsh (100%) rename {.zsh => .config/zsh}/lib/30-extras.zsh (100%) rename {.zsh => .config/zsh}/lib/30-misc.zsh (100%) rename {.zsh => .config/zsh}/lib/30-prompt.zsh (100%) rename {.zsh => .config/zsh}/lib/30-rprompt.zsh (100%) diff --git a/.zsh/.zlogin b/.config/zsh/.zlogin similarity index 100% rename from .zsh/.zlogin rename to .config/zsh/.zlogin diff --git a/.zsh/.zshrc b/.config/zsh/.zshrc similarity index 100% rename from .zsh/.zshrc rename to .config/zsh/.zshrc diff --git a/.zsh/functions/extract b/.config/zsh/functions/extract similarity index 100% rename from .zsh/functions/extract rename to .config/zsh/functions/extract diff --git a/.zsh/functions/tmix b/.config/zsh/functions/tmix similarity index 100% rename from .zsh/functions/tmix rename to .config/zsh/functions/tmix diff --git a/.zsh/lib/10-path.zsh b/.config/zsh/lib/10-path.zsh similarity index 100% rename from .zsh/lib/10-path.zsh rename to .config/zsh/lib/10-path.zsh diff --git a/.zsh/lib/20-aliases.zsh b/.config/zsh/lib/20-aliases.zsh similarity index 100% rename from .zsh/lib/20-aliases.zsh rename to .config/zsh/lib/20-aliases.zsh diff --git a/.zsh/lib/20-completion.zsh b/.config/zsh/lib/20-completion.zsh similarity index 100% rename from .zsh/lib/20-completion.zsh rename to .config/zsh/lib/20-completion.zsh diff --git a/.zsh/lib/20-correction.zsh b/.config/zsh/lib/20-correction.zsh similarity index 100% rename from .zsh/lib/20-correction.zsh rename to .config/zsh/lib/20-correction.zsh diff --git a/.zsh/lib/20-directories.zsh b/.config/zsh/lib/20-directories.zsh similarity index 100% rename from .zsh/lib/20-directories.zsh rename to .config/zsh/lib/20-directories.zsh diff --git a/.zsh/lib/20-functions.zsh b/.config/zsh/lib/20-functions.zsh similarity index 100% rename from .zsh/lib/20-functions.zsh rename to .config/zsh/lib/20-functions.zsh diff --git a/.zsh/lib/20-history.zsh b/.config/zsh/lib/20-history.zsh similarity index 100% rename from .zsh/lib/20-history.zsh rename to .config/zsh/lib/20-history.zsh diff --git a/.zsh/lib/20-key_bindings.zsh b/.config/zsh/lib/20-key_bindings.zsh similarity index 100% rename from .zsh/lib/20-key_bindings.zsh rename to .config/zsh/lib/20-key_bindings.zsh diff --git a/.zsh/lib/20-shortcuts.zsh b/.config/zsh/lib/20-shortcuts.zsh similarity index 100% rename from .zsh/lib/20-shortcuts.zsh rename to .config/zsh/lib/20-shortcuts.zsh diff --git a/.zsh/lib/30-appearance.zsh b/.config/zsh/lib/30-appearance.zsh similarity index 100% rename from .zsh/lib/30-appearance.zsh rename to .config/zsh/lib/30-appearance.zsh diff --git a/.zsh/lib/30-colors.zsh b/.config/zsh/lib/30-colors.zsh similarity index 100% rename from .zsh/lib/30-colors.zsh rename to .config/zsh/lib/30-colors.zsh diff --git a/.zsh/lib/30-extras.zsh b/.config/zsh/lib/30-extras.zsh similarity index 100% rename from .zsh/lib/30-extras.zsh rename to .config/zsh/lib/30-extras.zsh diff --git a/.zsh/lib/30-misc.zsh b/.config/zsh/lib/30-misc.zsh similarity index 100% rename from .zsh/lib/30-misc.zsh rename to .config/zsh/lib/30-misc.zsh diff --git a/.zsh/lib/30-prompt.zsh b/.config/zsh/lib/30-prompt.zsh similarity index 100% rename from .zsh/lib/30-prompt.zsh rename to .config/zsh/lib/30-prompt.zsh diff --git a/.zsh/lib/30-rprompt.zsh b/.config/zsh/lib/30-rprompt.zsh similarity index 100% rename from .zsh/lib/30-rprompt.zsh rename to .config/zsh/lib/30-rprompt.zsh diff --git a/.zshenv b/.zshenv index edfcc5a..babb9ce 100644 --- a/.zshenv +++ b/.zshenv @@ -1,7 +1,11 @@ ## ~/.zshenv - Should contain commands to set the $PATH and other important environment variables +# Set up XDG environment +export XDG_CONFIG_HOME=${$XDG_CONFIG_HOME:=${HOME}/.config} + # Where to look for zsh config -ZDOTDIR=~/.zsh +export ZDOTDIR=${ZDOTDIR:=${XDG_CONFIG_HOME}/zsh} +source $ZDOTDIR/.zshenv # Load config files in $ZSH/lib that for stage 1 for config_file ($ZDOTDIR/lib/10-*.zsh) source $config_file