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:32:50 +00:00
parent 84eaa58daf
commit 6f038e0d19
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+6 -2
View File
@@ -141,6 +141,9 @@ let
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 or {})) {} allModules;
in in
{ {
################################# #################################
@@ -158,8 +161,6 @@ in
[ [
./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; ++ allModules;
@@ -171,6 +172,9 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Inject the merged hmUsers into Home Manager
_module.args.hmUsers = allHmUsers;
# Install dconf for the system/user # Install dconf for the system/user
environment.systemPackages = [ environment.systemPackages = [
pkgs.dconf pkgs.dconf
Droidnix/generated/hosts/traveldroid/host.nix
+6 -2
View File
@@ -11,6 +11,9 @@ let
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 or {})) {} allModules;
in in
{ {
################################# #################################
@@ -28,8 +31,6 @@ in
[ [
./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; ++ allModules;
@@ -41,6 +42,9 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Inject the merged hmUsers into Home Manager
_module.args.hmUsers = allHmUsers;
# Install dconf for the system/user # Install dconf for the system/user
environment.systemPackages = [ environment.systemPackages = [
pkgs.dconf pkgs.dconf