zsh: Set XDG base dirs and move ZSH config to ZDOTDIR

9 files changed, 186 insertions, 99 deletions

diff --git a/zsh/.cache/zsh/.keep b/zsh/.cache/zsh/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/zsh/.cache/zsh/.keep
diff --git a/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index 6a40089..6a40089 100755
--- a/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
diff --git a/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 2031803..fb9a6d0 100644
--- a/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -1,3 +1,10 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+#if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+#  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+#fi
+
 # zplug
 source ~/.zplug/init.zsh
 
@@ -53,10 +60,10 @@ fi
 
 zplug load
 
-fpath+=~/.zfunc
+fpath+=$XDG_DATA_DIR/zsh/functions
 
 autoload -Uz compinit
-compinit
+compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION
 
 [ -n $ZSH ] && [ -e $ZSH/oh-my-zsh.sh ] && \
     source $ZSH/oh-my-zsh.sh
@@ -104,3 +111,5 @@ alias ec="emacsclient -c"
 [[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && \
     source /usr/share/doc/pkgfile/command-not-found.zsh
 
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+#[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
diff --git a/zsh/.local/share/config-files/zprofile b/zsh/.local/share/config-files/zprofile
index 5c57bdf..f566496 120000
--- a/zsh/.local/share/config-files/zprofile
+++ b/zsh/.local/share/config-files/zprofile
@@ -1 +1 @@
-../../../.zprofile
\ No newline at end of file
+../../../.config/zsh/.zprofile
\ No newline at end of file
diff --git a/zsh/.local/share/config-files/zshenv b/zsh/.local/share/config-files/zshenv
new file mode 120000
index 0000000..fcf44e5
--- /dev/null
+++ b/zsh/.local/share/config-files/zshenv
@@ -0,0 +1 @@
+../../../.zshenv
\ No newline at end of file
diff --git a/zsh/.local/share/config-files/zshrc b/zsh/.local/share/config-files/zshrc
index 673de52..899e05e 120000
--- a/zsh/.local/share/config-files/zshrc
+++ b/zsh/.local/share/config-files/zshrc
@@ -1 +1 @@
-../../../.zshrc
\ No newline at end of file
+../../../.config/zsh/.zshrc
\ No newline at end of file
diff --git a/zsh/.zfunc/_kitty b/zsh/.local/share/zsh/functions/_kitty
index 15918b5..1ccbbd0 100644
--- a/zsh/.zfunc/_kitty
+++ b/zsh/.local/share/zsh/functions/_kitty
@@ -1,5 +1,4 @@
-autoload -Uz compinit
-compinit
+#compdef kitty
 
 _kitty() {
     local src
diff --git a/zsh/.zfunc/_rustup b/zsh/.local/share/zsh/functions/_rustup
index 4a84ba9..dab3353 100644
--- a/zsh/.zfunc/_rustup
+++ b/zsh/.local/share/zsh/functions/_rustup
@@ -17,20 +17,31 @@ _rustup() {
     _arguments "${_arguments_options[@]}" \
 '-v[Enable verbose output]' \
 '--verbose[Enable verbose output]' \
+'(-v --verbose)-q[Disable progress output]' \
+'(-v --verbose)--quiet[Disable progress output]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
 '--version[Prints version information]' \
+'::+toolchain -- release channel (e.g. +stable) or custom toolchain to set override:_files' \
 ":: :_rustup_commands" \
 "*::: :->rustup" \
 && ret=0
     case $state in
     (rustup)
-        words=($line[1] "${words[@]}")
+        words=($line[2] "${words[@]}")
         (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-command-$line[1]:"
-        case $line[1] in
-            (show)
+        curcontext="${curcontext%:*:*}:rustup-command-$line[2]:"
+        case $line[2] in
+            (dump-testament)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+&& ret=0
+;;
+(show)
 _arguments "${_arguments_options[@]}" \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
@@ -53,6 +64,30 @@ _arguments "${_arguments_options[@]}" \
 '--version[Prints version information]' \
 && ret=0
 ;;
+(home)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+&& ret=0
+;;
+(profile)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+&& ret=0
+;;
+(keys)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+&& ret=0
+;;
 (help)
 _arguments "${_arguments_options[@]}" \
 '-h[Prints help information]' \
@@ -67,6 +102,9 @@ esac
 ;;
 (install)
 _arguments "${_arguments_options[@]}" \
+'--profile=[]: :(minimal default complete)' \
+'--no-self-update[Don'\''t perform self-update when running the `rustup install` command]' \
+'--force[Force an update, even if some components are missing]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -85,7 +123,7 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (update)
 _arguments "${_arguments_options[@]}" \
-'--no-self-update[Don'\''t perform self update when running the `rustup` command]' \
+'--no-self-update[Don'\''t perform self update when running the `rustup update` command]' \
 '--force[Force an update, even if some components are missing]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
@@ -94,13 +132,21 @@ _arguments "${_arguments_options[@]}" \
 '::toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
 && ret=0
 ;;
+(check)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+&& ret=0
+;;
 (default)
 _arguments "${_arguments_options[@]}" \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
 '--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
+'::toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
 && ret=0
 ;;
 (toolchain)
@@ -120,6 +166,8 @@ case $state in
         case $line[1] in
             (list)
 _arguments "${_arguments_options[@]}" \
+'-v[Enable verbose output with toolchain information]' \
+'--verbose[Enable verbose output with toolchain information]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -128,6 +176,14 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (update)
 _arguments "${_arguments_options[@]}" \
+'--profile=[]: :(minimal default complete)' \
+'*-c+[Add specific components on installation]' \
+'*--component=[Add specific components on installation]' \
+'*-t+[Add specific targets on installation]' \
+'*--target=[Add specific targets on installation]' \
+'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
+'--force[Force an update, even if some components are missing]' \
+'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -137,6 +193,14 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (add)
 _arguments "${_arguments_options[@]}" \
+'--profile=[]: :(minimal default complete)' \
+'*-c+[Add specific components on installation]' \
+'*--component=[Add specific components on installation]' \
+'*-t+[Add specific targets on installation]' \
+'*--target=[Add specific targets on installation]' \
+'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
+'--force[Force an update, even if some components are missing]' \
+'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -146,6 +210,14 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (install)
 _arguments "${_arguments_options[@]}" \
+'--profile=[]: :(minimal default complete)' \
+'*-c+[Add specific components on installation]' \
+'*--component=[Add specific components on installation]' \
+'*-t+[Add specific targets on installation]' \
+'*--target=[Add specific targets on installation]' \
+'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
+'--force[Force an update, even if some components are missing]' \
+'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -211,6 +283,7 @@ case $state in
             (list)
 _arguments "${_arguments_options[@]}" \
 '--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
+'--installed[List only installed targets]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -224,7 +297,7 @@ _arguments "${_arguments_options[@]}" \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
 '--version[Prints version information]' \
-':target:_files' \
+':target -- List of targets to install; "all" installs all available targets:_files' \
 && ret=0
 ;;
 (add)
@@ -234,7 +307,7 @@ _arguments "${_arguments_options[@]}" \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
 '--version[Prints version information]' \
-':target:_files' \
+':target -- List of targets to install; "all" installs all available targets:_files' \
 && ret=0
 ;;
 (uninstall)
@@ -287,6 +360,7 @@ case $state in
             (list)
 _arguments "${_arguments_options[@]}" \
 '--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
+'--installed[List only installed components]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -352,6 +426,7 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (add)
 _arguments "${_arguments_options[@]}" \
+'--path=[Path to the directory]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -361,6 +436,7 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (set)
 _arguments "${_arguments_options[@]}" \
+'--path=[Path to the directory]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -413,6 +489,7 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (which)
 _arguments "${_arguments_options[@]}" \
+'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
@@ -422,26 +499,54 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (docs)
 _arguments "${_arguments_options[@]}" \
+'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
 '--path[Only print the path to the documentation]' \
+'--alloc[The Rust core allocation and collections library]' \
 '--book[The Rust Programming Language book]' \
-'--std[Standard library API documentation]' \
+'--cargo[The Cargo Book]' \
+'--core[The Rust Core Library]' \
+'--edition-guide[The Rust Edition Guide]' \
+'--nomicon[The Dark Arts of Advanced and Unsafe Rust Programming]' \
+'--proc_macro[A support library for macro authors when defining new macros]' \
 '--reference[The Rust Reference]' \
+'--rust-by-example[A collection of runnable examples that illustrate various Rust concepts and standard libraries]' \
+'--rustc[The compiler for the Rust programming language]' \
+'--rustdoc[Generate documentation for Rust projects]' \
+'--std[Standard library API documentation]' \
+'--test[Support code for rustc'\''s built in unit-test and micro-benchmarking framework]' \
+'--unstable-book[The Unstable Book]' \
+'--embedded-book[The Embedded Rust Book]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
 '--version[Prints version information]' \
+'::topic -- Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', 'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', 'std::io::error::Result' etc...:_files' \
 && ret=0
 ;;
 (doc)
 _arguments "${_arguments_options[@]}" \
+'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
 '--path[Only print the path to the documentation]' \
+'--alloc[The Rust core allocation and collections library]' \
 '--book[The Rust Programming Language book]' \
-'--std[Standard library API documentation]' \
+'--cargo[The Cargo Book]' \
+'--core[The Rust Core Library]' \
+'--edition-guide[The Rust Edition Guide]' \
+'--nomicon[The Dark Arts of Advanced and Unsafe Rust Programming]' \
+'--proc_macro[A support library for macro authors when defining new macros]' \
 '--reference[The Rust Reference]' \
+'--rust-by-example[A collection of runnable examples that illustrate various Rust concepts and standard libraries]' \
+'--rustc[The compiler for the Rust programming language]' \
+'--rustdoc[Generate documentation for Rust projects]' \
+'--std[Standard library API documentation]' \
+'--test[Support code for rustc'\''s built in unit-test and micro-benchmarking framework]' \
+'--unstable-book[The Unstable Book]' \
+'--embedded-book[The Embedded Rust Book]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
 '-V[Prints version information]' \
 '--version[Prints version information]' \
+'::topic -- Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', 'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', 'std::io::error::Result' etc...:_files' \
 && ret=0
 ;;
 (man)
@@ -506,57 +611,6 @@ _arguments "${_arguments_options[@]}" \
     ;;
 esac
 ;;
-(telemetry)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__telemetry_commands" \
-"*::: :->telemetry" \
-&& ret=0
-case $state in
-    (telemetry)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-telemetry-command-$line[1]:"
-        case $line[1] in
-            (enable)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(disable)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(analyze)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
 (set)
 _arguments "${_arguments_options[@]}" \
 '-h[Prints help information]' \
@@ -581,6 +635,15 @@ _arguments "${_arguments_options[@]}" \
 ':host_triple:_files' \
 && ret=0
 ;;
+(profile)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+':profile-name:(minimal default complete)' \
+&& ret=0
+;;
 (help)
 _arguments "${_arguments_options[@]}" \
 '-h[Prints help information]' \
@@ -600,6 +663,7 @@ _arguments "${_arguments_options[@]}" \
 '-V[Prints version information]' \
 '--version[Prints version information]' \
 '::shell:(zsh bash fish powershell elvish)' \
+'::command:(rustup cargo)' \
 && ret=0
 ;;
 (help)
@@ -618,10 +682,12 @@ esac
 (( $+functions[_rustup_commands] )) ||
 _rustup_commands() {
     local commands; commands=(
-        "show:Show the active and installed toolchains" \
+        "dump-testament:Dump information about the build" \
+"show:Show the active and installed toolchains or profiles" \
 "install:Update Rust toolchains" \
 "uninstall:Uninstall Rust toolchains" \
 "update:Update Rust toolchains and rustup" \
+"check:Check for updates to Rust toolchains" \
 "default:Set the default toolchain" \
 "toolchain:Modify or query the installed toolchains" \
 "target:Modify a toolchain's supported targets" \
@@ -632,9 +698,8 @@ _rustup_commands() {
 "doc:Open the documentation for the current toolchain" \
 "man:View the man page for a given command" \
 "self:Modify the rustup installation" \
-"telemetry:rustup telemetry commands" \
 "set:Alter rustup settings" \
-"completions:Generate completion scripts for your shell" \
+"completions:Generate tab-completion scripts for your shell" \
 "help:Prints this message or the help of the given subcommand(s)" \
     )
     _describe -t commands 'rustup commands' commands "$@"
@@ -681,12 +746,12 @@ _rustup__toolchain__add_commands() {
     )
     _describe -t commands 'rustup toolchain add commands' commands "$@"
 }
-(( $+functions[_rustup__telemetry__analyze_commands] )) ||
-_rustup__telemetry__analyze_commands() {
+(( $+functions[_rustup__check_commands] )) ||
+_rustup__check_commands() {
     local commands; commands=(
         
     )
-    _describe -t commands 'rustup telemetry analyze commands' commands "$@"
+    _describe -t commands 'rustup check commands' commands "$@"
 }
 (( $+functions[_rustup__completions_commands] )) ||
 _rustup__completions_commands() {
@@ -719,13 +784,6 @@ _rustup__set__default-host_commands() {
     )
     _describe -t commands 'rustup set default-host commands' commands "$@"
 }
-(( $+functions[_rustup__telemetry__disable_commands] )) ||
-_rustup__telemetry__disable_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup telemetry disable commands' commands "$@"
-}
 (( $+functions[_rustup__doc_commands] )) ||
 _rustup__doc_commands() {
     local commands; commands=(
@@ -747,12 +805,12 @@ _rustup__docs_commands() {
     )
     _describe -t commands 'rustup docs commands' commands "$@"
 }
-(( $+functions[_rustup__telemetry__enable_commands] )) ||
-_rustup__telemetry__enable_commands() {
+(( $+functions[_rustup__dump-testament_commands] )) ||
+_rustup__dump-testament_commands() {
     local commands; commands=(
         
     )
-    _describe -t commands 'rustup telemetry enable commands' commands "$@"
+    _describe -t commands 'rustup dump-testament commands' commands "$@"
 }
 (( $+functions[_rustup__component__help_commands] )) ||
 _rustup__component__help_commands() {
@@ -803,19 +861,19 @@ _rustup__target__help_commands() {
     )
     _describe -t commands 'rustup target help commands' commands "$@"
 }
-(( $+functions[_rustup__telemetry__help_commands] )) ||
-_rustup__telemetry__help_commands() {
+(( $+functions[_rustup__toolchain__help_commands] )) ||
+_rustup__toolchain__help_commands() {
     local commands; commands=(
         
     )
-    _describe -t commands 'rustup telemetry help commands' commands "$@"
+    _describe -t commands 'rustup toolchain help commands' commands "$@"
 }
-(( $+functions[_rustup__toolchain__help_commands] )) ||
-_rustup__toolchain__help_commands() {
+(( $+functions[_rustup__show__home_commands] )) ||
+_rustup__show__home_commands() {
     local commands; commands=(
         
     )
-    _describe -t commands 'rustup toolchain help commands' commands "$@"
+    _describe -t commands 'rustup show home commands' commands "$@"
 }
 (( $+functions[_rustup__install_commands] )) ||
 _rustup__install_commands() {
@@ -838,6 +896,13 @@ _rustup__toolchain__install_commands() {
     )
     _describe -t commands 'rustup toolchain install commands' commands "$@"
 }
+(( $+functions[_rustup__show__keys_commands] )) ||
+_rustup__show__keys_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'rustup show keys commands' commands "$@"
+}
 (( $+functions[_rustup__toolchain__link_commands] )) ||
 _rustup__toolchain__link_commands() {
     local commands; commands=(
@@ -890,6 +955,20 @@ _rustup__override_commands() {
     )
     _describe -t commands 'rustup override commands' commands "$@"
 }
+(( $+functions[_rustup__set__profile_commands] )) ||
+_rustup__set__profile_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'rustup set profile commands' commands "$@"
+}
+(( $+functions[_rustup__show__profile_commands] )) ||
+_rustup__show__profile_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'rustup show profile commands' commands "$@"
+}
 (( $+functions[_rustup__component__remove_commands] )) ||
 _rustup__component__remove_commands() {
     local commands; commands=(
@@ -953,6 +1032,7 @@ _rustup__override__set_commands() {
 _rustup__set_commands() {
     local commands; commands=(
         "default-host:The triple used to identify toolchains when not specified" \
+"profile:The default components installed" \
 "help:Prints this message or the help of the given subcommand(s)" \
     )
     _describe -t commands 'rustup set commands' commands "$@"
@@ -961,6 +1041,9 @@ _rustup__set_commands() {
 _rustup__show_commands() {
     local commands; commands=(
         "active-toolchain:Show the active toolchain" \
+"home:Display the computed value of RUSTUP_HOME" \
+"profile:Show the current profile" \
+"keys:Display the known PGP keys" \
 "help:Prints this message or the help of the given subcommand(s)" \
     )
     _describe -t commands 'rustup show commands' commands "$@"
@@ -975,16 +1058,6 @@ _rustup__target_commands() {
     )
     _describe -t commands 'rustup target commands' commands "$@"
 }
-(( $+functions[_rustup__telemetry_commands] )) ||
-_rustup__telemetry_commands() {
-    local commands; commands=(
-        "enable:Enable rustup telemetry" \
-"disable:Disable rustup telemetry" \
-"analyze:Analyze stored telemetry" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup telemetry commands' commands "$@"
-}
 (( $+functions[_rustup__toolchain_commands] )) ||
 _rustup__toolchain_commands() {
     local commands; commands=(
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644
index 0000000..55d2d67
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,5 @@
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
+
+export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"