Fixed the proper edge case handling of dummy file system. Moved the Gnome settings to the new options as per nixpkgs evaluation.
All checks were successful
Build Nix modules (dry-run) / build-modules (push) Successful in 3m40s

This commit is contained in:
Root User 2026-02-14 23:55:19 +01:00
parent 7fdee70cec
commit 7f3b5afbf6
Signed by: root
GPG key ID: 087F0A95E5766D72
2 changed files with 10 additions and 3 deletions

View file

@ -8,8 +8,8 @@
services.xserver.enable = true; services.xserver.enable = true;
# Enable the GNOME Desktop Environment. # Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver.xkb = { services.xserver.xkb = {

View file

@ -5,6 +5,12 @@
... ...
}: let }: let
choose = paths: builtins.head (builtins.filter (p: builtins.pathExists p) paths); choose = paths: builtins.head (builtins.filter (p: builtins.pathExists p) paths);
dummyFileSystems = {
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
};
in { in {
options.local = { options.local = {
hostname = lib.mkOption { hostname = lib.mkOption {
@ -41,7 +47,8 @@ in {
(choose [./modules/system_scripts/gcloud_backup.nix ../system_scripts/gcloud_backup.nix]) (choose [./modules/system_scripts/gcloud_backup.nix ../system_scripts/gcloud_backup.nix])
## TODO: Make this more elegant and less risky for unexpected errors happening. ## TODO: Make this more elegant and less risky for unexpected errors happening.
] ]
++ lib.optional (builtins.pathExists ./hardware-configuration.nix) ./hardware-configuration.nix; ++ lib.optional (builtins.pathExists ./hardware-configuration.nix) ./hardware-configuration.nix
++ lib.optional (!builtins.pathExists ./hardware-configuration.nix) dummyFileSystems;
config = { config = {
local.hostname = "nixosdd"; local.hostname = "nixosdd";