From 15f38baa5bf3b67bac3d2fc9c3ed9180d31cbac3 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 10:41:23 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 18 +++++------------- Droidnix/flake.nix | 7 +------ Droidnix/generated/hosts/traveldroid/boot.nix | 11 ++++------- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index faa4cc50c..d0d94f115 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -113,15 +113,10 @@ The Nix flake definition for Droidnix. specialArgs = { inherit inputs; }; modules = [ - # Host module now only defines configuration ./generated/hosts/traveldroid/traveldroid.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 + stylix.nixosModules.default ]; }; }; @@ -369,20 +364,17 @@ 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 -{ inputs, config, pkgs, lib, ... }: +{ inputs, config, lib, pkgs, ... }: let - # Import all reusable modules under ./generated/modules via the flake input - modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; }); + # Import all reusable modules via the flake input + modulesFromTree = builtins.attrValues (inputs.import-tree { path = ../modules; }); in { # Host-specific imports imports = [ inputs.home-manager.nixosModules.home-manager - ] ++ modulesFromTree ++ [ - ./hardware-configuration.nix - ]; + ] ++ modulesFromTree; # Host-specific configuration networking.hostName = "traveldroid"; diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index 5e4c4436d..002c18fec 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -41,15 +41,10 @@ specialArgs = { inherit inputs; }; modules = [ - # Host module now only defines configuration ./generated/hosts/traveldroid/traveldroid.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 + stylix.nixosModules.default ]; }; }; diff --git a/Droidnix/generated/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix index ff52e4ac9..fe5e9f84c 100644 --- a/Droidnix/generated/hosts/traveldroid/boot.nix +++ b/Droidnix/generated/hosts/traveldroid/boot.nix @@ -1,17 +1,14 @@ -# ./generated/hosts/traveldroid/traveldroid.nix -{ inputs, config, pkgs, lib, ... }: +{ inputs, config, lib, pkgs, ... }: let - # Import all reusable modules under ./generated/modules via the flake input - modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; }); + # Import all reusable modules via the flake input + modulesFromTree = builtins.attrValues (inputs.import-tree { path = ../modules; }); in { # Host-specific imports imports = [ inputs.home-manager.nixosModules.home-manager - ] ++ modulesFromTree ++ [ - ./hardware-configuration.nix - ]; + ] ++ modulesFromTree; # Host-specific configuration networking.hostName = "traveldroid";