Skip to content

Commit 1e498d8

Browse files
committed
Create default system manager configuration
1 parent a07b348 commit 1e498d8

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
nix/packages
6060
nix/overlays
6161
nix/systemModules
62+
nix/systemConfigs.nix
6263
];
6364
});
6465
}

nix/packages/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
inherit (self'.packages) overlayfs-on-package;
6767
};
6868
sync-exts-versions = pkgs.callPackage ./sync-exts-versions.nix { inherit (inputs') nix-editor; };
69+
system-manager = inputs'.system-manager.packages.default;
6970
trigger-nix-build = pkgs.callPackage ./trigger-nix-build.nix { };
7071
update-readme = pkgs.callPackage ./update-readme.nix { };
7172
inherit (pkgs.callPackage ./wal-g.nix { }) wal-g-2 wal-g-3;

nix/systemConfigs.nix

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{ self, inputs, ... }:
2+
let
3+
mkModules = system: [
4+
({
5+
services.nginx.enable = true;
6+
nixpkgs.hostPlatform = system;
7+
})
8+
];
9+
10+
systems = [
11+
"aarch64-linux"
12+
"x86_64-linux"
13+
];
14+
15+
mkSystemConfig = system: {
16+
name = system;
17+
value.default = inputs.system-manager.lib.makeSystemConfig {
18+
modules = mkModules system;
19+
extraSpecialArgs = {
20+
inherit self;
21+
inherit system;
22+
};
23+
};
24+
};
25+
in
26+
{
27+
flake = {
28+
systemConfigs = builtins.listToAttrs (map mkSystemConfig systems);
29+
};
30+
}

nix/systemModules/tests/default.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,7 @@
1212
check-system-manager =
1313
let
1414
lib = pkgs.lib;
15-
systemManagerConfig = self.inputs.system-manager.lib.makeSystemConfig {
16-
modules = [
17-
({
18-
services.nginx.enable = true;
19-
nixpkgs.hostPlatform = pkgs.system;
20-
})
21-
];
22-
};
15+
systemManagerConfig = self.systemConfigs.${pkgs.system}.default;
2316

2417
dockerImageUbuntuWithTools =
2518
let

0 commit comments

Comments
 (0)