Regenerated

This commit is contained in:
2026-03-27 15:20:46 +00:00
parent ae33127454
commit 0198a3a7a8
3 changed files with 366 additions and 303 deletions
+322 -301
View File
File diff suppressed because it is too large Load Diff
+22 -1
View File
@@ -132,28 +132,49 @@ 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
#################################
networking.hostName = hostname; networking.hostName = hostname;
system.stateVersion = "26.05"; system.stateVersion = "26.05";
#################################
# Imports
#################################
imports = imports =
[ ../../../generated/users/henrov.nix [ ../../../generated/users/henrov.nix
./boot.nix ./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
] ]
++ hostModules ++ allModules
++ [ home-manager.nixosModules.home-manager ]; # import HM last ++ [ home-manager.nixosModules.home-manager ]; # import HM last
#################################
# Home Manager integration
#################################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Install dconf for the system/user
environment.systemPackages = [ environment.systemPackages = [
pkgs.dconf pkgs.dconf
]; ];
# Ensure Home Manager writes dconf safely
programs.dconf.enable = true; programs.dconf.enable = true;
} }
+22 -1
View File
@@ -2,27 +2,48 @@
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
#################################
networking.hostName = hostname; networking.hostName = hostname;
system.stateVersion = "26.05"; system.stateVersion = "26.05";
#################################
# Imports
#################################
imports = imports =
[ ../../../generated/users/henrov.nix [ ../../../generated/users/henrov.nix
./boot.nix ./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
] ]
++ hostModules ++ allModules
++ [ home-manager.nixosModules.home-manager ]; # import HM last ++ [ home-manager.nixosModules.home-manager ]; # import HM last
#################################
# Home Manager integration
#################################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Install dconf for the system/user
environment.systemPackages = [ environment.systemPackages = [
pkgs.dconf pkgs.dconf
]; ];
# Ensure Home Manager writes dconf safely
programs.dconf.enable = true; programs.dconf.enable = true;
} }