mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge pull request #100199 from worldofpeace/seeded-config
nixos/tools: add desktopConfiguration option (to seed configuration into configuration.nix)
This commit is contained in:
commit
ef803ab1bb
|
@ -625,6 +625,10 @@ EOF
|
||||||
|
|
||||||
my $networkingDhcpConfig = generateNetworkingDhcpConfig();
|
my $networkingDhcpConfig = generateNetworkingDhcpConfig();
|
||||||
|
|
||||||
|
(my $desktopConfiguration = <<EOF)=~s/^/ /gm;
|
||||||
|
@desktopConfiguration@
|
||||||
|
EOF
|
||||||
|
|
||||||
write_file($fn, <<EOF);
|
write_file($fn, <<EOF);
|
||||||
@configuration@
|
@configuration@
|
||||||
EOF
|
EOF
|
||||||
|
|
|
@ -45,7 +45,7 @@ let
|
||||||
src = ./nixos-generate-config.pl;
|
src = ./nixos-generate-config.pl;
|
||||||
path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ];
|
path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ];
|
||||||
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}";
|
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 =
|
nixos-option =
|
||||||
|
@ -78,24 +78,42 @@ in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
options.system.nixos-generate-config.configuration = mkOption {
|
options.system.nixos-generate-config = {
|
||||||
internal = true;
|
configuration = mkOption {
|
||||||
type = types.str;
|
internal = true;
|
||||||
description = ''
|
type = types.str;
|
||||||
The NixOS module that <literal>nixos-generate-config</literal>
|
description = ''
|
||||||
saves to <literal>/etc/nixos/configuration.nix</literal>.
|
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.
|
This is an internal option. No backward compatibility is guaranteed.
|
||||||
Use at your own risk!
|
Use at your own risk!
|
||||||
|
|
||||||
Note that this string gets spliced into a Perl script. The perl
|
Note that this string gets spliced into a Perl script. The perl
|
||||||
variable <literal>$bootLoaderConfig</literal> can be used to
|
variable <literal>$bootLoaderConfig</literal> can be used to
|
||||||
splice in the boot loader configuration.
|
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 = {
|
config = {
|
||||||
|
|
||||||
system.nixos-generate-config.configuration = mkDefault ''
|
system.nixos-generate-config.configuration = mkDefault ''
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
|
@ -113,6 +131,9 @@ in
|
||||||
# networking.hostName = "nixos"; # Define your hostname.
|
# networking.hostName = "nixos"; # Define your hostname.
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
|
||||||
|
# Set your time zone.
|
||||||
|
# time.timeZone = "Europe/Amsterdam";
|
||||||
|
|
||||||
$networkingDhcpConfig
|
$networkingDhcpConfig
|
||||||
# Configure network proxy if necessary
|
# Configure network proxy if necessary
|
||||||
# networking.proxy.default = "http://user:password\@proxy:port/";
|
# networking.proxy.default = "http://user:password\@proxy:port/";
|
||||||
|
@ -125,13 +146,32 @@ in
|
||||||
# keyMap = "us";
|
# keyMap = "us";
|
||||||
# };
|
# };
|
||||||
|
|
||||||
# Set your time zone.
|
$desktopConfiguration
|
||||||
# time.timeZone = "Europe/Amsterdam";
|
# 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:
|
# List packages installed in system profile. To search, run:
|
||||||
# \$ nix search wget
|
# \$ nix search wget
|
||||||
# environment.systemPackages = with pkgs; [
|
# environment.systemPackages = with pkgs; [
|
||||||
# wget vim
|
# wget vim
|
||||||
|
# firefox
|
||||||
# ];
|
# ];
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
@ -140,7 +180,6 @@ in
|
||||||
# programs.gnupg.agent = {
|
# programs.gnupg.agent = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# enableSSHSupport = true;
|
# enableSSHSupport = true;
|
||||||
# pinentryFlavor = "gnome3";
|
|
||||||
# };
|
# };
|
||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
@ -154,31 +193,6 @@ in
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
# 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.
|
|
||||||
# services.xserver.libinput.enable = true;
|
|
||||||
|
|
||||||
# Enable the KDE 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
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
@ -179,6 +179,14 @@ in
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
(mkIf (cfg.enable || flashbackEnabled) {
|
(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-os-services.enable = true;
|
||||||
services.gnome3.core-shell.enable = true;
|
services.gnome3.core-shell.enable = true;
|
||||||
services.gnome3.core-utilities.enable = mkDefault true;
|
services.gnome3.core-utilities.enable = mkDefault true;
|
||||||
|
|
|
@ -184,6 +184,14 @@ in
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
(mkIf cfg.enable {
|
(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 {
|
services.xserver.desktopManager.session = singleton {
|
||||||
name = "plasma5";
|
name = "plasma5";
|
||||||
bgSupport = true;
|
bgSupport = true;
|
||||||
|
|
|
@ -7,8 +7,16 @@ import ./make-test-python.nix ({ lib, ... } : {
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
imports = [ ./hardware-configuration.nix ];
|
imports = [ ./hardware-configuration.nix ];
|
||||||
$bootLoaderConfig
|
$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 = ''
|
testScript = ''
|
||||||
start_all()
|
start_all()
|
||||||
|
@ -18,9 +26,17 @@ import ./make-test-python.nix ({ lib, ... } : {
|
||||||
# Test if the configuration really is overridden
|
# Test if the configuration really is overridden
|
||||||
machine.succeed("grep 'OVERRIDDEN' /etc/nixos/configuration.nix")
|
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:
|
# Test of if the Perl variable $bootLoaderConfig is spliced correctly:
|
||||||
machine.succeed(
|
machine.succeed(
|
||||||
"grep 'boot\\.loader\\.grub\\.enable = true;' /etc/nixos/configuration.nix"
|
"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"
|
||||||
|
)
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue