From 87bc2b297cc710a726f91a8931d7e3950b123044 Mon Sep 17 00:00:00 2001
From: Oliver Atkinson <oatkinson@ehps.k12.mt.us>
Date: Tue, 30 Apr 2024 13:03:42 -0600
Subject: [PATCH] cleaning up home

---
 .bashrc | 55 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/.bashrc b/.bashrc
index e3e26fd..e5bdc8f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -7,32 +7,43 @@
 
 # alias ls='ls --color=auto'
 PS1='\[\e[38;5;249m\]+$(jobs | wc -l)\[\e[38;5;24m\][$(ip route get 1.1.1.1 2>/dev/null | awk -F"src " '"'"'NR==1{split($2,a," ");print a[1]}'"'"')\[\e[38;5;46m\]:\[\e[38;5;208m\]\W\[\e[38;5;24m\]]\$ \[\e[0m\]'
-alias luamake=/home/oliver/sources/lua-language-server/3rd/luamake/luamake
-alias l=lfcd
-alias clip="xclip -selection clipboard"
-alias phone="simple-mtpfs"
-alias bell="paplay /usr/share/sounds/freedesktop/stereo/complete.oga"
-alias usage="du -h -d 1 2> /dev/null | sort -h"
-# For laptop multi-gpu offloading
-alias nvidia_gpu="DRI_PRIME=1 __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia"
-# Opinionated defaults
-alias feh="swallow feh --force-aliasing --draw-exif --scale-down --draw-filename"
-alias ffplay="swallow ffplay $@"
-alias shutdown="shutdown -P now"
-alias untar="tar -xvf $@"
-alias cura="cura5 -platformtheme gtk3"
 
-export DENO_INSTALL="/home/oliver/.deno"
-export PATH="$PATH:$DENO_INSTALL/bin:$HOME/.cargo/bin:$HOME/.local/bin/"
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export TORCH_CUDA_VERSION="cu117"
-export LIBTORCH="/home/oliver/sources/libtorchcxx11"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LIBTORCH}/lib"
-export WINEPREFIX="$HOME/.wine/"
 export DXVK_HUD="fps,compiler"
 export EDITOR="nvim"
 export TZ='America/Denver'
 
+# XDG
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+
+# Clean ~/
+# Languages
+export GOPATH="$XDG_DATA_HOME/go"
+export GOMODCACHE="$XDG_DATA_HOME/go/mod"
+export RBENV_ROOT="$XDG_DATA_HOME/rbenv"
+export PYENV_ROOT="$XDG_DATA_HOME/pyenv"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+export DENO_INSTALL="$XDG_DATA_HOME/deno"
+export DOTNET_CLI_HOME="$XDG_DATA_HOME/dotnet"
+export PYTHON_HISTORY="$XDG_CACHE_HOME/pyhton_history"
+# Programs
+export LESSHIST="-"
+export WINEPREFIX="$XDG_CONFIG_HOME/wine"
+export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
+export XAUTHORITY="$XDG_CONFIG_HOME/x11/Xauthority"
+export GIT_CONFIG_GLOBAL="$XDG_CONFIG_HOME/gitconfig"
+export HISTFILE="$XDG_CACHE_HOME/bash_history"
+# Would need to be run as root, prevents the creation of "~/.sudo_as_admin_successful"
+# echo Default !admin_flag >> /etc/sudoers.d/disable_saas
+
+# Paths
+export PATH="$PATH:$HOME/.local/bin/"
+export PATH="$PATH:$CARGO_HOME/bin:$DENO_INSTALL/bin:$PYENV_ROOT/bin"
+
 lfcd() {
 	tmp="$(mktemp)"
 	lfrun -last-dir-path="$tmp" "$@"
@@ -47,3 +58,9 @@ lfcd() {
 	    fi
 	fi
 }
+
+# Load aliases from file
+if [ -f $XDG_CONFIG_HOME/aliasrc ]; then
+    . $XDG_CONFIG_HOME/aliasrc
+fi
+