From 7f3b5afbf6d4a2965b9490a5f37e625ab2463d67 Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Sat, 14 Feb 2026 23:55:19 +0100 Subject: [PATCH] Fixed the proper edge case handling of dummy file system. Moved the Gnome settings to the new options as per nixpkgs evaluation. --- nix-system-configs/modules/desktop-manager/gnome.nix | 4 ++-- nix-system-configs/modules/system/database.nix | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nix-system-configs/modules/desktop-manager/gnome.nix b/nix-system-configs/modules/desktop-manager/gnome.nix index 2995aa5..3d92660 100644 --- a/nix-system-configs/modules/desktop-manager/gnome.nix +++ b/nix-system-configs/modules/desktop-manager/gnome.nix @@ -8,8 +8,8 @@ services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; # Configure keymap in X11 services.xserver.xkb = { diff --git a/nix-system-configs/modules/system/database.nix b/nix-system-configs/modules/system/database.nix index d190b57..3d75fc1 100644 --- a/nix-system-configs/modules/system/database.nix +++ b/nix-system-configs/modules/system/database.nix @@ -5,6 +5,12 @@ ... }: let choose = paths: builtins.head (builtins.filter (p: builtins.pathExists p) paths); + dummyFileSystems = { + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + }; in { options.local = { hostname = lib.mkOption { @@ -41,7 +47,8 @@ in { (choose [./modules/system_scripts/gcloud_backup.nix ../system_scripts/gcloud_backup.nix]) ## 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 = { local.hostname = "nixosdd";