Working on reshuffling

This commit is contained in:
2026-03-19 10:24:34 +00:00
parent 180ff0efd2
commit aad57de8d1
2 changed files with 70 additions and 100 deletions
+35 -50
View File
@@ -364,66 +364,51 @@ in
** =generated/hosts/traveldroid/boot.nix=
#+BEGIN_SRC nix :tangle generated/hosts/traveldroid/boot.nix :noweb tangle :mkdirp yes :eval never-html
# ./generated/hosts/traveldroid/traveldroid.nix
{ inputs, ... }:
let
# Import all reusable modules under ./generated/modules
modulesDir = ../../modules; # adjust path relative to this host file
importedModules = builtins.attrValues (import modulesDir { inherit inputs; });
# Import all reusable modules from ./generated/modules
modulesFromTree = builtins.attrValues (inputs.import-tree ./generated/modules);
in
{
# Define the NixOS configuration for this host
flake.nixosConfigurations.traveldroid =
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix
] ++ importedModules ++ [
./hardware-configuration.nix
specialArgs = { inherit inputs; };
# Host-specific settings
({ config, ... }: {
networking.hostName = "traveldroid";
system.stateVersion = "25.11";
modules = [
inputs.home-manager.nixosModules.home-manager
]
++ modulesFromTree
++ [
./hardware-configuration.nix
boot.loader.grub = {
enable = true;
efiSupport = true;
device = "nodev";
useOSProber = true;
};
# Host-specific overrides
({ config, lib, ... }: {
networking.hostName = "traveldroid";
system.stateVersion = "25.11";
boot.efi.canTouchEfiVariables = true;
boot.loader.grub = {
enable = true;
efiSupport = true;
device = "nodev";
useOSProber = true;
};
boot.efi.canTouchEfiVariables = true;
boot.kernelParams = [
"systemd.mask=dev-tpm0.device"
"systemd.mask=dev-tpmrm0.device"
];
# Optional: TPM/other features
# systemd.tpm2.enable = false;
# User-defined modules / system features
mySystem = {
system.core.enable = true;
# Hardware toggles
hardware.nvidia.enable = false;
# Desktop environment modules
desktop = {
hyprland.enable = true;
noctalia.enable = true;
stylix.enable = true;
};
};
})
boot.kernelParams = [
"systemd.mask=dev-tpm0.device"
"systemd.mask=dev-tpmrm0.device"
];
};
mySystem.system.core.enable = true;
desktop.hyprland.enable = true;
desktop.noctalia.enable = true;
desktop.stylix.enable = true;
hardware.nvidia.enable = false;
})
];
}
#+END_SRC
+35 -50
View File
@@ -1,61 +1,46 @@
# ./generated/hosts/traveldroid/traveldroid.nix
{ inputs, ... }:
let
# Import all reusable modules under ./generated/modules
modulesDir = ../../modules; # adjust path relative to this host file
importedModules = builtins.attrValues (import modulesDir { inherit inputs; });
# Import all reusable modules from ./generated/modules
modulesFromTree = builtins.attrValues (inputs.import-tree ./generated/modules);
in
{
# Define the NixOS configuration for this host
flake.nixosConfigurations.traveldroid =
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix
] ++ importedModules ++ [
./hardware-configuration.nix
specialArgs = { inherit inputs; };
# Host-specific settings
({ config, ... }: {
networking.hostName = "traveldroid";
system.stateVersion = "25.11";
modules = [
inputs.home-manager.nixosModules.home-manager
]
++ modulesFromTree
++ [
./hardware-configuration.nix
boot.loader.grub = {
enable = true;
efiSupport = true;
device = "nodev";
useOSProber = true;
};
# Host-specific overrides
({ config, lib, ... }: {
networking.hostName = "traveldroid";
system.stateVersion = "25.11";
boot.efi.canTouchEfiVariables = true;
boot.loader.grub = {
enable = true;
efiSupport = true;
device = "nodev";
useOSProber = true;
};
boot.efi.canTouchEfiVariables = true;
boot.kernelParams = [
"systemd.mask=dev-tpm0.device"
"systemd.mask=dev-tpmrm0.device"
];
# Optional: TPM/other features
# systemd.tpm2.enable = false;
# User-defined modules / system features
mySystem = {
system.core.enable = true;
# Hardware toggles
hardware.nvidia.enable = false;
# Desktop environment modules
desktop = {
hyprland.enable = true;
noctalia.enable = true;
stylix.enable = true;
};
};
})
boot.kernelParams = [
"systemd.mask=dev-tpm0.device"
"systemd.mask=dev-tpmrm0.device"
];
};
mySystem.system.core.enable = true;
desktop.hyprland.enable = true;
desktop.noctalia.enable = true;
desktop.stylix.enable = true;
hardware.nvidia.enable = false;
})
];
}