From 8bebbbe47234b3a9a57518882cf87df9687d8f50 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 10:28:32 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 59 ++++++++++++------- Droidnix/generated/hosts/traveldroid/boot.nix | 59 ++++++++++++------- 2 files changed, 76 insertions(+), 42 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 3b2daf9ea..237e3a119 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -364,30 +364,47 @@ in ** =generated/hosts/traveldroid/boot.nix= #+BEGIN_SRC nix :tangle generated/hosts/traveldroid/boot.nix :noweb tangle :mkdirp yes :eval never-html -error: - … while calling the 'seq' builtin - at /nix/store/cncbwybi5fswwjkg9c76cgwm0bh6wsr9-source/lib/modules.nix:402:18: - 401| options = checked options; - 402| config = checked (removeAttrs config [ "_module" ]); - | ^ - 403| _module = checked (config._module); +# ./generated/hosts/traveldroid/traveldroid.nix +{ inputs, config, pkgs, lib, ... }: - … while evaluating a branch condition - at /nix/store/cncbwybi5fswwjkg9c76cgwm0bh6wsr9-source/lib/modules.nix:305:9: - 304| checkUnmatched = - 305| if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [ ] then - | ^ - 306| let +let + # Import all reusable modules from ./generated/modules + modulesFromTree = builtins.attrValues (inputs.import-tree ./generated/modules); +in +{ + imports = [ + inputs.home-manager.nixosModules.home-manager + ] ++ modulesFromTree ++ [ + ./hardware-configuration.nix + ]; - (stack trace truncated; use '--show-trace' to show the full, detailed trace) + networking.hostName = "traveldroid"; + system.stateVersion = "25.11"; - error: undefined variable 'import-tree' - at /nix/store/55kkrag72bfv79hgkd2dx6gc8q8q5g8z-source/Droidnix/generated/hosts/traveldroid/traveldroid.nix:12:27: - 11| ] - 12| ++ builtins.attrValues (import-tree ./generated/modules) - | ^ - 13| ++ [ -Command 'nix --extra-experimental-features 'nix-command flakes' build --print-out-paths '.#nixosConfigurations."traveldroid".config.system.build.nixos-rebuild' --no-link' returned non-zero exit status 1. + 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" + ]; + + # User-defined features + mySystem.system.core.enable = true; + + # Desktop environment features + desktop.hyprland.enable = true; + desktop.noctalia.enable = true; + desktop.stylix.enable = true; + + # Hardware overrides (host-specific) + hardware.nvidia.enable = false; +} #+END_SRC * First the nix-files that flake really needs and that do not fit wel in the hierarchical structure diff --git a/Droidnix/generated/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix index 6e7d764a2..c1d121238 100644 --- a/Droidnix/generated/hosts/traveldroid/boot.nix +++ b/Droidnix/generated/hosts/traveldroid/boot.nix @@ -1,24 +1,41 @@ -error: - … while calling the 'seq' builtin - at /nix/store/cncbwybi5fswwjkg9c76cgwm0bh6wsr9-source/lib/modules.nix:402:18: - 401| options = checked options; - 402| config = checked (removeAttrs config [ "_module" ]); - | ^ - 403| _module = checked (config._module); +# ./generated/hosts/traveldroid/traveldroid.nix +{ inputs, config, pkgs, lib, ... }: - … while evaluating a branch condition - at /nix/store/cncbwybi5fswwjkg9c76cgwm0bh6wsr9-source/lib/modules.nix:305:9: - 304| checkUnmatched = - 305| if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [ ] then - | ^ - 306| let +let + # Import all reusable modules from ./generated/modules + modulesFromTree = builtins.attrValues (inputs.import-tree ./generated/modules); +in +{ + imports = [ + inputs.home-manager.nixosModules.home-manager + ] ++ modulesFromTree ++ [ + ./hardware-configuration.nix + ]; - (stack trace truncated; use '--show-trace' to show the full, detailed trace) + networking.hostName = "traveldroid"; + system.stateVersion = "25.11"; - error: undefined variable 'import-tree' - at /nix/store/55kkrag72bfv79hgkd2dx6gc8q8q5g8z-source/Droidnix/generated/hosts/traveldroid/traveldroid.nix:12:27: - 11| ] - 12| ++ builtins.attrValues (import-tree ./generated/modules) - | ^ - 13| ++ [ -Command 'nix --extra-experimental-features 'nix-command flakes' build --print-out-paths '.#nixosConfigurations."traveldroid".config.system.build.nixos-rebuild' --no-link' returned non-zero exit status 1. + 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" + ]; + + # User-defined features + mySystem.system.core.enable = true; + + # Desktop environment features + desktop.hyprland.enable = true; + desktop.noctalia.enable = true; + desktop.stylix.enable = true; + + # Hardware overrides (host-specific) + hardware.nvidia.enable = false; +}