From 57fd4379041da73445378cda0e6239f9045ccbde Mon Sep 17 00:00:00 2001
From: Amolith <amolith@secluded.site>
Date: Tue, 11 Jun 2024 22:01:29 -0400
Subject: [PATCH] Improve PATH setup

---
 dot_config/zsh/private_dot_zshrc.tmpl | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/dot_config/zsh/private_dot_zshrc.tmpl b/dot_config/zsh/private_dot_zshrc.tmpl
index c3fd5e0bb3775e0f40ec7d7a9e656b7735168436..e404912237bd21f7a4162694be3a3b0d1dd04844 100644
--- a/dot_config/zsh/private_dot_zshrc.tmpl
+++ b/dot_config/zsh/private_dot_zshrc.tmpl
@@ -44,6 +44,7 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_STATE_HOME="$HOME/.local/state"
 export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_BIN_HOME="$HOME/.local/bin"
 
 # Moving dotfiles around
 zstyle ':completion:*' cache-path "$XDG_CACHE_HOME"/zsh/zcompcache
@@ -59,6 +60,7 @@ export DVDCSS_CACHE="$XDG_DATA_HOME"/dvdcss
 export KDEHOME="$XDG_CONFIG_HOME"/kde
 export GOPATH="$XDG_DATA_HOME"/go
 export ZIM_HOME="$XDG_CONFIG_HOME"/.zim
+export GHCUP_USE_XDG_DIRS="ishouldjustbeabletoexportthisnotsetit"
 alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
 alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
 
@@ -101,16 +103,6 @@ bindkey -M vicmd 'k' history-substring-search-up
 bindkey -M vicmd 'j' history-substring-search-down
 # End configuration added by Zim install
 
-# Executable paths
-export PATH="$PATH:$HOME/dotfiles/bin"
-export PATH="$PATH:$XDG_CONFIG_HOME/emacs/bin"
-export PATH="$PATH:$HOME/.local/bin"
-export PATH="$PATH:$HOME/.gem/ruby/3.0.0/bin"
-export PATH="$PATH:$GOPATH/bin"
-export PATH="$PATH:$CACHE/yay/distrobox/pkg/distrobox/usr/bin"
-export PATH="$PATH:$XDG_DATA_HOME/cargo/bin"
-export PATH="$PATH:$HOME/.radicle/bin"
-
 # Ruby crap
 eval "$(rbenv init - zsh)"
 export GEM_HOME="$(gem env user_gemhome)"
@@ -122,6 +114,15 @@ export ANDROID_HOME="$XDG_DATA_HOME/Android"
 export ANDROID_SDK_ROOT="$ANDROID_HOME"
 export PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator"
 
+# Executable paths
+export PATH="$PATH:$XDG_CONFIG_HOME/emacs/bin"
+export PATH="$PATH:$HOME/.gem/ruby/3.0.0/bin"
+export PATH="$PATH:$GOPATH/bin"
+export PATH="$PATH:$CACHE/yay/distrobox/pkg/distrobox/usr/bin"
+export PATH="$PATH:$XDG_DATA_HOME/cargo/bin"
+export PATH="$PATH:$HOME/.radicle/bin"
+export PATH="$HOME/.local/bin:$PATH"
+
 # Additional preferences
 export LANG=en_GB.UTF-8
 export EDITOR='emacsclient -c'
@@ -205,9 +206,6 @@ function pass() {
 function gi() {
     curl -sLw https://www.toptal.com/developers/gitignore/api/$@ ;
 }
-# Hide the terminal when these apps are opened from a terminal
-function zathura() { zathura "$1" }
-function inkscape() { inkscape "$1" }
 
 # Navi integration
 _call_navi() {