yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Template: fix flake-parts template' (#1982) from hsjobeki/clan-core:hsjobeki-main into main

Browse Source
This commit is contained in:
clan-bot
2024-08-27 12:30:33 +00:00
parent faf20dc197 732ba9d176
commit a4346a8702
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/build-clan/module.nix
View File

@@ -163,7 +163,7 @@ let
); );
################################################## ##################################################
allMachines = inventory.machines or { } // config.machines or { } // testMachines; allMachines = inventory.machines or { } // machines // testMachines;
supportedSystems = [ supportedSystems = [
"x86_64-linux" "x86_64-linux"

2
pkgs/clan-cli/clan_cli/clan/create.py
View File

@@ -102,7 +102,7 @@ def register_create_parser(parser: argparse.ArgumentParser) -> None:
parser.add_argument( parser.add_argument(
"--template", "--template",
type=str, type=str,
choices=["default", "minimal"], choices=["default", "minimal", "flake-parts"],
help="Clan template name", help="Clan template name",
default="default", default="default",
) )

20
templates/flake-parts/flake.nix
View File

@@ -2,7 +2,7 @@
description = "<Put your description here>"; description = "<Put your description here>";
inputs.clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; inputs.clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz";
inputs.nixpkgs.url = "clan/nixpkgs"; inputs.nixpkgs.follows = "clan-core/nixpkgs";
inputs.flake-parts.url = "github:hercules-ci/flake-parts"; inputs.flake-parts.url = "github:hercules-ci/flake-parts";
inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
@@ -30,11 +30,11 @@
inherit (self) inputs nixosModules packages; inherit (self) inputs nixosModules packages;
}; };
directory = self; directory = self;
machines = machines = {
{ pkgs, ... }: # "jon" will be the hostname of the machine
{ jon =
# "jon" will be the hostname of the machine { pkgs, ... }:
jon = { {
imports = [ imports = [
./modules/shared.nix ./modules/shared.nix
./modules/disko.nix ./modules/disko.nix
@@ -66,8 +66,10 @@
# the controller can be offline and routing still works. # the controller can be offline and routing still works.
clan.core.networking.zerotier.controller.enable = true; clan.core.networking.zerotier.controller.enable = true;
}; };
# "sara" will be the hostname of the machine # "sara" will be the hostname of the machine
sara = { sara =
{ pkgs, ... }:
{
imports = [ imports = [
./modules/shared.nix ./modules/shared.nix
./modules/disko.nix ./modules/disko.nix
@@ -102,7 +104,7 @@
*/ */
# clan.core.networking.zerotier.networkId = builtins.readFile ../jon/facts/zerotier-network-id; # clan.core.networking.zerotier.networkId = builtins.readFile ../jon/facts/zerotier-network-id;
}; };
}; };
}; };
perSystem = perSystem =
{ pkgs, inputs', ... }: { pkgs, inputs', ... }:

4
templates/flake.nix
View File

@@ -11,6 +11,10 @@
description = "for clans managed via (G)UI"; description = "for clans managed via (G)UI";
path = ./minimal; path = ./minimal;
}; };
flake-parts = {
description = "Flake-parts";
path = ./flake-parts;
};
}; };
}; };
} }