From 46187dfaef65a59141c4796eb3b40561749b9a77 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 10:34:56 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 7 ++++--- Droidnix/generated/hosts/traveldroid/boot.nix | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 0feafa3e2..070682de3 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -370,14 +370,15 @@ 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 +# ./generated/hosts/traveldroid/traveldroid.nix { inputs, config, pkgs, lib, ... }: let - # Import all reusable modules from ./generated/modules - modulesFromTree = builtins.attrValues (inputs.import-tree ./generated/modules); + # Import all reusable modules under ./generated/modules + modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; }); in { - # Top-level imports inside the module + # Host-specific imports imports = [ inputs.home-manager.nixosModules.home-manager ] ++ modulesFromTree ++ [ diff --git a/Droidnix/generated/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix index 57ad1fa5e..4760011bf 100644 --- a/Droidnix/generated/hosts/traveldroid/boot.nix +++ b/Droidnix/generated/hosts/traveldroid/boot.nix @@ -1,12 +1,13 @@ # ./generated/hosts/traveldroid/traveldroid.nix +# ./generated/hosts/traveldroid/traveldroid.nix { inputs, config, pkgs, lib, ... }: let - # Import all reusable modules from ./generated/modules - modulesFromTree = builtins.attrValues (inputs.import-tree ./generated/modules); + # Import all reusable modules under ./generated/modules + modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; }); in { - # Top-level imports inside the module + # Host-specific imports imports = [ inputs.home-manager.nixosModules.home-manager ] ++ modulesFromTree ++ [