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:37:26 +00:00
parent 5a500ce415
commit 3d1ae7fe38
2 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+13 -19
View File
@@ -133,39 +133,33 @@ The Nix flake definition for Droidnix.
let let
hostname = "traveldroid"; hostname = "traveldroid";
# Paths to your host modules and user modules
modulesPath = "${flakeRoot}/generated/modules/${hostname}"; modulesPath = "${flakeRoot}/generated/modules/${hostname}";
usersPath = "${flakeRoot}/generated/users"; usersPath = "${flakeRoot}/generated/users";
# Import all modules using import-tree
hostModules = import-tree modulesPath; hostModules = import-tree modulesPath;
globalUsers = import-tree usersPath; globalUsers = import-tree usersPath;
allModules = hostModules.imports ++ globalUsers.imports; allModules = hostModules.imports ++ globalUsers.imports;
/*
# Merge all _module.args.hmUsers from each module
allHmUsers = lib.foldl' (acc: m: acc // (m._module.args.hmUsers // {})) {} allModules;
*/
# Inject merged users directly under Home Manager
home-manager.users = allHmUsers;
in in
{ {
################################# #################################
# Core system config # Core system config
################################# #################################
networking.hostName = hostname; networking.hostName = hostname;
system.stateVersion = "26.05"; system.stateVersion = "26.05";
################################# #################################
# Imports # Imports
################################# #################################
imports = imports =
[ [
./boot.nix ./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
# Home Manager module
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
] ]
++ allModules; ++ allModules;
@@ -173,20 +167,20 @@ in
################################# #################################
# Home Manager integration # Home Manager integration
################################# #################################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Inject the merged hmUsers into Home Manager # Merge all _module.args.hmUsers from modules into a single users attribute
_module.args.hmUsers = allHmUsers; home-manager.users = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules;
# Install dconf for the system/user #################################
environment.systemPackages = [ # System packages & helpers
pkgs.dconf #################################
]; environment.systemPackages = [
pkgs.dconf
];
# Ensure Home Manager writes dconf safely programs.dconf.enable = true;
programs.dconf.enable = true;
} }
#+END_SRC #+END_SRC
Droidnix/generated/hosts/traveldroid/host.nix
+13 -19
View File
@@ -3,39 +3,33 @@
let let
hostname = "traveldroid"; hostname = "traveldroid";
# Paths to your host modules and user modules
modulesPath = "${flakeRoot}/generated/modules/${hostname}"; modulesPath = "${flakeRoot}/generated/modules/${hostname}";
usersPath = "${flakeRoot}/generated/users"; usersPath = "${flakeRoot}/generated/users";
# Import all modules using import-tree
hostModules = import-tree modulesPath; hostModules = import-tree modulesPath;
globalUsers = import-tree usersPath; globalUsers = import-tree usersPath;
allModules = hostModules.imports ++ globalUsers.imports; allModules = hostModules.imports ++ globalUsers.imports;
/*
# Merge all _module.args.hmUsers from each module
allHmUsers = lib.foldl' (acc: m: acc // (m._module.args.hmUsers // {})) {} allModules;
*/
# Inject merged users directly under Home Manager
home-manager.users = allHmUsers;
in in
{ {
################################# #################################
# Core system config # Core system config
################################# #################################
networking.hostName = hostname; networking.hostName = hostname;
system.stateVersion = "26.05"; system.stateVersion = "26.05";
################################# #################################
# Imports # Imports
################################# #################################
imports = imports =
[ [
./boot.nix ./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
# Home Manager module
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
] ]
++ allModules; ++ allModules;
@@ -43,18 +37,18 @@ in
################################# #################################
# Home Manager integration # Home Manager integration
################################# #################################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Inject the merged hmUsers into Home Manager # Merge all _module.args.hmUsers from modules into a single users attribute
_module.args.hmUsers = allHmUsers; home-manager.users = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules;
# Install dconf for the system/user #################################
environment.systemPackages = [ # System packages & helpers
pkgs.dconf #################################
]; environment.systemPackages = [
pkgs.dconf
];
# Ensure Home Manager writes dconf safely programs.dconf.enable = true;
programs.dconf.enable = true;
} }