modules: use pkgs.substituteAll where applicable

I misread the implmentation, and thought it only worked for derivations
that produced directories, so hadn't been using it until now.

2 files changed, 16 insertions, 16 deletions

diff --git a/modules/workstation/windowing/sway/config.in b/modules/workstation/windowing/sway/config.in
index 7b4e44f5c350..4134f65c5b12 100644
--- a/modules/workstation/windowing/sway/config.in
+++ b/modules/workstation/windowing/sway/config.in
@@ -46,8 +46,8 @@ bindsym $mod+Shift+$down move down
 bindsym $mod+Shift+$up move up
 bindsym $mod+Shift+$right move right
 
-bindsym $mod+g exec swaymsg workspace "$(@choose_workspace@)"
-bindsym $mod+Shift+g exec swaymsg move container to workspace "$(@choose_workspace@)"
+bindsym $mod+g exec swaymsg workspace "$(@choose_workspace@ | sed 's/\$/$$/g')"
+bindsym $mod+Shift+g exec swaymsg move container to workspace "$(@choose_workspace@ | sed 's/\$/$$/g')"
 
 bindsym $mod+b splith
 bindsym $mod+v splitv
diff --git a/modules/workstation/windowing/sway/default.nix b/modules/workstation/windowing/sway/default.nix
index 4959b5164f01..f5c304e5d803 100644
--- a/modules/workstation/windowing/sway/default.nix
+++ b/modules/workstation/windowing/sway/default.nix
@@ -1,23 +1,23 @@
 { pkgs, ... }:
 
 let
-  config = pkgs.runCommand "sway-config" {
+  config = pkgs.substituteAll {
+    src = ./config.in;
     inherit status_command choose_workspace;
-  } ''
-    substituteAll ${./config.in} $out
-  '';
+  };
 
-  status_command = with pkgs;
-    runCommand "status_command" { inherit execline; } ''
-      substituteAll ${./status_command.in} $out
-      chmod +x $out
-    '';
+  status_command = pkgs.substituteAll {
+    src = ./status_command.in;
+    isExecutable = true;
+    inherit (pkgs) execline;
+  };
+
+  choose_workspace = pkgs.substituteAll {
+    src = ./choose_workspace.in;
+    isExecutable = true;
+    inherit (pkgs) execline jq;
+  };
 
-  choose_workspace = with pkgs;
-    runCommand "choose_workspace" { inherit execline jq; } ''
-      substituteAll ${./choose_workspace.in} $out
-      chmod +x $out
-    '';
 in
 
 {