diff --git a/machines/universedesktop/desktop/dwm.nix b/machines/universedesktop/desktop/dwm.nix
index 4220f42..4a8a007 100644
--- a/machines/universedesktop/desktop/dwm.nix
+++ b/machines/universedesktop/desktop/dwm.nix
@@ -2,11 +2,7 @@
   nixpkgs.overlays = [
     (final: prev: {
       st = prev.st.override {
-        conf = builtins.readFile (pkgs.substituteAll {
-          src = ./dwm/st-config.def.h;
-          env = {
-          };
-        });
+        conf = builtins.readFile (pkgs.replaceVars ./dwm/st-config.def.h {});
       };
     })
   ];
@@ -18,21 +14,18 @@
         emacsclient --create-frame --alternate-editor=""
       '';
     in pkgs.dwm.override {
-      conf = pkgs.substituteAll {
-        src = ./dwm/config.h;
-        env = {
-          dmenucmd="${pkgs.dmenu}/bin/dmenu_run";
-          termcmd="${pkgs.st}/bin/st";
-          editcmd="${launch_emacs}";
-          playcmd=pkgs.writeScript "playerctl-play-pause" ''
-            #!${pkgs.bash}/bin/bash
-            ${pkgs.playerctl}/bin/playerctl play-pause
-          '';
-          scrncmd=pkgs.writeScript "screenshot-region" ''
-            #!${pkgs.bash}/bin/bash
-            ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png
-          '';
-        };
+      conf = pkgs.replaceVars ./dwm/config.h {
+        dmenucmd="${pkgs.dmenu}/bin/dmenu_run";
+        termcmd="${pkgs.st}/bin/st";
+        editcmd="${launch_emacs}";
+        playcmd=pkgs.writeScript "playerctl-play-pause" ''
+          #!${pkgs.bash}/bin/bash
+          ${pkgs.playerctl}/bin/playerctl play-pause
+        '';
+        scrncmd=pkgs.writeScript "screenshot-region" ''
+          #!${pkgs.bash}/bin/bash
+          ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png
+        '';
       };
       patches = [
         ./dwm/fullscreen.patch