machines/vm-audio.nix

@@ -31,7 +31,6 @@
       pulsemixer
       adwaita-icon-theme
       waypipe
-      open-stage-control
 
       # Add LV2 plugins
       lsp-plugins
@@ -141,27 +140,6 @@
       };
     };
 
-    # 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,7 +33,6 @@
     ./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 = "Wprs - Attach";
+                    name = "Attach";
                     comment = host;
                     exec = "wprs --pulseaudio-forwarding False ${host} attach";
                   }
                   {
-                    name = "Wprs - Detach";
+                    name = "Detach";
                     comment = host;
                     exec = "wprs ${host} detach";
                   }
                 ];
                 commandEntries = map (command: {
-                  name = "Wprs - ${command.name}";
+                  name = "${command.name}";
                   comment = host;
                   exec = "wprs --pulseaudio-forwarding False ${host} run \"${command.command}\"";
                 }) commands;

user-modules/xpra/default.nix

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