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:41:23 +00:00
parent e8774e1a22
commit 15f38baa5b
3 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+5 -13
View File
@@ -113,15 +113,10 @@ The Nix flake definition for Droidnix.
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Host module now only defines configuration
./generated/hosts/traveldroid/traveldroid.nix ./generated/hosts/traveldroid/traveldroid.nix
# Optional host-specific boot/hardware overrides
./generated/hosts/traveldroid/boot.nix ./generated/hosts/traveldroid/boot.nix
./generated/hosts/traveldroid/hardware-configuration.nix ./generated/hosts/traveldroid/hardware-configuration.nix
stylix.nixosModules.default
# External modules like stylix can also be added here if needed
# stylix.nixosModules.default
]; ];
}; };
}; };
@@ -369,20 +364,17 @@ 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, config, lib, pkgs, ... }:
{ inputs, config, pkgs, lib, ... }:
let let
# Import all reusable modules under ./generated/modules via the flake input # Import all reusable modules via the flake input
modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; }); modulesFromTree = builtins.attrValues (inputs.import-tree { path = ../modules; });
in in
{ {
# Host-specific imports # Host-specific imports
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
] ++ modulesFromTree ++ [ ] ++ modulesFromTree;
./hardware-configuration.nix
];
# Host-specific configuration # Host-specific configuration
networking.hostName = "traveldroid"; networking.hostName = "traveldroid";
Droidnix/flake.nix
+1 -6
View File
@@ -41,15 +41,10 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Host module now only defines configuration
./generated/hosts/traveldroid/traveldroid.nix ./generated/hosts/traveldroid/traveldroid.nix
# Optional host-specific boot/hardware overrides
./generated/hosts/traveldroid/boot.nix ./generated/hosts/traveldroid/boot.nix
./generated/hosts/traveldroid/hardware-configuration.nix ./generated/hosts/traveldroid/hardware-configuration.nix
stylix.nixosModules.default
# External modules like stylix can also be added here if needed
# stylix.nixosModules.default
]; ];
}; };
}; };
Droidnix/generated/hosts/traveldroid/boot.nix
+4 -7
View File
@@ -1,17 +1,14 @@
# ./generated/hosts/traveldroid/traveldroid.nix { inputs, config, lib, pkgs, ... }:
{ inputs, config, pkgs, lib, ... }:
let let
# Import all reusable modules under ./generated/modules via the flake input # Import all reusable modules via the flake input
modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; }); modulesFromTree = builtins.attrValues (inputs.import-tree { path = ../modules; });
in in
{ {
# Host-specific imports # Host-specific imports
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
] ++ modulesFromTree ++ [ ] ++ modulesFromTree;
./hardware-configuration.nix
];
# Host-specific configuration # Host-specific configuration
networking.hostName = "traveldroid"; networking.hostName = "traveldroid";