runInVM: split out

...the ${vmName} argument was kept for compat, which is no longer necessary

pkgs/desktopAdapters.nix

@@ -2,6 +2,7 @@
   lib,
   newScope,
   makeDesktopItem,
+  writeShellScript,
   writeShellScriptBin,
 }:
 
@@ -18,29 +19,34 @@ lib.makeScope newScope (self: {
   mkRunInVM = vmName: lib.getExe (self.mkRunInVMPkg vmName);
   mkRunInVMPkg =
     vmName:
-    writeShellScriptBin "run-in-${vmName}" ''
+    lib.warn "Use `\${runInVM} foobar` instead of `\${mkRunInVMPkg foobar}`" (
-      localArgs=(
+      writeShellScriptBin "run-in-${vmName}" "${lib.getExe self.runInVM} ${vmName} $@"
-      ${lib.optionalString self.useSessionUnits "--user"}
+    );
-      --property=Requires=${self.vmUnitPrefix}${vmName}.service
+  runInVM = writeShellScriptBin "run-in" ''
-      --property=After=${self.vmUnitPrefix}${vmName}.service
+    vmName=$1
-      --property=SyslogIdentifier="$1 (${vmName})"
+    shift
-      )
+    localArgs=(
-      remoteArgs=(
+    ${lib.optionalString self.useSessionUnits "--user"}
-      systemd-run
+    --property=Requires="${self.vmUnitPrefix}$vmName".service
-      --user
+    --property=After="${self.vmUnitPrefix}$vmName".service
-      --property=StandardError="journal+console"
+    --property=SyslogIdentifier="$1 ($vmName)"
-      --property=StandardOutput="journal+console"
+    )
-      --property=OOMScoreAdjust=${toString self.oomScoreAdjust}
+    remoteArgs=(
-      ${lib.optionalString (self.waylandProxyUnit != null) ''
+    systemd-run
-        --property=Requires=${self.waylandProxyUnit}
+    --user
-        --property=After=${self.waylandProxyUnit}
+    --property=StandardError="journal+console"
-      ''}
+    --property=StandardOutput="journal+console"
-      )
+    --property=OOMScoreAdjust=${toString self.oomScoreAdjust}
-      systemd-run \
+    ${lib.optionalString (self.waylandProxyUnit != null) ''
-        "''${localArgs[@]}" \
+      --property=Requires=${self.waylandProxyUnit}
-        ssh ${self.vmUser}@${self.vmSshPrefix}${vmName} \
+      --property=After=${self.waylandProxyUnit}
-            "''${remoteArgs[@]}" $@
+    ''}
-    '';
+    )
+    systemd-run \
+      "''${localArgs[@]}" \
+      ssh "${self.vmUser}@${self.vmSshPrefix}$vmName" \
+          "''${remoteArgs[@]}" $@
+  '';
 
   # Actual .desktop item adapters
   toVM =

profiles/vmapp-demo.nix

@@ -240,7 +240,7 @@ in
         [
           {
             environment.systemPackages = [
-              (desktopItems.mkRunInVMPkg "browser")
+              (desktopItems.runInVM)
               (pkgs.makeDesktopItem (
                 desktopItems.toBrowser (
                   (desktopItems.toVM "browser" {