diff options
| author | Lassulus <github@lassul.us> | 2022-06-22 14:41:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 14:41:15 +0200 |
| commit | 5308b5b44a1d14b60dd4ca485184398a9a4246c5 (patch) | |
| tree | 530026d1faf999d44ebe39aef3901218168c3170 /nixos/modules | |
| parent | 82cb21e41724d4927988b02e75e4e4fc98f4be85 (diff) | |
| parent | 62494281d81d2378a594dfa24d94379caf2940c7 (diff) | |
Merge pull request #178194 from spacekitteh/patch-35
xpra: Add the ability to perform a start-desktop
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/xpra.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index c23e479140f09..1566e38da0839 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -26,6 +26,13 @@ in 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; default = "pam"; @@ -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 \ |