diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e6574e4..56a91a1 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,8 +1,16 @@
+# Interactive mode
 if status is-interactive
 	source $HOME/.config/fish/alias.fish
 	set -x LS_COLORS di=0:ln=0:so=0:pi=0:ex=0:bd=0:cd=0:su=0:sg=0:tw=0:ow=0
 end
 
-export (/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
+# Load systemd user environment
+set GENERATOR /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator
+
+if test -e $GENERATOR
+	export ($GENERATOR)
+end
+
+# Add to PATH
 fish_add_path $GOPATH/bin
 fish_add_path $HOME/.local/bin