nixos/startx: fix error if generateScript == false

rnhmjoj a2e29f2f 9fa43536

Changed files
+4 -4
nixos
modules
services
x11
display-managers
+4 -4
nixos/modules/services/x11/display-managers/startx.nix
···
'';
# Add a sane system-wide xinitrc script
-
environment.etc."X11/xinit/xinitrc".source = lib.mkIf cfg.generateScript (
-
pkgs.writeShellScript "xinitrc" ''
+
environment.etc."X11/xinit/xinitrc" = lib.mkIf cfg.generateScript {
+
source = pkgs.writeShellScript "xinitrc" ''
${cfg.extraCommands}
# start user services
···
# stop services and all subprocesses
systemctl --user stop nixos-fake-graphical-session.target
kill 0
-
''
-
);
+
'';
+
};
environment.systemPackages = with pkgs; [ xorg.xinit ];