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:44:35 +00:00
parent f96ca85870
commit 793d82bd3d
2 changed files with 52 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+26 -36
View File
@@ -136,58 +136,48 @@ let
modulesPath = "${flakeRoot}/generated/modules/${hostname}"; modulesPath = "${flakeRoot}/generated/modules/${hostname}";
usersPath = "${flakeRoot}/generated/users"; usersPath = "${flakeRoot}/generated/users";
hostModulesRaw = import-tree modulesPath; hostModules = import-tree modulesPath;
globalUsersRaw = import-tree usersPath; globalUsers = import-tree usersPath;
# Evaluate functions from import-tree allModules = hostModules.imports ++ globalUsers.imports;
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;
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
# REQUIRED for Home Manager
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;
home-manager.users = allHmUsers;
environment.systemPackages = [ # Install dconf for the system/user
pkgs.dconf environment.systemPackages = [
]; pkgs.dconf
];
programs.dconf.enable = true; # Ensure Home Manager writes dconf safely
programs.dconf.enable = true;
} }
#+END_SRC #+END_SRC
Droidnix/generated/hosts/traveldroid/host.nix
+26 -36
View File
@@ -6,56 +6,46 @@ let
modulesPath = "${flakeRoot}/generated/modules/${hostname}"; modulesPath = "${flakeRoot}/generated/modules/${hostname}";
usersPath = "${flakeRoot}/generated/users"; usersPath = "${flakeRoot}/generated/users";
hostModulesRaw = import-tree modulesPath; hostModules = import-tree modulesPath;
globalUsersRaw = import-tree usersPath; globalUsers = import-tree usersPath;
# Evaluate functions from import-tree allModules = hostModules.imports ++ globalUsers.imports;
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;
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
# REQUIRED for Home Manager
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;
home-manager.users = allHmUsers;
environment.systemPackages = [ # Install dconf for the system/user
pkgs.dconf environment.systemPackages = [
]; pkgs.dconf
];
programs.dconf.enable = true; # Ensure Home Manager writes dconf safely
programs.dconf.enable = true;
} }