Compare commits
1 Commits
update-dev
...
push-lxuyo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c6531ca69a |
@@ -58,53 +58,51 @@
|
|||||||
pkgs.buildPackages.xorg.lndir
|
pkgs.buildPackages.xorg.lndir
|
||||||
pkgs.glibcLocales
|
pkgs.glibcLocales
|
||||||
pkgs.kbd.out
|
pkgs.kbd.out
|
||||||
self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".pkgs.perlPackages.ConfigIniFiles
|
self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".pkgs.perlPackages.ConfigIniFiles
|
||||||
self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".pkgs.perlPackages.FileSlurp
|
self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".pkgs.perlPackages.FileSlurp
|
||||||
pkgs.bubblewrap
|
pkgs.bubblewrap
|
||||||
|
|
||||||
self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.toplevel
|
self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.toplevel
|
||||||
self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.diskoScript
|
self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript
|
||||||
self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.diskoScript.drvPath
|
self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript.drvPath
|
||||||
]
|
]
|
||||||
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
|
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
|
||||||
closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
|
closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Skip flash test on aarch64-linux for now as it's too slow
|
# Skip flash test on aarch64-linux for now as it's too slow
|
||||||
checks =
|
checks = lib.optionalAttrs (pkgs.stdenv.isLinux && pkgs.hostPlatform.system != "aarch64-linux") {
|
||||||
lib.optionalAttrs (pkgs.stdenv.isLinux && pkgs.stdenv.hostPlatform.system != "aarch64-linux")
|
nixos-test-flash = self.clanLib.test.baseTest {
|
||||||
{
|
name = "flash";
|
||||||
nixos-test-flash = self.clanLib.test.baseTest {
|
nodes.target = {
|
||||||
name = "flash";
|
virtualisation.emptyDiskImages = [ 4096 ];
|
||||||
nodes.target = {
|
virtualisation.memorySize = 4096;
|
||||||
virtualisation.emptyDiskImages = [ 4096 ];
|
|
||||||
virtualisation.memorySize = 4096;
|
|
||||||
|
|
||||||
virtualisation.useNixStoreImage = true;
|
virtualisation.useNixStoreImage = true;
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
|
|
||||||
environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ];
|
environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ];
|
||||||
environment.etc."install-closure".source = "${closureInfo}/store-paths";
|
environment.etc."install-closure".source = "${closureInfo}/store-paths";
|
||||||
|
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
substituters = lib.mkForce [ ];
|
substituters = lib.mkForce [ ];
|
||||||
hashed-mirrors = null;
|
hashed-mirrors = null;
|
||||||
connect-timeout = lib.mkForce 3;
|
connect-timeout = lib.mkForce 3;
|
||||||
flake-registry = "";
|
flake-registry = "";
|
||||||
experimental-features = [
|
experimental-features = [
|
||||||
"nix-command"
|
"nix-command"
|
||||||
"flakes"
|
"flakes"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
|
||||||
testScript = ''
|
|
||||||
start_all()
|
|
||||||
machine.succeed("echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIRWUusawhlIorx7VFeQJHmMkhl9X3QpnvOdhnV/bQNG root@target' > ./test_id_ed25519.pub")
|
|
||||||
# Some distros like to automount disks with spaces
|
|
||||||
machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdc && mount /dev/vdc "/mnt/with spaces"')
|
|
||||||
machine.succeed("clan flash write --ssh-pubkey ./test_id_ed25519.pub --keymap de --language de_DE.UTF-8 --debug --flake ${self.checks.x86_64-linux.clan-core-for-checks} --yes --disk main /dev/vdc test-flash-machine-${pkgs.stdenv.hostPlatform.system}")
|
|
||||||
'';
|
|
||||||
} { inherit pkgs self; };
|
|
||||||
};
|
};
|
||||||
|
testScript = ''
|
||||||
|
start_all()
|
||||||
|
machine.succeed("echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIRWUusawhlIorx7VFeQJHmMkhl9X3QpnvOdhnV/bQNG root@target' > ./test_id_ed25519.pub")
|
||||||
|
# Some distros like to automount disks with spaces
|
||||||
|
machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdc && mount /dev/vdc "/mnt/with spaces"')
|
||||||
|
machine.succeed("clan flash write --ssh-pubkey ./test_id_ed25519.pub --keymap de --language de_DE.UTF-8 --debug --flake ${self.checks.x86_64-linux.clan-core-for-checks} --yes --disk main /dev/vdc test-flash-machine-${pkgs.hostPlatform.system}")
|
||||||
|
'';
|
||||||
|
} { inherit pkgs self; };
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -160,9 +160,9 @@
|
|||||||
closureInfo = pkgs.closureInfo {
|
closureInfo = pkgs.closureInfo {
|
||||||
rootPaths = [
|
rootPaths = [
|
||||||
privateInputs.clan-core-for-checks
|
privateInputs.clan-core-for-checks
|
||||||
self.nixosConfigurations."test-install-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.toplevel
|
self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.toplevel
|
||||||
self.nixosConfigurations."test-install-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.initialRamdisk
|
self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.initialRamdisk
|
||||||
self.nixosConfigurations."test-install-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.diskoScript
|
self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript
|
||||||
pkgs.stdenv.drvPath
|
pkgs.stdenv.drvPath
|
||||||
pkgs.bash.drvPath
|
pkgs.bash.drvPath
|
||||||
pkgs.buildPackages.xorg.lndir
|
pkgs.buildPackages.xorg.lndir
|
||||||
@@ -215,7 +215,7 @@
|
|||||||
# Prepare test flake and Nix store
|
# Prepare test flake and Nix store
|
||||||
flake_dir = prepare_test_flake(
|
flake_dir = prepare_test_flake(
|
||||||
temp_dir,
|
temp_dir,
|
||||||
"${self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks}",
|
"${self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks}",
|
||||||
"${closureInfo}"
|
"${closureInfo}"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -296,7 +296,7 @@
|
|||||||
# Prepare test flake and Nix store
|
# Prepare test flake and Nix store
|
||||||
flake_dir = prepare_test_flake(
|
flake_dir = prepare_test_flake(
|
||||||
temp_dir,
|
temp_dir,
|
||||||
"${self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks}",
|
"${self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks}",
|
||||||
"${closureInfo}"
|
"${closureInfo}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
cli = self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full;
|
cli = self.packages.${pkgs.hostPlatform.system}.clan-cli-full;
|
||||||
|
|
||||||
ollama-model = pkgs.callPackage ./qwen3-4b-instruct.nix { };
|
ollama-model = pkgs.callPackage ./qwen3-4b-instruct.nix { };
|
||||||
in
|
in
|
||||||
@@ -53,7 +53,7 @@ in
|
|||||||
pytest
|
pytest
|
||||||
pytest-xdist
|
pytest-xdist
|
||||||
(cli.pythonRuntime.pkgs.toPythonModule cli)
|
(cli.pythonRuntime.pkgs.toPythonModule cli)
|
||||||
self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixosTestLib
|
self.legacyPackages.${pkgs.hostPlatform.system}.nixosTestLib
|
||||||
]
|
]
|
||||||
))
|
))
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
cli = self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full;
|
cli = self.packages.${pkgs.hostPlatform.system}.clan-cli-full;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
name = "systemd-abstraction";
|
name = "systemd-abstraction";
|
||||||
|
|||||||
@@ -115,9 +115,9 @@
|
|||||||
let
|
let
|
||||||
closureInfo = pkgs.closureInfo {
|
closureInfo = pkgs.closureInfo {
|
||||||
rootPaths = [
|
rootPaths = [
|
||||||
self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli
|
self.packages.${pkgs.hostPlatform.system}.clan-cli
|
||||||
self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks
|
self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks
|
||||||
self.clanInternals.machines.${pkgs.stdenv.hostPlatform.system}.test-update-machine.config.system.build.toplevel
|
self.clanInternals.machines.${pkgs.hostPlatform.system}.test-update-machine.config.system.build.toplevel
|
||||||
pkgs.stdenv.drvPath
|
pkgs.stdenv.drvPath
|
||||||
pkgs.bash.drvPath
|
pkgs.bash.drvPath
|
||||||
pkgs.buildPackages.xorg.lndir
|
pkgs.buildPackages.xorg.lndir
|
||||||
@@ -132,7 +132,7 @@
|
|||||||
imports = [ self.nixosModules.test-update-machine ];
|
imports = [ self.nixosModules.test-update-machine ];
|
||||||
};
|
};
|
||||||
extraPythonPackages = _p: [
|
extraPythonPackages = _p: [
|
||||||
self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixosTestLib
|
self.legacyPackages.${pkgs.hostPlatform.system}.nixosTestLib
|
||||||
];
|
];
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
# Prepare test flake and Nix store
|
# Prepare test flake and Nix store
|
||||||
flake_dir = prepare_test_flake(
|
flake_dir = prepare_test_flake(
|
||||||
temp_dir,
|
temp_dir,
|
||||||
"${self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks}",
|
"${self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks}",
|
||||||
"${closureInfo}"
|
"${closureInfo}"
|
||||||
)
|
)
|
||||||
(flake_dir / ".clan-flake").write_text("") # Ensure .clan-flake exists
|
(flake_dir / ".clan-flake").write_text("") # Ensure .clan-flake exists
|
||||||
@@ -226,7 +226,7 @@
|
|||||||
"--to",
|
"--to",
|
||||||
"ssh://root@192.168.1.1",
|
"ssh://root@192.168.1.1",
|
||||||
"--no-check-sigs",
|
"--no-check-sigs",
|
||||||
f"${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli}",
|
f"${self.packages.${pkgs.hostPlatform.system}.clan-cli}",
|
||||||
"--extra-experimental-features", "nix-command flakes",
|
"--extra-experimental-features", "nix-command flakes",
|
||||||
],
|
],
|
||||||
check=True,
|
check=True,
|
||||||
@@ -242,7 +242,7 @@
|
|||||||
"-o", "UserKnownHostsFile=/dev/null",
|
"-o", "UserKnownHostsFile=/dev/null",
|
||||||
"-o", "StrictHostKeyChecking=no",
|
"-o", "StrictHostKeyChecking=no",
|
||||||
f"root@192.168.1.1",
|
f"root@192.168.1.1",
|
||||||
"${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli}/bin/clan",
|
"${self.packages.${pkgs.hostPlatform.system}.clan-cli}/bin/clan",
|
||||||
"machines",
|
"machines",
|
||||||
"update",
|
"update",
|
||||||
"--debug",
|
"--debug",
|
||||||
@@ -270,7 +270,7 @@
|
|||||||
|
|
||||||
# Run clan update command
|
# Run clan update command
|
||||||
subprocess.run([
|
subprocess.run([
|
||||||
"${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full}/bin/clan",
|
"${self.packages.${pkgs.hostPlatform.system}.clan-cli-full}/bin/clan",
|
||||||
"machines",
|
"machines",
|
||||||
"update",
|
"update",
|
||||||
"--debug",
|
"--debug",
|
||||||
@@ -297,7 +297,7 @@
|
|||||||
|
|
||||||
# Run clan update command with --build-host
|
# Run clan update command with --build-host
|
||||||
subprocess.run([
|
subprocess.run([
|
||||||
"${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full}/bin/clan",
|
"${self.packages.${pkgs.hostPlatform.system}.clan-cli-full}/bin/clan",
|
||||||
"machines",
|
"machines",
|
||||||
"update",
|
"update",
|
||||||
"--debug",
|
"--debug",
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
!!! Danger "Experimental"
|
|
||||||
This service is experimental and will change in the future.
|
|
||||||
|
|
||||||
This service sets up a certificate authority (CA) that can issue certificates to
|
This service sets up a certificate authority (CA) that can issue certificates to
|
||||||
other machines in your clan. For this the `ca` role is used.
|
other machines in your clan. For this the `ca` role is used.
|
||||||
It additionally provides a `default` role, that can be applied to all machines
|
It additionally provides a `default` role, that can be applied to all machines
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
!!! Danger "Experimental"
|
|
||||||
This service is experimental and will change in the future.
|
|
||||||
|
|
||||||
This module enables hosting clan-internal services easily, which can be resolved
|
This module enables hosting clan-internal services easily, which can be resolved
|
||||||
inside your VPN. This allows defining a custom top-level domain (e.g. `.clan`)
|
inside your VPN. This allows defining a custom top-level domain (e.g. `.clan`)
|
||||||
and exposing endpoints from a machine to others, which will be
|
and exposing endpoints from a machine to others, which will be
|
||||||
|
|||||||
@@ -1,83 +1 @@
|
|||||||
!!! Danger "Experimental"
|
This a test README just to appease the eval warnings if we don't have one
|
||||||
This service is for demonstration purpose only and may change in the future.
|
|
||||||
|
|
||||||
The Hello-World Clan Service is a minimal example showing how to build and register your own service.
|
|
||||||
|
|
||||||
It serves as a reference implementation and is used in clan-core CI tests to ensure compatibility.
|
|
||||||
|
|
||||||
## What it demonstrates
|
|
||||||
|
|
||||||
- How to define a basic Clan-compatible service.
|
|
||||||
- How to structure your service for discovery and configuration.
|
|
||||||
- How Clan services interact with nixos.
|
|
||||||
|
|
||||||
## Testing
|
|
||||||
|
|
||||||
This service demonstrates two levels of testing to ensure quality and stability across releases:
|
|
||||||
|
|
||||||
1. **Unit & Integration Testing** — via [`nix-unit`](https://github.com/nix-community/nix-unit)
|
|
||||||
2. **End-to-End Testing** — via **NixOS VM tests**, which we extended to support **container virtualization** for better performance.
|
|
||||||
|
|
||||||
We highly advocate following the [Practical Testing Pyramid](https://martinfowler.com/articles/practical-test-pyramid.html):
|
|
||||||
|
|
||||||
* Write **unit tests** for core logic and invariants.
|
|
||||||
* Add **one or two end-to-end (E2E)** tests to confirm your service starts and behaves correctly in a real NixOS environment.
|
|
||||||
|
|
||||||
NixOS is **untyped** and frequently changes; tests are the safest way to ensure long-term stability of services.
|
|
||||||
|
|
||||||
```
|
|
||||||
/ \
|
|
||||||
/ \
|
|
||||||
/ E2E \
|
|
||||||
/-------\
|
|
||||||
/ \
|
|
||||||
/Integration\
|
|
||||||
/-------------\
|
|
||||||
/ \
|
|
||||||
/ Unit Tests \
|
|
||||||
-------------------
|
|
||||||
```
|
|
||||||
|
|
||||||
### nix-unit
|
|
||||||
|
|
||||||
We highly advocate the usage of
|
|
||||||
|
|
||||||
[nix-unit](https://github.com/nix-community/nix-unit)
|
|
||||||
|
|
||||||
Example in: tests/eval-tests.nix
|
|
||||||
|
|
||||||
If you use flake-parts you can use the [native integration](https://flake.parts/options/nix-unit.html)
|
|
||||||
|
|
||||||
If nix-unit succeeds you'r nixos evaluation should be mostly correct.
|
|
||||||
|
|
||||||
!!! Tip
|
|
||||||
- Ensure most used 'settings' and variants are tested.
|
|
||||||
- Think about some important edge-cases your system should handle.
|
|
||||||
|
|
||||||
### NixOS VM / Container Test
|
|
||||||
|
|
||||||
!!! Warning "Early Vars & clanTest"
|
|
||||||
The testing system around vars is experimental
|
|
||||||
|
|
||||||
`clanTest` is still experimental and enables container virtualization by default.
|
|
||||||
This is still early and might have some limitations.
|
|
||||||
|
|
||||||
Some minimal boilerplate is needed to use `clanTest`
|
|
||||||
|
|
||||||
```nix
|
|
||||||
nixosLib = import (inputs.nixpkgs + "/nixos/lib") { }
|
|
||||||
nixosLib.runTest (
|
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
self.modules.nixosTest.clanTest
|
|
||||||
# Example in tests/vm/default.nix
|
|
||||||
testModule
|
|
||||||
];
|
|
||||||
hostPkgs = pkgs;
|
|
||||||
|
|
||||||
# Uncomment if you don't want or cannot use containers
|
|
||||||
# test.useContainers = false;
|
|
||||||
}
|
|
||||||
)
|
|
||||||
```
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
{
|
{
|
||||||
_class = "clan.service";
|
_class = "clan.service";
|
||||||
manifest.name = "clan-core/hello-word";
|
manifest.name = "clan-core/hello-word";
|
||||||
manifest.description = "Minimal example clan service that greets the world";
|
manifest.description = "This is a test";
|
||||||
manifest.readme = builtins.readFile ./README.md;
|
manifest.readme = builtins.readFile ./README.md;
|
||||||
|
|
||||||
# This service provides two roles: "morning" and "evening". Roles can be
|
# This service provides two roles: "morning" and "evening". Roles can be
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ in
|
|||||||
# The hello-world service being tested
|
# The hello-world service being tested
|
||||||
../../clanServices/hello-world
|
../../clanServices/hello-world
|
||||||
# Required modules
|
# Required modules
|
||||||
../../nixosModules
|
../../nixosModules/clanCore
|
||||||
];
|
];
|
||||||
testName = "hello-world";
|
testName = "hello-world";
|
||||||
tests = ./tests/eval-tests.nix;
|
tests = ./tests/eval-tests.nix;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
testClan = clanLib.clan {
|
testFlake = clanLib.clan {
|
||||||
self = { };
|
self = { };
|
||||||
# Point to the folder of the module
|
# Point to the folder of the module
|
||||||
# TODO: make this optional
|
# TODO: make this optional
|
||||||
@@ -33,20 +33,10 @@ let
|
|||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
We highly advocate the usage of:
|
|
||||||
https://github.com/nix-community/nix-unit
|
|
||||||
|
|
||||||
If you use flake-parts you can use the native integration: https://flake.parts/options/nix-unit.html
|
|
||||||
*/
|
|
||||||
test_simple = {
|
test_simple = {
|
||||||
# Allows inspection via the nix-repl
|
config = testFlake.config;
|
||||||
# Ignored by nix-unit; it only looks at 'expr' and 'expected'
|
|
||||||
inherit testClan;
|
|
||||||
|
|
||||||
# Assert that jon has the
|
expr = { };
|
||||||
# configured greeting in 'environment.etc.hello.text'
|
expected = { };
|
||||||
expr = testClan.config.nixosConfigurations.jon.config.environment.etc."hello".text;
|
|
||||||
expected = "Good evening World!";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
!!! Danger "Experimental"
|
🚧🚧🚧 Experimental 🚧🚧🚧
|
||||||
This service is experimental and will change in the future.
|
|
||||||
|
Use at your own risk.
|
||||||
|
|
||||||
|
We are still refining its interfaces, instability and breakages are expected.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
!!! Danger "Experimental"
|
|
||||||
This service is experimental and will change in the future.
|
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
{ ... }:
|
{
|
||||||
|
lib,
|
||||||
|
clanLib,
|
||||||
|
directory,
|
||||||
|
...
|
||||||
|
}:
|
||||||
{
|
{
|
||||||
_class = "clan.service";
|
_class = "clan.service";
|
||||||
manifest.name = "clan-core/mycelium";
|
manifest.name = "clan-core/mycelium";
|
||||||
@@ -30,8 +35,24 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
perInstance =
|
perInstance =
|
||||||
{ settings, ... }:
|
|
||||||
{
|
{
|
||||||
|
settings,
|
||||||
|
roles,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
|
||||||
|
exports.networking = {
|
||||||
|
peers = lib.mapAttrs (name: _machine: {
|
||||||
|
host.plain = clanLib.vars.getPublicValue {
|
||||||
|
machine = name;
|
||||||
|
generator = "mycelium";
|
||||||
|
file = "ip";
|
||||||
|
flake = directory;
|
||||||
|
};
|
||||||
|
}) roles.peer.machines;
|
||||||
|
};
|
||||||
|
|
||||||
nixosModule =
|
nixosModule =
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
!!! Danger "Experimental"
|
🚧🚧🚧 Experimental 🚧🚧🚧
|
||||||
This service is experimental and will change in the future.
|
|
||||||
|
Use at your own risk.
|
||||||
|
|
||||||
|
We are still refining its interfaces, instability and breakages are expected.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
!!! Danger "Experimental"
|
🚧🚧🚧 Experimental 🚧🚧🚧
|
||||||
This service is experimental and will change in the future.
|
|
||||||
|
Use at your own risk.
|
||||||
|
|
||||||
|
We are still refining its interfaces, instability and breakages are expected.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
12
devFlake/flake.lock
generated
12
devFlake/flake.lock
generated
@@ -3,10 +3,10 @@
|
|||||||
"clan-core-for-checks": {
|
"clan-core-for-checks": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762113984,
|
"lastModified": 1761204206,
|
||||||
"narHash": "sha256-Gwah5F3ONMhvTYbsnJM4bAv0qcaI3wjz1Nq0rBGWVgo=",
|
"narHash": "sha256-A4KDudGblln1yh8c95OVow2NRlHtbGZXr/pgNenyrNc=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "0f847b4799deee4a2c878ba69bda9c446fe16177",
|
"rev": "aabbe0dfac47b7cfbe2210bcb27fb7ecce93350f",
|
||||||
"shallow": true,
|
"shallow": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.clan.lol/clan/clan-core"
|
"url": "https://git.clan.lol/clan/clan-core"
|
||||||
@@ -105,11 +105,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-dev": {
|
"nixpkgs-dev": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762080734,
|
"lastModified": 1761853358,
|
||||||
"narHash": "sha256-fFunzA7ITlPHRr7dECaFGTBucNiWYEVDNPBw/9gFmII=",
|
"narHash": "sha256-1tBdsBzYJOzVzNOmCFzFMWHw7UUbhkhiYCFGr+OjPTs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bc7f6fa86de9b208edf4ea7bbf40bcd8cc7d70a5",
|
"rev": "262333bca9b49964f8e3cad3af655466597c01d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ Make sure you have the following:
|
|||||||
**Note:** This creates a new directory in your current location
|
**Note:** This creates a new directory in your current location
|
||||||
|
|
||||||
```shellSession
|
```shellSession
|
||||||
nix run "https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-cli" --refresh -- flakes create
|
nix run https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-cli --refresh -- flakes create
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Enter a **name** in the prompt:
|
3. Enter a **name** in the prompt:
|
||||||
|
|||||||
18
flake.lock
generated
18
flake.lock
generated
@@ -31,11 +31,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761899396,
|
"lastModified": 1760701190,
|
||||||
"narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=",
|
"narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998",
|
"rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -51,11 +51,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762040540,
|
"lastModified": 1760948891,
|
||||||
"narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
|
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "0010412d62a25d959151790968765a70c436598b",
|
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -71,11 +71,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762039661,
|
"lastModified": 1761339987,
|
||||||
"narHash": "sha256-oM5BwAGE78IBLZn+AqxwH/saqwq3e926rNq5HmOulkc=",
|
"narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=",
|
||||||
"owner": "nix-darwin",
|
"owner": "nix-darwin",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "c3c8c9f2a5ed43175ac4dc030308756620e6e4e4",
|
"rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ let
|
|||||||
inputs.data-mesher.nixosModules.data-mesher
|
inputs.data-mesher.nixosModules.data-mesher
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
clan.core.clanPkgs = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system};
|
clan.core.clanPkgs = lib.mkDefault self.packages.${pkgs.hostPlatform.system};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -30,5 +30,5 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Note this might jump back and worth as kernel get added or removed.
|
# Note this might jump back and worth as kernel get added or removed.
|
||||||
boot.kernelPackages = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.zfs) latestKernelPackage;
|
boot.kernelPackages = lib.mkIf (lib.meta.availableOn pkgs.hostPlatform pkgs.zfs) latestKernelPackage;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -245,7 +245,7 @@ class SecretStore(StoreBase):
|
|||||||
output_dir / "activation" / generator.name / file.name
|
output_dir / "activation" / generator.name / file.name
|
||||||
)
|
)
|
||||||
out_file.parent.mkdir(parents=True, exist_ok=True)
|
out_file.parent.mkdir(parents=True, exist_ok=True)
|
||||||
out_file.write_bytes(file.value)
|
out_file.write_bytes(self.get(generator, file.name))
|
||||||
if "partitioning" in phases:
|
if "partitioning" in phases:
|
||||||
for generator in vars_generators:
|
for generator in vars_generators:
|
||||||
for file in generator.files:
|
for file in generator.files:
|
||||||
@@ -254,7 +254,7 @@ class SecretStore(StoreBase):
|
|||||||
output_dir / "partitioning" / generator.name / file.name
|
output_dir / "partitioning" / generator.name / file.name
|
||||||
)
|
)
|
||||||
out_file.parent.mkdir(parents=True, exist_ok=True)
|
out_file.parent.mkdir(parents=True, exist_ok=True)
|
||||||
out_file.write_bytes(file.value)
|
out_file.write_bytes(self.get(generator, file.name))
|
||||||
|
|
||||||
hash_data = self.generate_hash(machine)
|
hash_data = self.generate_hash(machine)
|
||||||
if hash_data:
|
if hash_data:
|
||||||
|
|||||||
@@ -246,7 +246,7 @@ class SecretStore(StoreBase):
|
|||||||
)
|
)
|
||||||
# chmod after in case it doesn't have u+w
|
# chmod after in case it doesn't have u+w
|
||||||
target_path.touch(mode=0o600)
|
target_path.touch(mode=0o600)
|
||||||
target_path.write_bytes(file.value)
|
target_path.write_bytes(self.get(generator, file.name))
|
||||||
target_path.chmod(file.mode)
|
target_path.chmod(file.mode)
|
||||||
|
|
||||||
if "partitioning" in phases:
|
if "partitioning" in phases:
|
||||||
@@ -260,7 +260,7 @@ class SecretStore(StoreBase):
|
|||||||
)
|
)
|
||||||
# chmod after in case it doesn't have u+w
|
# chmod after in case it doesn't have u+w
|
||||||
target_path.touch(mode=0o600)
|
target_path.touch(mode=0o600)
|
||||||
target_path.write_bytes(file.value)
|
target_path.write_bytes(self.get(generator, file.name))
|
||||||
target_path.chmod(file.mode)
|
target_path.chmod(file.mode)
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ class ClanSelectError(ClanError):
|
|||||||
|
|
||||||
def __str__(self) -> str:
|
def __str__(self) -> str:
|
||||||
if self.description:
|
if self.description:
|
||||||
return f"{self.msg} Reason: {self.description}. Use flag '--debug' to see full nix trace."
|
return f"{self.msg} Reason: {self.description}"
|
||||||
return self.msg
|
return self.msg
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
|
|||||||
Reference in New Issue
Block a user