Preventing auto import generated/users

This commit is contained in:
2026-03-27 15:09:18 +00:00
parent 02797f7ba1
commit 1843e34025
+1 -10
View File
@@ -132,40 +132,31 @@ The Nix flake definition for Droidnix.
let let
hostname = "traveldroid"; hostname = "traveldroid";
modulesPath = "${flakeRoot}/generated/modules/${hostname}"; modulesPath = "${flakeRoot}/generated/modules/${hostname}";
usersPath = "${flakeRoot}/generated/users";
hostModules = import-tree modulesPath; hostModules = import-tree modulesPath;
globalUsers = import-tree usersPath;
allModules = hostModules.imports ++ globalUsers.imports;
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 =
[ ../../../generated/users/henrov.nix [ ../../../generated/users/henrov.nix
./boot.nix ./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
] ]
++ allModules ++ hostModules
++ [ home-manager.nixosModules.home-manager ]; # import HM last ++ [ home-manager.nixosModules.home-manager ]; # import HM last
################################# #################################
# Home Manager integration # Home Manager integration
################################# #################################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;