From 793d82bd3dcd008d292917b8d555543fa43e6199 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Fri, 27 Mar 2026 08:44:35 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.org | 62 ++++++++----------- Droidnix/generated/hosts/traveldroid/host.nix | 62 ++++++++----------- 2 files changed, 52 insertions(+), 72 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index d9f46bf07..3aee57b6e 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -136,58 +136,48 @@ let modulesPath = "${flakeRoot}/generated/modules/${hostname}"; usersPath = "${flakeRoot}/generated/users"; - hostModulesRaw = import-tree modulesPath; - globalUsersRaw = import-tree usersPath; + hostModules = import-tree modulesPath; + globalUsers = import-tree usersPath; - # Evaluate functions from import-tree - evalModule = m: - if lib.isFunction m then - m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; } - else - m; - - hostModules = lib.mapAttrs (_: mod: evalModule mod) hostModulesRaw; - globalUsers = lib.mapAttrs (_: mod: evalModule mod) globalUsersRaw; - - allModules = hostModules ++ globalUsers; - - # Flatten modules for imports - flattenModules = lib.flatten (lib.map (m: [ m ]) allModules); - - # Merge all _module.args.hmUsers safely - allHmUsers = lib.foldl' (acc: m: - let - hmUsers = if (builtins.hasAttr "_module" m) && - (builtins.hasAttr "args" m._module) && - (builtins.hasAttr "hmUsers" m._module.args) - then m._module.args.hmUsers - else {}; - in acc // hmUsers - ) {} allModules; + allModules = hostModules.imports ++ globalUsers.imports; in { + ################################# + # Core system config + ################################# + networking.hostName = hostname; system.stateVersion = "26.05"; - # Use flattened module list in imports + ################################# + # Imports + ################################# + imports = - flattenModules - ++ [ + [ ./boot.nix ./hardware-configuration.nix + + # REQUIRED for Home Manager home-manager.nixosModules.home-manager - ]; + ] + ++ allModules; + + ################################# + # Home Manager integration + ################################# home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users = allHmUsers; - environment.systemPackages = [ - pkgs.dconf - ]; +# Install dconf for the system/user + environment.systemPackages = [ + pkgs.dconf + ]; - programs.dconf.enable = true; +# Ensure Home Manager writes dconf safely + programs.dconf.enable = true; } #+END_SRC diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix index f7725e2b3..e88eaec47 100644 --- a/Droidnix/generated/hosts/traveldroid/host.nix +++ b/Droidnix/generated/hosts/traveldroid/host.nix @@ -6,56 +6,46 @@ let modulesPath = "${flakeRoot}/generated/modules/${hostname}"; usersPath = "${flakeRoot}/generated/users"; - hostModulesRaw = import-tree modulesPath; - globalUsersRaw = import-tree usersPath; + hostModules = import-tree modulesPath; + globalUsers = import-tree usersPath; - # Evaluate functions from import-tree - evalModule = m: - if lib.isFunction m then - m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; } - else - m; - - hostModules = lib.mapAttrs (_: mod: evalModule mod) hostModulesRaw; - globalUsers = lib.mapAttrs (_: mod: evalModule mod) globalUsersRaw; - - allModules = hostModules ++ globalUsers; - - # Flatten modules for imports - flattenModules = lib.flatten (lib.map (m: [ m ]) allModules); - - # Merge all _module.args.hmUsers safely - allHmUsers = lib.foldl' (acc: m: - let - hmUsers = if (builtins.hasAttr "_module" m) && - (builtins.hasAttr "args" m._module) && - (builtins.hasAttr "hmUsers" m._module.args) - then m._module.args.hmUsers - else {}; - in acc // hmUsers - ) {} allModules; + allModules = hostModules.imports ++ globalUsers.imports; in { + ################################# + # Core system config + ################################# + networking.hostName = hostname; system.stateVersion = "26.05"; - # Use flattened module list in imports + ################################# + # Imports + ################################# + imports = - flattenModules - ++ [ + [ ./boot.nix ./hardware-configuration.nix + + # REQUIRED for Home Manager home-manager.nixosModules.home-manager - ]; + ] + ++ allModules; + + ################################# + # Home Manager integration + ################################# home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users = allHmUsers; - environment.systemPackages = [ - pkgs.dconf - ]; +# Install dconf for the system/user + environment.systemPackages = [ + pkgs.dconf + ]; - programs.dconf.enable = true; +# Ensure Home Manager writes dconf safely + programs.dconf.enable = true; }