From 12825bc21f153333bab67cd1df794c418fc62907 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 10 Oct 2020 22:16:27 -0400
Subject: [PATCH 1/5] nixos/tools: don't mention pinentryFlavor
We don't need to actually set this as it find a good
default automatically. This could confuse the user into thinking they need
to set it themselves.
---
nixos/modules/installer/tools/tools.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 666a1eff0e62..dd7d586780db 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -140,7 +140,6 @@ in
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
- # pinentryFlavor = "gnome3";
# };
# List services that you want to enable:
From 9f1a43cefa1f6711a4f5aa6bc2f093178420c19c Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 10 Oct 2020 22:17:15 -0400
Subject: [PATCH 2/5] nixos/tools: comment about libinput
---
nixos/modules/installer/tools/tools.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index dd7d586780db..0ac9d216fa4e 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -165,7 +165,7 @@ in
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e";
- # Enable touchpad support.
+ # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Enable the KDE Desktop Environment.
From 3b20eb47f1ec6f6b02943a95be964fac80db136a Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 10 Oct 2020 22:17:43 -0400
Subject: [PATCH 3/5] nixos/tools: don't call Plasma KDE
---
nixos/modules/installer/tools/tools.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 0ac9d216fa4e..999306137ee0 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -168,7 +168,7 @@ in
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
- # Enable the KDE Desktop Environment.
+ # Enable the Plasma 5 Desktop Environment.
# services.xserver.displayManager.sddm.enable = true;
# services.xserver.desktopManager.plasma5.enable = true;
From 2d6a694842423d147ea9beb5612359748c76e35c Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 10 Oct 2020 22:19:19 -0400
Subject: [PATCH 4/5] nixos/tools: add firefox to systemPackages example
This is in the graphical iso's.
---
nixos/modules/installer/tools/tools.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 999306137ee0..5c6e79be5d6b 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -132,6 +132,7 @@ in
# \$ nix search wget
# environment.systemPackages = with pkgs; [
# wget vim
+ # firefox
# ];
# Some programs need SUID wrappers, can be configured further or are
From 99d511124620cad08e1bac2c0ca29ea3222d7f5d Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 10 Oct 2020 22:44:36 -0400
Subject: [PATCH 5/5] nixos/tools: add desktopConfiguration option
We now have a GNOME ISO so it would be nice to seed that one
with configuration on how to enable it.
---
.../installer/tools/nixos-generate-config.pl | 4 +
nixos/modules/installer/tools/tools.nix | 96 +++++++++++--------
.../services/x11/desktop-managers/gnome3.nix | 8 ++
.../services/x11/desktop-managers/plasma5.nix | 8 ++
nixos/tests/nixos-generate-config.nix | 16 ++++
5 files changed, 91 insertions(+), 41 deletions(-)
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 54b84521bdff..44f4c44a56c2 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -625,6 +625,10 @@ EOF
my $networkingDhcpConfig = generateNetworkingDhcpConfig();
+ (my $desktopConfiguration = <<EOF)=~s/^/ /gm;
+@desktopConfiguration@
+EOF
+
write_file($fn, <<EOF);
@configuration@
EOF
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 5c6e79be5d6b..0582812f92d2 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -45,7 +45,7 @@ let
src = ./nixos-generate-config.pl;
path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ];
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}";
- inherit (config.system.nixos-generate-config) configuration;
+ inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
};
nixos-option =
@@ -78,24 +78,42 @@ in
{
- options.system.nixos-generate-config.configuration = mkOption {
- internal = true;
- type = types.str;
- description = ''
- The NixOS module that <literal>nixos-generate-config</literal>
- saves to <literal>/etc/nixos/configuration.nix</literal>.
+ options.system.nixos-generate-config = {
+ configuration = mkOption {
+ internal = true;
+ type = types.str;
+ description = ''
+ The NixOS module that <literal>nixos-generate-config</literal>
+ saves to <literal>/etc/nixos/configuration.nix</literal>.
- This is an internal option. No backward compatibility is guaranteed.
- Use at your own risk!
+ This is an internal option. No backward compatibility is guaranteed.
+ Use at your own risk!
- Note that this string gets spliced into a Perl script. The perl
- variable <literal>$bootLoaderConfig</literal> can be used to
- splice in the boot loader configuration.
- '';
+ Note that this string gets spliced into a Perl script. The perl
+ variable <literal>$bootLoaderConfig</literal> can be used to
+ splice in the boot loader configuration.
+ '';
+ };
+
+ desktopConfiguration = mkOption {
+ internal = true;
+ type = types.str;
+ default = "";
+ description = ''
+ Text to preseed the desktop configuration that <literal>nixos-generate-config</literal>
+ saves to <literal>/etc/nixos/configuration.nix</literal>.
+
+ This is an internal option. No backward compatibility is guaranteed.
+ Use at your own risk!
+
+ Note that this string gets spliced into a Perl script. The perl
+ variable <literal>$bootLoaderConfig</literal> can be used to
+ splice in the boot loader configuration.
+ '';
+ };
};
config = {
-
system.nixos-generate-config.configuration = mkDefault ''
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
@@ -113,6 +131,9 @@ in
# networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
+ # Set your time zone.
+ # time.timeZone = "Europe/Amsterdam";
+
$networkingDhcpConfig
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password\@proxy:port/";
@@ -125,8 +146,26 @@ in
# keyMap = "us";
# };
- # Set your time zone.
- # time.timeZone = "Europe/Amsterdam";
+ $desktopConfiguration
+ # Configure keymap in X11
+ # services.xserver.layout = "us";
+ # services.xserver.xkbOptions = "eurosign:e";
+
+ # Enable CUPS to print documents.
+ # services.printing.enable = true;
+
+ # Enable sound.
+ # sound.enable = true;
+ # hardware.pulseaudio.enable = true;
+
+ # Enable touchpad support (enabled default in most desktopManager).
+ # services.xserver.libinput.enable = true;
+
+ # Define a user account. Don't forget to set a password with ‘passwd’.
+ # users.users.jane = {
+ # isNormalUser = true;
+ # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+ # };
# List packages installed in system profile. To search, run:
# \$ nix search wget
@@ -154,31 +193,6 @@ in
# Or disable the firewall altogether.
# networking.firewall.enable = false;
- # Enable CUPS to print documents.
- # services.printing.enable = true;
-
- # Enable sound.
- # sound.enable = true;
- # hardware.pulseaudio.enable = true;
-
- # Enable the X11 windowing system.
- # services.xserver.enable = true;
- # services.xserver.layout = "us";
- # services.xserver.xkbOptions = "eurosign:e";
-
- # Enable touchpad support (enabled default in most desktopManager).
- # services.xserver.libinput.enable = true;
-
- # Enable the Plasma 5 Desktop Environment.
- # services.xserver.displayManager.sddm.enable = true;
- # services.xserver.desktopManager.plasma5.enable = true;
-
- # Define a user account. Don't forget to set a password with ‘passwd’.
- # users.users.jane = {
- # isNormalUser = true;
- # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
- # };
-
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index a4edcca72c97..0af084b87597 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -179,6 +179,14 @@ in
config = mkMerge [
(mkIf (cfg.enable || flashbackEnabled) {
+ # Seed our configuration into nixos-generate-config
+ system.nixos-generate-config.desktopConfiguration = ''
+ # Enable the GNOME 3 Desktop Environment.
+ services.xserver.enable = true;
+ services.xserver.displayManager.gdm.enable = true;
+ services.xserver.desktopManager.gnome3.enable = true;
+ '';
+
services.gnome3.core-os-services.enable = true;
services.gnome3.core-shell.enable = true;
services.gnome3.core-utilities.enable = mkDefault true;
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index e48b5f23b58f..ad0385ddeed2 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -184,6 +184,14 @@ in
config = mkMerge [
(mkIf cfg.enable {
+ # Seed our configuration into nixos-generate-config
+ system.nixos-generate-config.desktopConfiguration = ''
+ # Enable the Plasma 5 Desktop Environment.
+ services.xserver.enable = true;
+ services.xserver.displayManager.sddm.enable = true;
+ services.xserver.desktopManager.plasma5.enable = true;
+ '';
+
services.xserver.desktopManager.session = singleton {
name = "plasma5";
bgSupport = true;
diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix
index 6c83ccecc70a..5daa55a8abbe 100644
--- a/nixos/tests/nixos-generate-config.nix
+++ b/nixos/tests/nixos-generate-config.nix
@@ -7,8 +7,16 @@ import ./make-test-python.nix ({ lib, ... } : {
{ config, pkgs, ... }: {
imports = [ ./hardware-configuration.nix ];
$bootLoaderConfig
+ $desktopConfiguration
}
'';
+
+ system.nixos-generate-config.desktopConfiguration = ''
+ # DESKTOP
+ # services.xserver.enable = true;
+ # services.xserver.displayManager.gdm.enable = true;
+ # services.xserver.desktopManager.gnome3.enable = true;
+ '';
};
testScript = ''
start_all()
@@ -18,9 +26,17 @@ import ./make-test-python.nix ({ lib, ... } : {
# Test if the configuration really is overridden
machine.succeed("grep 'OVERRIDDEN' /etc/nixos/configuration.nix")
+ # Test if desktop configuration really is overridden
+ machine.succeed("grep 'DESKTOP' /etc/nixos/configuration.nix")
+
# Test of if the Perl variable $bootLoaderConfig is spliced correctly:
machine.succeed(
"grep 'boot\\.loader\\.grub\\.enable = true;' /etc/nixos/configuration.nix"
)
+
+ # Test if the Perl variable $desktopConfiguration is spliced correctly
+ machine.succeed(
+ "grep 'services\\.xserver\\.desktopManager\\.gnome3\\.enable = true;' /etc/nixos/configuration.nix"
+ )
'';
})