Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-02-17 00:36:31 +00:00
committed by GitHub
59 changed files with 2028 additions and 1319 deletions
+4 -5
View File
@@ -11,12 +11,11 @@ import ./make-test-python.nix ({ lib, ... } : {
}
'';
system.nixos-generate-config.desktopConfiguration = ''
system.nixos-generate-config.desktopConfiguration = [''
# DESKTOP
# services.xserver.enable = true;
# services.xserver.displayManager.gdm.enable = true;
# services.xserver.desktopManager.gnome3.enable = true;
'';
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true;
''];
};
testScript = ''
start_all()