Added a module for Xpra

machines/vm-audio.nix

@@ -31,6 +31,7 @@
       pulsemixer
       adwaita-icon-theme
       waypipe
+      open-stage-control
 
       # Add LV2 plugins
       lsp-plugins
@@ -140,6 +141,27 @@
       };
     };
 
+    # Open stage control service
+    systemd.user.services.osc = {
+      description = "OSC Service";
+      wantedBy = [ "default.target" ];
+      after = [
+        "network.target"
+      ];
+      requires = [
+        "carla.service"
+      ];
+      unitConfig = {
+        ConditionUser = "mixer";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.open-stage-control}/bin/open-stage-control --no-gui --load /home/mixer/open-stage-control/session.json --theme /home/mixer/open-stage-control/theme.css";
+        Environment = "\"ELECTRON_RUN_AS_NODE=1\"";
+        Restart = "always";
+        RestartSec = 5;
+      };
+    };
+
     # Create null sinks
     services.pipewire.extraConfig.pipewire."91-null-sinks" = {
       "context.objects" = [

user-modules/default.nix

@@ -33,6 +33,7 @@
     ./whatsapp/default.nix
     ./wprs/default.nix
     ./winbox/default.nix
+    ./xpra/default.nix
     ./zathura/default.nix
 
     # Import unfree helper

user-modules/wprs/default.nix

@@ -58,18 +58,18 @@ in
                 commands = entry.value;
                 hostEntries = [
                   {
-                    name = "Attach";
+                    name = "Wprs - Attach";
                     comment = host;
                     exec = "wprs --pulseaudio-forwarding False ${host} attach";
                   }
                   {
-                    name = "Detach";
+                    name = "Wprs - Detach";
                     comment = host;
                     exec = "wprs ${host} detach";
                   }
                 ];
                 commandEntries = map (command: {
-                  name = "${command.name}";
+                  name = "Wprs - ${command.name}";
                   comment = host;
                   exec = "wprs --pulseaudio-forwarding False ${host} run \"${command.command}\"";
                 }) commands;

user-modules/xpra/default.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.xpra;
+in
+{
+  options.modules.xpra = {
+    enable = mkEnableOption "Enable xpra";
+    hosts = mkOption {
+      type = types.listOf types.str;
+      default = { };
+      description = "xpra hosts";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      xpra
+    ];
+
+    xdg.desktopEntries = (
+      listToAttrs (
+        map
+          (entry: {
+            name = "xpra${
+              builtins.substring 0 12 (builtins.hashString "sha256" "${entry.name} (${entry.comment})")
+            }";
+            value = entry // {
+              type = "Application";
+              terminal = false;
+              genericName = entry.comment;
+            };
+          })
+          (
+            concatMap (
+              host:
+              let
+                uri = "tcp://${host}:15151/7";
+              in
+              [
+                {
+                  name = "Xpra - Attach";
+                  comment = host;
+                  exec = "xpra attach --min-quality=100 --min-speed=100 --encoding=png --speaker=off ${uri}";
+                }
+                {
+                  name = "Xpra - Detach";
+                  comment = host;
+                  exec = "xpra detach ${uri}";
+                }
+              ]
+            ) cfg.hosts
+          )
+      )
+    );
+  };
+}

users/jan.nix

@@ -24,6 +24,7 @@
       inkscape
       ente-auth
       bitwarden
+      carla
     ];
 
     # desktop.development = "river-light";
@@ -369,11 +370,17 @@
           "mixer@10.20.60.251" = [
             {
               name = "Carla";
-              command = "carla -platform wayland";
+              command = "carla -platform xcb";
             }
           ];
         };
       };
+      xpra = {
+        enable = true;
+        hosts = [
+          "mixer@10.20.60.251"
+        ];
+      };
 
       # Development
       neovim.enable = true;