From 22cd98aac359f740ffd388145337333fec47c83c Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 10:29:26 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 29 +++++++++++++++++------------ Droidnix/flake.nix | 29 +++++++++++++++++------------ 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 237e3a119..f69b88834 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -70,6 +70,7 @@ This section contains the Org blocks for tangling Nix code into the generated fo ** =flake.nix= The Nix flake definition for Droidnix. #+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html +# flake.nix { description = "Droidnix: A dendritic NixOS + Home Manager configuration"; @@ -101,24 +102,28 @@ The Nix flake definition for Droidnix. }; }; - outputs = inputs@{ flake-parts, nixpkgs, home-manager, stylix, ... }: + outputs = inputs@{ flake-parts, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" ]; flake = { - nixosConfigurations.traveldroid = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; + nixosConfigurations.traveldroid = + nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; - modules = [ - # Host module imports all reusable modules internally - ./generated/hosts/traveldroid/traveldroid.nix + modules = [ + # Host module now only defines configuration + ./generated/hosts/traveldroid/traveldroid.nix - # Optional host-specific things - ./generated/hosts/traveldroid/boot.nix - ./generated/hosts/traveldroid/hardware-configuration.nix - ]; - }; + # Optional host-specific boot/hardware overrides + ./generated/hosts/traveldroid/boot.nix + ./generated/hosts/traveldroid/hardware-configuration.nix + + # External modules like stylix can also be added here if needed + # stylix.nixosModules.default + ]; + }; }; }; } diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index 63277c844..5e4c4436d 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -1,3 +1,4 @@ +# flake.nix { description = "Droidnix: A dendritic NixOS + Home Manager configuration"; @@ -29,24 +30,28 @@ }; }; - outputs = inputs@{ flake-parts, nixpkgs, home-manager, stylix, ... }: + outputs = inputs@{ flake-parts, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" ]; flake = { - nixosConfigurations.traveldroid = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; + nixosConfigurations.traveldroid = + nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; - modules = [ - # Host module imports all reusable modules internally - ./generated/hosts/traveldroid/traveldroid.nix + modules = [ + # Host module now only defines configuration + ./generated/hosts/traveldroid/traveldroid.nix - # Optional host-specific things - ./generated/hosts/traveldroid/boot.nix - ./generated/hosts/traveldroid/hardware-configuration.nix - ]; - }; + # Optional host-specific boot/hardware overrides + ./generated/hosts/traveldroid/boot.nix + ./generated/hosts/traveldroid/hardware-configuration.nix + + # External modules like stylix can also be added here if needed + # stylix.nixosModules.default + ]; + }; }; }; }