diff --git a/home/jonas/doom.nix b/home/jonas/doom.nix
index dbded1f..f14e63e 100644
--- a/home/jonas/doom.nix
+++ b/home/jonas/doom.nix
@@ -44,21 +44,21 @@
         --add-flags "--init-directory=${config.xdg.configHome}/doom-emacs" \
         --set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
         --set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \
-        --set LD_LIBRARY_PATH "${pkgs.stdenv.cc.cc.lib}/lib"
+        --suffix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib"
 
       wrapProgram $out/bin/emacsclient \
         --prefix PATH : ${lib.makeBinPath doom-path-pkgs} \
         --set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
         --set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \
-        --set LD_LIBRARY_PATH "${pkgs.stdenv.cc.cc.lib}/lib"
+        --suffix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib"
     '';
   };
   doom-setup = pkgs.writeShellScript "doom-setup" ''
-    export PATH="$PATH:${lib.makeBinPath doom-path-pkgs}"
+    export PATH="${lib.makeBinPath doom-path-pkgs}:$PATH"
     export EMACS="${wrapped-emacs}/bin/emacs"
     export DOOMDIR="${config.home.sessionVariables.DOOMDIR}"
     export DOOMLOCALDIR="${config.home.sessionVariables.DOOMLOCALDIR}"
-    export LD_LIBRARY_PATH "${pkgs.stdenv.cc.cc.lib}/lib"
+    export LD_LIBRARY_PATH "$LD_LIBRARY_PATH:${pkgs.stdenv.cc.cc.lib}/lib"
     if [ ! -d "$DOOMLOCALDIR" ]; then
       ${config.xdg.configHome}/doom-emacs/bin/doom install --force --no-env
     else