From f13c61a3b9c91c75e3dafaeb0c155f2b3da64c6d Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Sun, 19 Jun 2022 11:40:41 +1000 Subject: xpra: Add the ability to perform a start-desktop --- nixos/modules/services/x11/display-managers/xpra.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index c23e479140f09..f4ab2b4bd682f 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -25,6 +25,13 @@ in type = types.nullOr types.str; description = "Bind xpra to TCP"; }; + + desktop = mkOption { + type = types.nullOr types.str; + default = null; + example = "gnome-shell"; + description = "Start a desktop environment instead of seamless mode"; + }; auth = mkOption { type = types.str; @@ -222,7 +229,7 @@ in services.xserver.displayManager.job.execCmd = '' ${optionalString (cfg.pulseaudio) "export PULSE_COOKIE=/run/pulse/.config/pulse/cookie"} - exec ${pkgs.xpra}/bin/xpra start \ + exec ${pkgs.xpra}/bin/xpra ${if cfg.desktop == null then "start" else "start-desktop --start=${cfg.desktop}"} \ --daemon=off \ --log-dir=/var/log \ --log-file=xpra.log \ -- cgit 1.4.1 From 62494281d81d2378a594dfa24d94379caf2940c7 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Sun, 19 Jun 2022 18:26:10 +1000 Subject: xpra: fix whitespace --- nixos/modules/services/x11/display-managers/xpra.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index f4ab2b4bd682f..1566e38da0839 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -25,7 +25,7 @@ in type = types.nullOr types.str; description = "Bind xpra to TCP"; }; - + desktop = mkOption { type = types.nullOr types.str; default = null; -- cgit 1.4.1