Commit Graph

4049 Commits

Author SHA1 Message Date
clan-bot
c3c5ba4fc5 Merge pull request 'vars: use correct paths for value accesses' (#2071) from kenji/clan-core:kenji-vars/fix/values into main 2024-09-11 17:10:50 +00:00
a-kenji
6dd1a7395f vars: use correct paths for value accesses
Use correct paths for value accesses of vars under:

- `per-machine`
- `shared`
2024-09-11 19:02:43 +02:00
clan-bot
cdfda2547b Merge pull request 'clanModules.nginx: replace acme fact with concrete value' (#2067) from nginx into main 2024-09-11 09:58:23 +00:00
Jörg Thalheim
a1e2a0513c clanModules.nginx: replace acme fact with concrete value
We shouldn't abuse prompts to require a user to set an option. Instead
our NixOS modules should expose which option need to be specified by the
user.
2024-09-11 11:45:23 +02:00
clan-bot
cac5e95758 Merge pull request 'Revert "Merge pull request 'machine_id_v2' (#2052) from Qubasa/clan-core:machine_id_v2 into main"' (#2066) from kenji/clan-core:kenji-revert/diskId_v2 into main 2024-09-10 12:20:35 +00:00
a-kenji
b13ed922b1 Revert "Merge pull request 'machine_id_v2' (#2052) from Qubasa/clan-core:machine_id_v2 into main"
This reverts commit 22a11abfe5, reversing
changes made to 208b71ac0e.
2024-09-10 14:01:12 +02:00
clan-bot
b0e8ae7adb Merge pull request 'vars/password-store: implement upload and hashing' (#2063) from DavHau/clan-core:DavHau-dave into main 2024-09-09 20:19:30 +00:00
DavHau
a79ec63720 vars/password-store: implement upload and hashing 2024-09-09 22:13:16 +02:00
clan-bot
a10fb9fc36 Merge pull request 'merge-after-ci: unstash only if stashed' (#2062) from DavHau/clan-core:DavHau-dave into main 2024-09-09 20:10:42 +00:00
DavHau
f2f9075b88 merge-after-ci: unstash only if stashed 2024-09-09 22:05:49 +02:00
clan-bot
83b74f3d30 Merge pull request 'vars/password-store: use standard paths; fix share flag' (#2061) from DavHau/clan-core:DavHau-dave into main 2024-09-09 19:41:12 +00:00
DavHau
0893b04458 vars/password-store: use standard paths; fix share flag 2024-09-09 21:20:03 +02:00
clan-bot
b2103e165f Merge pull request 'select-shell: show available names if provided name is incorrect' (#2060) from DavHau/clan-core:DavHau-dave into main 2024-09-09 18:58:05 +00:00
DavHau
8dccce99a3 merge-after-ci: don't run treefmt on uncommitted changes
stash changes before running formatter
2024-09-09 20:51:37 +02:00
DavHau
b782128622 select-shell: show available names if provided name is incorrect 2024-09-09 20:48:44 +02:00
Luis Hebendanz
22a11abfe5 Merge pull request 'machine_id_v2' (#2052) from Qubasa/clan-core:machine_id_v2 into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/2052
2024-09-09 17:17:27 +00:00
Qubasa
5c975a5eef clanCore: init machineId and diskId v2 2024-09-09 15:51:31 +02:00
clan-bot
208b71ac0e Merge pull request 'Automatic flake update - treefmt-nix - 2024-09-09T00:00+00:00' (#2059) from flake-update-treefmt-nix-2024-09-09 into main 2024-09-09 00:35:23 +00:00
clan-bot
1e513f08bf Merge pull request 'Automatic flake update - 2024-09-09T00:00+00:00' (#2058) from flake-update-2024-09-09 into main 2024-09-09 00:34:38 +00:00
clan-bot
4ae2048ea5 Merge pull request 'Automatic flake update - nixos-images - 2024-09-09T00:00+00:00' (#2055) from flake-update-nixos-images-2024-09-09 into main 2024-09-09 00:30:58 +00:00
clan-bot
82c8bb28d0 Merge pull request 'Automatic flake update - nixpkgs - 2024-09-09T00:00+00:00' (#2056) from flake-update-nixpkgs-2024-09-09 into main 2024-09-09 00:30:44 +00:00
clan-bot
2a81be3e1b Merge pull request 'Automatic flake update - sops-nix - 2024-09-09T00:00+00:00' (#2057) from flake-update-sops-nix-2024-09-09 into main 2024-09-09 00:30:43 +00:00
clan-bot
6586d3bf68 Merge pull request 'Automatic flake update - disko - 2024-09-09T00:00+00:00' (#2053) from flake-update-disko-2024-09-09 into main 2024-09-09 00:15:15 +00:00
clan-bot
293df269df Merge pull request 'Automatic flake update - nixos-facter-modules - 2024-09-09T00:00+00:00' (#2054) from flake-update-nixos-facter-modules-2024-09-09 into main 2024-09-09 00:15:14 +00:00
Clan Merge Bot
eedc434838 update flake lock - treefmt-nix - 2024-09-09T00:00+00:00
Flake lock file updates:

• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/23c2b0d953710939487ec878d70495d73b2c9bb3' (2024-09-02)
  → 'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd' (2024-09-02)
2024-09-09 00:00:44 +00:00
Clan Merge Bot
7202010608 update flake lock - 2024-09-09T00:00+00:00
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/511388d837178979de66d14ca4a2ebd5f7991cd3' (2024-08-29)
  → 'github:nix-community/disko/e55f9a8678adc02024a4877c2a403e3f6daf24fe' (2024-09-03)
• Updated input 'nixos-facter-modules':
    'github:numtide/nixos-facter-modules/55088bf19810d23ca7cb86fb71516c95d97f035b' (2024-08-26)
  → 'github:numtide/nixos-facter-modules/a389bf16ed7db1f7e6a5e9dc4b5547e927498803' (2024-09-03)
• Updated input 'nixos-images':
    'github:nix-community/nixos-images/b733f0680a42cc01d6ad53896fb5ca40a66d5e79' (2024-08-19)
  → 'github:nix-community/nixos-images/51c98a9f328e7aad81d8aa048f38e4e5c86d3389' (2024-09-07)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/8da188f8e754473cb2f5a922bef75a734bfa0fd6' (2024-08-25)
  → 'github:NixOS/nixpkgs/61ddb09cfaa7424d7fc8e3040ccd5c8c6f875b15' (2024-09-08)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/5db5921e40ae382d6716dce591ea23b0a39d96f7' (2024-09-01)
  → 'github:Mic92/sops-nix/b68757cd2c3fa66d6ccaa0d046ce42a9324e0070' (2024-09-08)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/23c2b0d953710939487ec878d70495d73b2c9bb3' (2024-09-02)
  → 'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd' (2024-09-02)
2024-09-09 00:00:44 +00:00
Clan Merge Bot
114ff290f8 update flake lock - sops-nix - 2024-09-09T00:00+00:00
Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/5db5921e40ae382d6716dce591ea23b0a39d96f7' (2024-09-01)
  → 'github:Mic92/sops-nix/b68757cd2c3fa66d6ccaa0d046ce42a9324e0070' (2024-09-08)
2024-09-09 00:00:41 +00:00
Clan Merge Bot
c3199f80a5 update flake lock - nixpkgs - 2024-09-09T00:00+00:00
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/8da188f8e754473cb2f5a922bef75a734bfa0fd6' (2024-08-25)
  → 'github:NixOS/nixpkgs/61ddb09cfaa7424d7fc8e3040ccd5c8c6f875b15' (2024-09-08)
2024-09-09 00:00:37 +00:00
Clan Merge Bot
9210a89299 update flake lock - nixos-images - 2024-09-09T00:00+00:00
Flake lock file updates:

• Updated input 'nixos-images':
    'github:nix-community/nixos-images/b733f0680a42cc01d6ad53896fb5ca40a66d5e79' (2024-08-19)
  → 'github:nix-community/nixos-images/51c98a9f328e7aad81d8aa048f38e4e5c86d3389' (2024-09-07)
2024-09-09 00:00:06 +00:00
Clan Merge Bot
8bebe5c857 update flake lock - nixos-facter-modules - 2024-09-09T00:00+00:00
Flake lock file updates:

• Updated input 'nixos-facter-modules':
    'github:numtide/nixos-facter-modules/55088bf19810d23ca7cb86fb71516c95d97f035b' (2024-08-26)
  → 'github:numtide/nixos-facter-modules/a389bf16ed7db1f7e6a5e9dc4b5547e927498803' (2024-09-03)
2024-09-09 00:00:03 +00:00
Clan Merge Bot
75c79165ca update flake lock - disko - 2024-09-09T00:00+00:00
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/511388d837178979de66d14ca4a2ebd5f7991cd3' (2024-08-29)
  → 'github:nix-community/disko/e55f9a8678adc02024a4877c2a403e3f6daf24fe' (2024-09-03)
2024-09-09 00:00:01 +00:00
clan-bot
f54513d216 Merge pull request 'revert machine_id pull request' (#2051) from Qubasa/clan-core:Qubasa-revert-machine-id into main 2024-09-06 19:45:05 +00:00
clan-bot
720f7b2181 Merge pull request 'vars: improve generator pipeline' (#2050) from DavHau/clan-core:DavHau-dave into main 2024-09-06 19:39:53 +00:00
Qubasa
2efa096d29 revert machine_id pull request 2024-09-06 21:38:50 +02:00
DavHau
803f43dfd1 vars: improve generator pipeline
Compute the whole closure of to-be-executed generators upfront before executing anything

Properly compute closures for the 4 different scenarios:

1. full_closure: run all generators for a selected machine in topological order
2. all_missing_closure: run just the missing generators including their dependents
3. requested_closure: run only a selected list of generators including their missing dependencies and their dependents
4. minimal_closure: Run just enough to ensure that the list of selected generators are in a consistent state. Don't execute anything if nothing is missing.
2024-09-06 21:32:17 +02:00
clan-bot
9590125849 Merge pull request 'clanCore: Init machine.id and idShort' (#2045) from Qubasa/clan-core:Qubasa-main into main 2024-09-06 17:00:34 +00:00
Qubasa
67bc66164c templates: Rename diskIdShort to diskId 2024-09-06 18:55:00 +02:00
Qubasa
2568002611 clan-cli: Make run_vm_in_thread fail fast. Fix generate_flake to support machine_id 2024-09-06 18:53:02 +02:00
Qubasa
4171d5ea4e clanCore: init machine_id.nix with clan.core.machine.{id,diskId} 2024-09-06 18:05:40 +02:00
clan-bot
bab7084246 Merge pull request 'vars: refactor - ask prompts before running any generators' (#2048) from DavHau/clan-core:DavHau-dave into main 2024-09-06 14:16:06 +00:00
DavHau
6bb93d087c vars: refactor - ask prompts before running any generators 2024-09-06 16:08:46 +02:00
clan-bot
fdfb135315 Merge pull request 'tea-create-pr: get rid of runtime nix eval' (#2047) from DavHau/clan-core:DavHau-dave into main 2024-09-06 13:51:49 +00:00
DavHau
16845cae3c tea-create-pr: get rid of runtime nix eval
...instead use our treefmt wrapper derivation which is exactly the same
but doesn't require an eval at runtime
2024-09-06 15:46:15 +02:00
clan-bot
8b2af03230 Merge pull request 'vars: improve generator execution pipeline' (#2046) from DavHau/clan-core:DavHau-dave into main 2024-09-06 13:43:03 +00:00
DavHau
3089296328 clan-cli: fix cyclic import problem 2024-09-06 15:38:12 +02:00
DavHau
5cd9960ed4 vars: improve generator execution pipeline
- ensure all dependents are re-generated as well
- refactor: separate out computation of generator update closure
2024-09-06 14:30:49 +02:00
clan-bot
f4fb9ea96c Merge pull request 'vars: add api endpoint set_prompts' (#2044) from DavHau/clan-core:DavHau-dave into main 2024-09-04 16:11:12 +00:00
DavHau
a57525d5c6 vars: add api endpoint set_prompts 2024-09-04 18:06:11 +02:00
clan-bot
3d9e5f525f Merge pull request 'vars: add get_prompts api endpoint' (#2043) from DavHau/clan-core:DavHau-dave into main 2024-09-04 15:42:17 +00:00
DavHau
ed1738c0cd vars: add get_prompts api endpoint
vars: add test for api endpoint get_prompts
2024-09-04 17:36:50 +02:00