henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerated

Browse Source
This commit is contained in:
Henro Veijer
2026-03-27 08:42:39 +00:00
parent c51b1f4940
commit d24d23748e
2 changed files with 22 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+11 -27
View File
@@ -136,25 +136,25 @@ let
modulesPath = "${flakeRoot}/generated/modules/${hostname}"; modulesPath = "${flakeRoot}/generated/modules/${hostname}";
usersPath = "${flakeRoot}/generated/users"; usersPath = "${flakeRoot}/generated/users";
# Import raw modules (might be functions)
hostModulesRaw = import-tree modulesPath; hostModulesRaw = import-tree modulesPath;
globalUsersRaw = import-tree usersPath; globalUsersRaw = import-tree usersPath;
# Helper to fully evaluate import-tree nodes into module sets # Evaluate functions from import-tree
evalModule = m: evalModule = m:
if lib.isFunction m then if lib.isFunction m then
m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; } m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; }
else else
m; m;
# Evaluate all modules into sets hostModules = lib.mapAttrs (_: mod: evalModule mod) hostModulesRaw;
hostModules = lib.mapAttrsToList (_: mod: evalModule mod) hostModulesRaw; globalUsers = lib.mapAttrs (_: mod: evalModule mod) globalUsersRaw;
globalUsers = lib.mapAttrsToList (_: mod: evalModule mod) globalUsersRaw;
# Merge all evaluated modules
allModules = hostModules ++ globalUsers; allModules = hostModules ++ globalUsers;
# Merge all _module.args.hmUsers # Flatten modules for imports
flattenModules = lib.flatten (lib.map (m: [ m ]) allModules);
# Merge all _module.args.hmUsers safely
allHmUsers = lib.foldl' (acc: m: allHmUsers = lib.foldl' (acc: m:
let let
hmUsers = if (builtins.hasAttr "_module" m) && hmUsers = if (builtins.hasAttr "_module" m) &&
@@ -167,38 +167,22 @@ let
in in
{ {
#################################
# Core system config
#################################
networking.hostName = hostname; networking.hostName = hostname;
system.stateVersion = "26.05"; system.stateVersion = "26.05";
################################# # Use flattened module list in imports
# Imports
#################################
imports = imports =
[ flattenModules
++ [
./boot.nix ./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
] ];
++ allModules;
#################################
# Home Manager integration
#################################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Inject the merged users directly under Home Manager
home-manager.users = allHmUsers; home-manager.users = allHmUsers;
#################################
# Example: system packages
#################################
environment.systemPackages = [ environment.systemPackages = [
pkgs.dconf pkgs.dconf
]; ];
Droidnix/generated/hosts/traveldroid/host.nix
+11 -27
View File
@@ -6,25 +6,25 @@ let
modulesPath = "${flakeRoot}/generated/modules/${hostname}"; modulesPath = "${flakeRoot}/generated/modules/${hostname}";
usersPath = "${flakeRoot}/generated/users"; usersPath = "${flakeRoot}/generated/users";
# Import raw modules (might be functions)
hostModulesRaw = import-tree modulesPath; hostModulesRaw = import-tree modulesPath;
globalUsersRaw = import-tree usersPath; globalUsersRaw = import-tree usersPath;
# Helper to fully evaluate import-tree nodes into module sets # Evaluate functions from import-tree
evalModule = m: evalModule = m:
if lib.isFunction m then if lib.isFunction m then
m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; } m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; }
else else
m; m;
# Evaluate all modules into sets hostModules = lib.mapAttrs (_: mod: evalModule mod) hostModulesRaw;
hostModules = lib.mapAttrsToList (_: mod: evalModule mod) hostModulesRaw; globalUsers = lib.mapAttrs (_: mod: evalModule mod) globalUsersRaw;
globalUsers = lib.mapAttrsToList (_: mod: evalModule mod) globalUsersRaw;
# Merge all evaluated modules
allModules = hostModules ++ globalUsers; allModules = hostModules ++ globalUsers;
# Merge all _module.args.hmUsers # Flatten modules for imports
flattenModules = lib.flatten (lib.map (m: [ m ]) allModules);
# Merge all _module.args.hmUsers safely
allHmUsers = lib.foldl' (acc: m: allHmUsers = lib.foldl' (acc: m:
let let
hmUsers = if (builtins.hasAttr "_module" m) && hmUsers = if (builtins.hasAttr "_module" m) &&
@@ -37,38 +37,22 @@ let
in in
{ {
#################################
# Core system config
#################################
networking.hostName = hostname; networking.hostName = hostname;
system.stateVersion = "26.05"; system.stateVersion = "26.05";
################################# # Use flattened module list in imports
# Imports
#################################
imports = imports =
[ flattenModules
++ [
./boot.nix ./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
] ];
++ allModules;
#################################
# Home Manager integration
#################################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Inject the merged users directly under Home Manager
home-manager.users = allHmUsers; home-manager.users = allHmUsers;
#################################
# Example: system packages
#################################
environment.systemPackages = [ environment.systemPackages = [
pkgs.dconf pkgs.dconf
]; ];