henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on reshuffling

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