diff --git a/system/.config/environment.d/80_path.conf b/system/.config/environment.d/80_path.conf
index df1d1b7..539f24c 100644
--- a/system/.config/environment.d/80_path.conf
+++ b/system/.config/environment.d/80_path.conf
@@ -1,6 +1,6 @@
 PATH="${PATH}:${CARGO_HOME}/bin"
 PATH="${PATH}:${XDG_DATA_HOME}/npm/bin"
 PATH="${PATH}:${GOPATH}/bin"
-PATH="${PATH}:${GEM_HOME}/bin"
 PATH="${PATH}:${XDG_CONFIG_HOME}/composer/vendor/bin"
 PATH="${HOME}/.local/bin:${PATH}"
+
diff --git a/system/.config/fish/config.fish b/system/.config/fish/config.fish
index 34cb415..e8f5b08 100644
--- a/system/.config/fish/config.fish
+++ b/system/.config/fish/config.fish
@@ -1,3 +1,8 @@
+# Load environment variables for the login shell
+if status --is-login
+	export $(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
+end
+
 # Alias for using lsd as ls replacement
 alias ls="lsd"
 alias la="lsd -al"