Updated config

.config/environment.d/10-xdg.conf

@@ -1,6 +0,0 @@
-XDG_CACHE_HOME=$HOME/.cache
-XDG_CONFIG_HOME=$HOME/.config
-XDG_DATA_HOME=$HOME/.local/share
-XDG_BIN_HOME=$HOME/.local/bin
-XDG_LIB_HOME=$HOME/.local/lib
-XDG_STATE_HOME=$HOME/.local/state

.config/environment.d/30-general.conf

@@ -1,6 +0,0 @@
-BROWSER=firefox
-EDITOR=nvim
-LANG=en_US.UTF-8
-PAGER=less
-SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
-TERMINAL=foot

.config/fish/config.fish

@@ -3,17 +3,19 @@ if status is-interactive
 	source $HOME/.config/fish/alias.fish
 end
 
+# Set environment variables from .env
+while read -la line
+	set -l keyval (string split -m1 "=" $line)
+	set -l key (string trim $keyval[1])
+	set -l value (string trim $keyval[2..])
+	set -l value (eval echo $value)
+	set -xg $key $value
+end < .env
+
 # Add scripts to PATH
 fish_add_path $XDG_CONFIG_HOME/fish/scripts
 
 # Add Go binaries to PATH
 if command -q go
 	fish_add_path (go env GOPATH)/bin
-end
-
-# Load systemd user environment
-set GENERATOR /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator
-
-if test -e $GENERATOR
-	export ($GENERATOR)
 end

.env

@@ -1,3 +1,9 @@
+XDG_CACHE_HOME=$HOME/.cache
+XDG_CONFIG_HOME=$HOME/.config
+XDG_DATA_HOME=$HOME/.local/share
+XDG_BIN_HOME=$HOME/.local/bin
+XDG_LIB_HOME=$HOME/.local/lib
+XDG_STATE_HOME=$HOME/.local/state
 CARGO_HOME=$XDG_DATA_HOME/cargo
 CUDA_CACHE_PATH=$XDG_CACHE_HOME/nv
 DOTNET_CLI_HOME=$XDG_DATA_HOME/dotnet
@@ -8,4 +14,10 @@ NIMBLE_DIR=$XDG_DATA_HOME/nimble
 NUGET_PACKAGES=$XDG_CACHE_HOME/nuget
 RUSTUP_HOME=$XDG_DATA_HOME/rustup
 W3M_DIR=$XDG_DATA_HOME/w3m
-WINEPREFIX=$XDG_DATA_HOME/wine
+WINEPREFIX=$XDG_DATA_HOME/wine
+BROWSER=firefox
+EDITOR=nvim
+LANG=en_US.UTF-8
+PAGER=less
+SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
+TERMINAL=foot

.gitignore

@@ -6,13 +6,13 @@ lazy-lock.json
 !.editorconfig
 !.gitignore
 !.init
+!.env
 !/.config
 /.config/*
 !/.config/alacritty
 !/.config/btop
 !/.config/cava
 !/.config/easyeffects
-!/.config/environment.d
 !/.config/fastfetch
 !/.config/foot
 !/.config/fish