Minor fixes

dot_config/X11/xinitrc.tmpl

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
+userresources="$XDG_CONFIG_HOME"/X11/Xresources
+usermodmap="$XDG_CONFIG_HOME"/X11/Xmodmap
 sysresources=/etc/X11/xinit/Xresources
 sysmodmap=/etc/X11/xinit/Xmodmap
 

dot_config/npm/npmrc

@@ -0,0 +1,4 @@
+prefix=${XDG_DATA_HOME}/npm
+cache=${XDG_CACHE_HOME}/npm
+tmp=${XDG_RUNTIME_DIR}/npm
+init-module=${XDG_CONFIG_HOME}/npm/init/npm-init.js

dot_profile.tmpl

@@ -1,17 +1,23 @@
-# make Java behave when not using a DE
-export _JAVA_AWT_WM_NONREPARENTING=1
-# move $GOPATH to .local
-export GOPATH="$HOME/.local/opt/go" 
-export PATH="$HOME/.local/opt/go/bin:$PATH"
+# Ensure XDG env vars are set correctly
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
 # add .local/bin to $PATH
 export PATH="$HOME/.local/bin:$PATH"
+
+# make Java behave when not using a DE
+export _JAVA_AWT_WM_NONREPARENTING=1
+
 # xsecurelock settings
 export XSECURELOCK_AUTH=auth_x11
 export XSECURELOCK_AUTHPROTO=authproto_pam
 export XSECURELOCK_BURNIN_MITIGATION=300
 export XSECURELOCK_PASSWORD_PROMPT=time
+
 {{- if eq .chezmoi.hostname "helix" }}
-# make GTK apps scale correctly on hidpi
+# scale GTK applicatons on hidpi screens
 export GDK_SCALE=2 GDK_DPI_SCALE=0.50 thunar
 export GDK_SCALE=2 GDK_DPI_SCALE="0.50 Simple-scan"
 export GDK_SCALE=2 GDK_DPI_SCALE=0.50 lutris
@@ -21,3 +27,25 @@ export GDK_SCALE=2 GDK_DPI_SCALE=0.50 Gajim
 export GDK_SCALE=2 GDK_DPI_SCALE=0.50 Ristretto
 export GDK_SCALE=2 GDK_DPI_SCALE=0.50 ghex
 {{- end }}
+
+## No littering in $HOME!
+
+# bash
+export HISTFILE="${XDG_STATE_HOME}"/bash_history
+
+# cargo
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+
+# go
+export GOPATH="$XDG_DATA_HOME"/go
+export GOMODCACHE="$XDG_CACHE_HOME"/go/mod
+
+# GTK2
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+
+# Node
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
+# Xorg
+export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
+export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority