environment.d parsing changed? fixit

3 files changed, 13 insertions, 19 deletions

diff --git a/dot_config/environment.d/01_PATH.conf b/dot_config/environment.d/01_PATH.conf
index 104fba4..2d43e7a 100644
--- a/dot_config/environment.d/01_PATH.conf
+++ b/dot_config/environment.d/01_PATH.conf
@@ -1,16 +1,9 @@
 PATH="${PATH:-/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games}"
-for dir in \
-    "/usr/games" \
-    "/usr/sbin" \
-    "/sbin" \
-    "${HOME}/.cabal/bin" \
-    "${HOME}/.cargo/bin" \
-    "${HOME}/bin"; do
-    case :$PATH: in
-        *:${dir}:*)
-             # ${dir} already in PATH
-            ;;
-        *)
-            PATH="${dir}:${PATH}";;
-    esac
-done
+PATH="/usr/games:${PATH}"
+PATH="/usr/sbin:${PATH}"
+PATH="/sbin:${PATH}"
+PATH="${HOME}/.opam/default/bin:${PATH}"
+PATH="${HOME}/.opam/beluga/bin:${PATH}"
+PATH="${HOME}/.cabal/bin:${PATH}"
+PATH="${HOME}/.cargo/bin:${PATH}"
+PATH="${HOME}/bin:${PATH}"
diff --git a/dot_config/environment.d/02_xdg-base-dirs.conf b/dot_config/environment.d/02_xdg-base-dirs.conf
index 6da8783..0e434e0 100644
--- a/dot_config/environment.d/02_xdg-base-dirs.conf
+++ b/dot_config/environment.d/02_xdg-base-dirs.conf
@@ -1,4 +1,4 @@
-XDG_CACHE_HOME=${HOME}/.cache
-XDG_CONFIG_HOME=${HOME}/.config
-XDG_DATA_HOME=${HOME}/.local/share
-XDG_STATE_HOME=${HOME}/.local/state
+XDG_CACHE_HOME="${HOME}/.cache"
+XDG_CONFIG_HOME="${HOME}/.config"
+XDG_DATA_HOME="${HOME}/.local/share"
+XDG_STATE_HOME="${HOME}/.local/state"
diff --git a/dot_config/environment.d/04_texmf.conf b/dot_config/environment.d/04_texmf.conf
new file mode 100644
index 0000000..83c3da3
--- /dev/null
+++ b/dot_config/environment.d/04_texmf.conf
@@ -0,0 +1 @@
+TEXMFHOME="${HOME}/.texmf"