From 4bd7b032909cc2b97b4ece47421851747b4d2ca0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <jbeckmey@ford.com>
Date: Tue, 24 Mar 2026 10:08:01 -0400
Subject: [PATCH] propertly check and source additional env files

---
 dot_config/environment | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dot_config/environment b/dot_config/environment
index 817f171..bc5a20b 100644
--- a/dot_config/environment
+++ b/dot_config/environment
@@ -1,11 +1,16 @@
 #!/bin/sh
 
-# icky, but necessary since this might inject the needed XDG vars
-. "$HOME/.config/environment.local" 2>/dev/null
-. "$XDG_DATA_HOME/cargo/env" 2>/dev/null
+# Function to source a file only if it exists
+maybe_source() {
+    for file in "$@"; do
+        [ -f "$file" ] && . "$file"
+    done
+}
 
-# nix home-manager
-. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+maybe_source "$HOME/.config/environment.local"
+maybe_source "$XDG_DATA_HOME/cargo/env"
+maybe_source "$HOME/.nix-profile/etc/profile.d/nix.sh"
+maybe_source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
 
 # set to defaults if any of these are unset
 export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"