b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/x2goserver: put into networking, like xrdp

Browse source
This commit is contained in:
Maciej Krüger 2021-06-10 07:00:05 +02:00
parent 03071fd5e3
commit 6dbeea0b40
No known key found for this signature in database
GPG key ID: 0D948CE19CF49C5F
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/module-list.nix
View file

@ -198,7 +198,6 @@
./programs/waybar.nix
./programs/wireshark.nix
./programs/wshowkeys.nix
./programs/x2goserver.nix
./programs/xfs_quota.nix
./programs/xonsh.nix
./programs/xss-lock.nix
@ -854,6 +853,7 @@
./services/networking/xandikos.nix
./services/networking/xinetd.nix
./services/networking/xl2tpd.nix
./services/networking/x2goserver.nix
./services/networking/xrdp.nix
./services/networking/yggdrasil.nix
./services/networking/zerobin.nix

16
nixos/modules/programs/x2goserver.nix → nixos/modules/services/networking/x2goserver.nix
View file

@ -3,7 +3,7 @@
with lib;
let
cfg = config.programs.x2goserver;
cfg = config.services.x2goserver;
defaults = {
superenicer = { enable = cfg.superenicer.enable; };
@ -17,7 +17,11 @@ let
'';
in {
options.programs.x2goserver = {
imports = [
(mkAliasOptionModule [ "programs" "x2goserver" "enable" ] [ "services" "x2goserver" "enable" ])
];
options.services.x2goserver = {
enable = mkEnableOption "x2goserver" // {
description = ''
Enables the x2goserver module.
@ -63,6 +67,14 @@ in {
config = mkIf cfg.enable {
# x2goserver can run X11 program even if "services.xserver.enable = false"
xdg = {
autostart.enable = true;
menus.enable = true;
mime.enable = true;
icons.enable = true;
};
environment.systemPackages = [ pkgs.x2goserver ];
users.groups.x2go = {};