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,12 +19,17 @@ 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}`" (
+      writeShellScriptBin "run-in-${vmName}" "${lib.getExe self.runInVM} ${vmName} $@"
+    );
+  runInVM = writeShellScriptBin "run-in" ''
+    vmName=$1
+    shift
     localArgs=(
     ${lib.optionalString self.useSessionUnits "--user"}
-      --property=Requires=${self.vmUnitPrefix}${vmName}.service
+    --property=Requires="${self.vmUnitPrefix}$vmName".service
-      --property=After=${self.vmUnitPrefix}${vmName}.service
+    --property=After="${self.vmUnitPrefix}$vmName".service
-      --property=SyslogIdentifier="$1 (${vmName})"
+    --property=SyslogIdentifier="$1 ($vmName)"
     )
     remoteArgs=(
     systemd-run
@@ -38,7 +44,7 @@ lib.makeScope newScope (self: {
     )
     systemd-run \
       "''${localArgs[@]}" \
-        ssh ${self.vmUser}@${self.vmSshPrefix}${vmName} \
+      ssh "${self.vmUser}@${self.vmSshPrefix}$vmName" \
           "''${remoteArgs[@]}" $@
   '';
 

profiles/vmapp-demo.nix

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