From 4e2354c2021e8cad672178bdb956f0fcf5c0c7bb Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 27 Nov 2025 16:49:27 +0800 Subject: [PATCH] modules.services.xrdp: drop, since plasma will not support it --- devices/srv1/node0/default.nix | 1 - modules/services/xrdp.nix | 36 ---------------------------------- 2 files changed, 37 deletions(-) delete mode 100644 modules/services/xrdp.nix diff --git a/devices/srv1/node0/default.nix b/devices/srv1/node0/default.nix index 274a1b86..8b47120a 100644 --- a/devices/srv1/node0/default.nix +++ b/devices/srv1/node0/default.nix @@ -23,7 +23,6 @@ inputs: { sshd.motd = true; beesd."/" = { hashTableSizeMB = 128; threads = 4; }; - xrdp = { enable = true; hostname = [ "srv1.chn.moe" ]; }; samba = { hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; }; }; packages = diff --git a/modules/services/xrdp.nix b/modules/services/xrdp.nix deleted file mode 100644 index 745ae485..00000000 --- a/modules/services/xrdp.nix +++ /dev/null @@ -1,36 +0,0 @@ -inputs: -{ - options.nixos.services.xrdp = let inherit (inputs.lib) mkOption types; in - { - enable = mkOption { type = types.bool; default = false; }; - port = mkOption { type = types.ints.unsigned; default = 3389; }; - hostname = mkOption { type = types.nullOr (types.nonEmptyListOf types.nonEmptyStr); default = null; }; - }; - config = let inherit (inputs.config.nixos.services) xrdp; - in inputs.lib.mkIf xrdp.enable (inputs.lib.mkMerge - [ - { - services.xrdp = - { - enable = true; - port = xrdp.port; - openFirewall = true; - defaultWindowManager = "${inputs.pkgs.kdePackages.plasma-workspace}/bin/startplasma-x11"; - }; - } - ( - inputs.lib.mkIf (xrdp.hostname != null) - ( - let mainDomain = builtins.elemAt xrdp.hostname 0; - in - { - services.xrdp = - let keydir = inputs.config.security.acme.certs.${mainDomain}.directory; - in { sslCert = "${keydir}/full.pem"; sslKey = "${keydir}/key.pem"; }; - nixos.services.acme.cert.${mainDomain} = - { domains = xrdp.hostname; group = inputs.config.systemd.services.xrdp.serviceConfig.Group; }; - } - ) - ) - ]); -}