From a5fa676f8c66c7b9457641ca56ee356f31c3233a Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Wed, 10 Jul 2024 16:58:02 -0400
Subject: [PATCH] Manage more common dotfiles from shell profiles

---
 config-files/shell-profile | 11 +++++++++--
 config-files/zshrc         |  8 ++++----
 install.sh                 |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/config-files/shell-profile b/config-files/shell-profile
index 7ca70b5..e4e9ed1 100644
--- a/config-files/shell-profile
+++ b/config-files/shell-profile
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # WAYLAND ENV
-export ELECTRON_OZONE_PLATFORM_HINT=auto
 export WAYLAND_PROTOCOLS_DATADIR="/usr/share/wayland-protocols"
+export ELECTRON_OZONE_PLATFORM_HINT=auto
 
-# XDG ENV
+# XDG BASE ENV
 export XDG_DATA_HOME="$HOME"/.local/share
 export XDG_CONFIG_HOME="$HOME"/.config
 export XDG_STATE_HOME="$HOME"/.local/state
@@ -14,7 +14,14 @@ export XDG_CACHE_HOME="$HOME"/.cache
 export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
+export WINEPREFIX="$XDG_DATA_HOME"/wine
+export ANDROID_USER_HOME="$XDG_DATA_HOME"/android
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export GOPATH="$XDG_DATA_HOME"/go
 
+# MISC SETTINGS
 export EDITOR=nvim
 export BUILDDIR=/tmp/makepkg
 
diff --git a/config-files/zshrc b/config-files/zshrc
index 07650c5..0b20546 100644
--- a/config-files/zshrc
+++ b/config-files/zshrc
@@ -1,4 +1,4 @@
-# shell settings (this section impacts shell functionality)
+# Shell settings
 HISTFILE="$XDG_CACHE_HOME"/zsh-histfile
 HISTSIZE=2500
 SAVEHIST=2000
@@ -9,7 +9,7 @@ unsetopt beep
 bindkey -e
 zstyle :compinstall filename "/home/$USER/.zshrc"
 autoload -Uz compinit
-compinit
+compinit -d "$XDG_CACHE_HOME"/zcompdump
 PS1='%F{cyan}%n%f@%F{cyan}%m:%f%1~%f%F{cyan}|%#%f '
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
@@ -17,7 +17,7 @@ bindkey '^[[H' beginning-of-line
 bindkey '^[[F' end-of-line
 bindkey '^[[3~' delete-char
 
-# random text art (this section can be safely deleted)
+# Text art on clear/new shell
 art_cat='%F{#fe8019}/\_,_/\
 \ 0 0 /%f'
 art_dog=' %F{#d79921}/___/
@@ -42,7 +42,7 @@ function term_clear() {
 zle -N zsh-redraw term_clear
 bindkey "^L" zsh-redraw
 
-# aliases
+# Stock aliases
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias orphans='doas pacman -Rcns $(pacman -Qqdt)'
diff --git a/install.sh b/install.sh
index 2b4530f..3940ab3 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@
 loadkeys us
 echo ----------------------------------------------------------------------------------------------
 echo rwinkhart\'s Artix Install Script
-echo last updated May 08, 2024 \(rev. B\)
+echo last updated July 10, 2024 \(rev. A\)
 echo ----------------------------------------------------------------------------------------------
 echo You will be asked some questions before installation.
 echo -e "----------------------------------------------------------------------------------------------\n"