Skip to content

Commit aca04a4

Browse files
committed
Move modules into platforms/ directory
No meaningful change. This aligns closer with patterns I've been developing in my dotfiles.
1 parent a2b8f85 commit aca04a4

36 files changed

+10
-8
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ The file storage module manages ZFS pools and datasets. A host profile attaches
2020

2121
## Project Structure
2222

23-
- `nixos/modules/lab`: Unopinionated "library" modules for building a home lab.
24-
- `nixos/tests`: Virtual machine tests for services in `modules/lab`.
25-
- `nixos/modules/lab/profiles`: Opinionated configurations.
23+
- `platforms/nixos/modules/lab`: Unopinionated "library" modules for building a home lab.
24+
- `platforms/nixos/tests`: Virtual machine tests for services in `modules/lab`.
25+
- `platforms/nixos/modules/lab/profiles`: Opinionated configurations.
2626
- `hosts`: Per-host configurations. They are thin wrappers around profiles.
2727

2828
Tests can be executed by entering a dev shell and running `project test <drv_path>`:

flake.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
# of `flake.packages` while remaining easily scriptable.
328328
testScripts = eachSystem (
329329
system: pkgs: {
330-
docs = pkgs.callPackage ./nixos/doc {
330+
docs = pkgs.callPackage ./platforms/nixos/doc {
331331
inherit (flake-inputs) colmena home-manager clapfile;
332332
revision = self.rev or "latest";
333333
};
@@ -348,7 +348,9 @@
348348
# ```
349349
# nix build .#tests.<module>.<test-name>
350350
# ```
351-
passthru = pkgs.callPackage ./nixos/tests { inherit (flake-inputs) colmena clapfile home-manager; };
351+
passthru = pkgs.callPackage ./platforms/nixos/tests {
352+
inherit (flake-inputs) colmena clapfile home-manager;
353+
};
352354
};
353355
}
354356
);

lib/define-host.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ in
3030
imports = [
3131
inputs.home-manager.nixosModules.home-manager
3232
inputs.clapfile.nixosModules.nixos
33-
../nixos/modules
33+
../platforms/nixos/modules
3434
host.profile
3535
host.module
3636
macvlan-proxy
@@ -75,7 +75,7 @@ in
7575
useGlobalPkgs = lib.mkDefault true;
7676
useUserPackages = lib.mkDefault true;
7777
sharedModules = [
78-
../home-manager/modules
78+
../platforms/home-manager/modules
7979

8080
{
8181
# Manage the system shell by default.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

nixos/tests/default.nix renamed to platforms/nixos/tests/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let
1818
];
1919

2020
home-manager = {
21-
sharedModules = [ ../../home-manager/modules ];
21+
sharedModules = [ ../../platforms/home-manager/modules ];
2222
useGlobalPkgs = true;
2323
useUserPackages = true;
2424
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)