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
+12 -27
View File
@@ -364,29 +364,26 @@ 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
{
# Define the NixOS configuration for this host
flake.nixosConfigurations.traveldroid =
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix ]
] ++ importedModules ++ [ ++ modulesFromTree
++ [
./hardware-configuration.nix ./hardware-configuration.nix
# Host-specific settings # Host-specific overrides
({ config, ... }: { ({ config, lib, ... }: {
networking.hostName = "traveldroid"; networking.hostName = "traveldroid";
system.stateVersion = "25.11"; system.stateVersion = "25.11";
@@ -396,7 +393,6 @@ in
device = "nodev"; device = "nodev";
useOSProber = true; useOSProber = true;
}; };
boot.efi.canTouchEfiVariables = true; boot.efi.canTouchEfiVariables = true;
boot.kernelParams = [ boot.kernelParams = [
@@ -404,26 +400,15 @@ in
"systemd.mask=dev-tpmrm0.device" "systemd.mask=dev-tpmrm0.device"
]; ];
# Optional: TPM/other features mySystem.system.core.enable = true;
# systemd.tpm2.enable = false;
# User-defined modules / system features desktop.hyprland.enable = true;
mySystem = { desktop.noctalia.enable = true;
system.core.enable = true; desktop.stylix.enable = true;
# Hardware toggles
hardware.nvidia.enable = false; hardware.nvidia.enable = false;
# Desktop environment modules
desktop = {
hyprland.enable = true;
noctalia.enable = true;
stylix.enable = true;
};
};
}) })
]; ];
};
} }
#+END_SRC #+END_SRC
Droidnix/generated/hosts/traveldroid/boot.nix
+12 -27
View File
@@ -1,26 +1,23 @@
# ./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
{
# Define the NixOS configuration for this host
flake.nixosConfigurations.traveldroid =
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix ]
] ++ importedModules ++ [ ++ modulesFromTree
++ [
./hardware-configuration.nix ./hardware-configuration.nix
# Host-specific settings # Host-specific overrides
({ config, ... }: { ({ config, lib, ... }: {
networking.hostName = "traveldroid"; networking.hostName = "traveldroid";
system.stateVersion = "25.11"; system.stateVersion = "25.11";
@@ -30,7 +27,6 @@ in
device = "nodev"; device = "nodev";
useOSProber = true; useOSProber = true;
}; };
boot.efi.canTouchEfiVariables = true; boot.efi.canTouchEfiVariables = true;
boot.kernelParams = [ boot.kernelParams = [
@@ -38,24 +34,13 @@ in
"systemd.mask=dev-tpmrm0.device" "systemd.mask=dev-tpmrm0.device"
]; ];
# Optional: TPM/other features mySystem.system.core.enable = true;
# systemd.tpm2.enable = false;
# User-defined modules / system features desktop.hyprland.enable = true;
mySystem = { desktop.noctalia.enable = true;
system.core.enable = true; desktop.stylix.enable = true;
# Hardware toggles
hardware.nvidia.enable = false; hardware.nvidia.enable = false;
# Desktop environment modules
desktop = {
hyprland.enable = true;
noctalia.enable = true;
stylix.enable = true;
};
};
}) })
]; ];
};
} }