1 files changed, 14 insertions, 20 deletions

diff --git a/.config/shell/envvarrc b/.config/shell/envvarrc
index 9974529..b79294d 100644
--- a/.config/shell/envvarrc
+++ b/.config/shell/envvarrc
@@ -1,7 +1,6 @@
 #!/bin/sh
 # Filip's envvarrc
-# This litte script sets my environment variables.
-
+# This little script sets my environment variables.
 
 # Primary programs
 export BROWSER="librewolf"
@@ -13,47 +12,45 @@ export TERMINAL="st"
 export TERMINAL_PROG="st"
 export SHELL="zsh"
 
-
 # XDG base directories
 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"
 
 # PATH and scripts
 export SCRIPTS="$HOME/.scripts"
 
 for dir in \
-  "$SCRIPTS" \
-  "$HOME/langs/R" \
-  "$HOME/.cargo/bin" \
-  "$HOME/.local/bin"
-do
-  [ -d "$dir" ] || continue
-
-  case ":$PATH:" in
+    "$SCRIPTS" \
+    "$HOME/langs/R" \
+    "$HOME/.cargo/bin" \
+    "$HOME/.local/bin"; do
+    [ -d "$dir" ] || continue
+
+    case ":$PATH:" in
     *":$dir:"*) ;;
     *) PATH="$dir:$PATH" ;;
-  esac
+    esac
 done
 
 export PATH
 
-
 # Shell / config locations
 export ZDOTDIR="$XDG_CONFIG_HOME/shell"
 export ZSHDIR="$ZDOTDIR"
 export ALIASRC="$ZDOTDIR/aliasrc"
 export ENVVARRC="$ZDOTDIR/envvarrc"
 
-
 # X / input
 export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
 export XINPUTRC="$XDG_CONFIG_HOME/x11/xinputrc"
 export XPROFILE="$XDG_CONFIG_HOME/x11/xprofile"
 
-
 # Language runtimes & tools
+# Rust
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+
 # R
 export R_HOME="/usr/lib/R"
 export R_LIBS_USER="$HOME/langs/R"
@@ -62,6 +59,7 @@ export R_HISTFILE="$HOME/langs/R/.Rhistory"
 
 # Go
 export GOPATH="$HOME/langs/go"
+export GOBIN="$GOPATH/bin"
 
 # Python / Conda
 export _CONDA_ROOT="$HOME/.local/opt/miniconda3"
@@ -70,12 +68,10 @@ export IPYTHONDIR="$XDG_CONFIG_HOME/ipython"
 # Ren'Py
 export RENPY_USER="$HOME/langs/python/renpy"
 
-
 # Neovim
 export NVIMPLUGINS="$XDG_CONFIG_HOME/nvim/lua/plugins"
 export NVIMSNIPPETS="$XDG_CONFIG_HOME/nvim/lua/snips"
 
-
 # CLI / TUI tools
 export TIGRC_USER="$XDG_CONFIG_HOME/tig/tigrc"
 export STARSHIP_CONFIG="$XDG_CONFIG_HOME/starship/starship.toml"
@@ -89,13 +85,11 @@ export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
 export STARDICT_DATA_DIR="$XDG_DATA_HOME/stardict"
 export OBSIDIAN_HOME="$XDG_CACHE_HOME/obsidian"
 
-
 # Locale
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 export LC_CTYPE="UTF-8"
 
-
 # Better less
 export LESS="R"
 export LESS_TERMCAP_mb="$(printf '%b' '')"