Commit Graph

3366 Commits

Author SHA1 Message Date
Jörg Thalheim
6a2e24e7ff lib.readFact: fix argument order 2024-07-09 15:23:26 +02:00
Jörg Thalheim
872a5fdc80 lib.facts: assume clanDir instead of machines prefix 2024-07-09 15:05:00 +02:00
Jörg Thalheim
a24c183ec5 lib.readFact: change order of arguments 2024-07-09 14:44:35 +02:00
Jörg Thalheim
6c91cff672 better project root hint 2024-07-09 13:49:42 +02:00
clan-bot
bb78eff301 Merge pull request 'lib/facts: rename machineDir -> clanDir' (#1720) from Mic92-main into main 2024-07-09 11:05:46 +00:00
Jörg Thalheim
9c8d993342 rename machineDir -> clanDir 2024-07-09 13:00:34 +02:00
clan-bot
455db8f37d Merge pull request 'Reapply "clan.core: rename clan.{deployment,networking} -> clan.core.{deployment,networking}"' (#1712) from DavHau/clan-core:DavHau-dave into main 2024-07-09 09:52:52 +00:00
clan-bot
59e56ac949 Merge pull request 'improve error message for removed settings.json' (#1719) from Mic92-main into main 2024-07-09 09:52:01 +00:00
Jörg Thalheim
00dbdaf071 improve error message for removed settings.json 2024-07-09 11:44:29 +02:00
Mic92
3e6c41593d Merge branch 'main' into DavHau-dave 2024-07-09 09:33:11 +00:00
clan-bot
9fe0c07eb4 Merge pull request 'vars: init' (#1718) from DavHau/clan-core:DavHau-vars into main 2024-07-09 07:31:31 +00:00
DavHau
3447a98bee vars: implement generating public variables via in_repo 2024-07-09 14:26:56 +07:00
DavHau
26ff2beea9 clan-cli: add vars command 2024-07-09 12:42:29 +07:00
DavHau
9ff0045698 WIP: vars: copy python code from facts 2024-07-09 12:42:29 +07:00
clan-bot
d62f221309 Merge pull request 'Automatic flake update - 2024-07-08T00:00+00:00' (#1715) from flake-update-2024-07-08 into main 2024-07-08 14:35:02 +00:00
Jörg Thalheim
e1b7805aef fix new linter issues 2024-07-08 16:30:15 +02:00
Jörg Thalheim
83371fca47 quote .envrc 2024-07-08 16:25:16 +02:00
Jörg Thalheim
4f2f663b3b reformat script-writers with nixfmt 2024-07-08 16:24:34 +02:00
Jörg Thalheim
f62c30f81d fix shellcheck warnings 2024-07-08 16:24:34 +02:00
Jörg Thalheim
9e6d5124ad add shellcheck hints to all envrc files 2024-07-08 16:24:34 +02:00
Jörg Thalheim
29616a8b5d fix mkdocs-rss-plugin deps 2024-07-08 16:24:34 +02:00
Jörg Thalheim
b4a0f8484d remove nixos-generators 2024-07-08 16:24:34 +02:00
Jörg Thalheim
d4917cd4ab remove obsolete iso installer
This is now part of nixos-images
2024-07-08 16:24:34 +02:00
Jörg Thalheim
bd8515fa59 treefmt: upgrade nixfmt options 2024-07-08 16:24:34 +02:00
Jörg Thalheim
50a2b90d66 gnome.adwaita-icon-theme -> adwaita-icon-theme 2024-07-08 15:59:54 +02:00
Jörg Thalheim
487b7330ab matrix-synapse: remove obsolete patches 2024-07-08 15:59:54 +02:00
Clan Merge Bot
a55bf3044d update flake lock - 2024-07-08T00:00+00:00
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/e1174d991944a01eaaa04bc59c6281edca4c0e6e' (2024-06-20)
  → 'github:nix-community/disko/64679cd7f318c9b6595902b47d4585b1d51d5f9e' (2024-07-04)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01)
  → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03)
• Updated input 'nixos-generators':
    'github:nix-community/nixos-generators/35c20ba421dfa5059e20e0ef2343c875372bdcf3' (2024-06-10)
  → 'github:nix-community/nixos-generators/168b220231a70e47cc1f0919048fa5914415fb18' (2024-07-04)
• Updated input 'nixos-images':
    'github:nix-community/nixos-images/c1e6a5f7b08f1c9993de1cfc5f15f838bf783b88' (2024-06-20)
  → 'github:nix-community/nixos-images/f8650460d37d9d1820a93ebb7f0db5b6c3621946' (2024-07-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3664857c48feacb35770c00abfdc671e55849be5' (2024-06-27)
  → 'github:NixOS/nixpkgs/60a94e515488e335bd5bce096431d490486915e3' (2024-07-07)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/5e2e9421e9ed2b918be0a441c4535cfa45e04811' (2024-06-23)
  → 'github:Mic92/sops-nix/c184aca4db5d71c3db0c8cbfcaaec337a5d065ea' (2024-07-07)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/68eb1dc333ce82d0ab0c0357363ea17c31ea1f81' (2024-06-16)
  → 'github:numtide/treefmt-nix/e1d7bd5ec6fc389eb3a90e232c4150338bf6a508' (2024-07-07)
2024-07-08 15:59:54 +02:00
kenji
7ad5b63cb6 Merge pull request 'zerotier-static-peers: add external devices' (#1698) from kenji/clan-core:zerotier-static/add-external into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1698
2024-07-08 07:40:09 +00:00
a-kenji
8e3a265ce9 zerotier-static-peers: add external devices
Allow the `zerotier-auto-accept` service to add external devices through
their respective `zerotierID`, or their `zerotierIP` in a stateless way.

This is useful to either add mobile phones, that can't be managed
through clan yet, or to add devices of other peoples clans, to connect
them together.
2024-07-08 07:40:09 +00:00
clan-bot
770a2c3e1e Merge pull request 'API: extensions & tests' (#1699) from hsjobeki/clan-core:hsjobeki-main into main 2024-07-06 16:01:27 +00:00
Johannes Kirschbauer
04ef8d824e Inventory spec: make system optional 2024-07-06 17:56:22 +02:00
Johannes Kirschbauer
2ebc0902c1 Test: fixup 2024-07-06 17:51:46 +02:00
Johannes Kirschbauer
a7b7cc888b Test: ensure type inference runs on all dataclasses 2024-07-06 17:22:47 +02:00
Johannes Kirschbauer
cb13ddb464 API Types: treat '_*' as private fields and dont inspect them 2024-07-06 17:22:47 +02:00
Johannes Kirschbauer
d8ff8b042f Doc: add conceptual documentation 2024-07-06 17:22:47 +02:00
Johannes Kirschbauer
9eb00df6b7 buildClan: autoimport configuration.nix & hardware-configuration.nix 2024-07-06 17:22:47 +02:00
DavHau
4cde2d96be Reapply "clan.core: rename clan.{deployment,networking} -> clan.core.{deployment,networking}"
This reverts commit 9778444706.

workaround upstream bug: https://github.com/NixOS/nixpkgs/issues/324802
2024-07-05 19:29:01 +07:00
Mic92
fb38516a86 Merge pull request 'Revert "clan.core: rename clan.{deployment,networking} -> clan.core.{deployment,networking}"' (#1710) from revert-broken-migration into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1710
2024-07-05 09:48:24 +00:00
clan-bot
e5c692f0cf Merge pull request 'clan-cli tests: remove dynamic inclusion of helpers module' (#1711) from DavHau/clan-core:DavHau-dave into main 2024-07-05 09:43:19 +00:00
DavHau
0367fc1e90 clan-cli tests: remove dynamic inclusion of helpers module
Dynamically extending the python path at runtime is bad for developer experience, as this is not understood by the text editor and therefore jump to definition etc. does not work.

-> Better to remove the dynamic inclusion and force developers to specify the import correctly.
2024-07-05 16:38:22 +07:00
Jörg Thalheim
9778444706 Revert "clan.core: rename clan.{deployment,networking} -> clan.core.{deployment,networking}"
This reverts commit afbd4a984d.

The old configuration cannot be updated like this:

eve] error:
[eve]        … while calling the 'head' builtin
[eve]          at /nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/lib/attrsets.nix:1575:11:
[eve]          1574|         || pred here (elemAt values 1) (head values) then
[eve]          1575|           head values
[eve]              |           ^
[eve]          1576|         else
[eve]
[eve]        … while evaluating the attribute 'value'
[eve]          at /nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/lib/modules.nix:809:9:
[eve]           808|     in warnDeprecation opt //
[eve]           809|       { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
[eve]              |         ^
[eve]           810|         inherit (res.defsFinal') highestPrio;
[eve]
[eve]        … while evaluating the option `system.build.toplevel':
[eve]
[eve]        … while evaluating definitions from `/nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/nixos/modules/system/activation/top-level.nix':
[eve]
[eve]        … while evaluating the option `assertions':
[eve]
[eve]        … while evaluating definitions from `/nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/nixos/modules/system/boot/systemd.nix':
[eve]
[eve]        … while evaluating the option `systemd.services':
[eve]
[eve]        … while evaluating definitions from `/nix/store/kpzcdgndym0qm1w490mjvk9c2qmz03h5-source/nixosModules/clanCore/zerotier':
[eve]
[eve]        … while evaluating the option `clan.core.networking.zerotier.networkId':
[eve]
[eve]        (stack trace truncated; use '--show-trace' to show the full, detailed trace)
[eve]
[eve]        error: A definition for option `clan.core.networking.zerotier.networkId' is not of type `null or string'. Definition values:
[eve]        - In `/nix/store/kpzcdgndym0qm1w490mjvk9c2qmz03h5-source/nixosModules/clanCore/networking.nix':
[eve]            {
[eve]              _type = "override";
[eve]              content = "267efd4a15b69623";
[eve]              priorit
2024-07-05 11:16:05 +02:00
clan-bot
4c6c5b86ad Merge pull request 'fixtures_flakes.py: remove dead code' (#1709) from DavHau/clan-core:DavHau-dave into main 2024-07-05 09:00:41 +00:00
DavHau
f37379908c fixtures_flakes.py: remove dead code 2024-07-05 15:55:52 +07:00
clan-bot
8a4b96c9c9 Merge pull request 'devShells: make all shells inherit from default shell' (#1708) from DavHau/clan-core:DavHau-dave into main 2024-07-05 08:06:19 +00:00
DavHau
802f047341 devShells: make all shells inherit from default shell
Currently, important tools from the default shell are lost as soon as select-shell is used to switch to another shell. select-shell itself, for example is missing, which makes it impossible to switch back to another shell.
2024-07-05 15:01:25 +07:00
clan-bot
a89b301425 Merge pull request 'clan.core: rename clan.{deployment,networking} -> clan.core.{deployment,networking}' (#1706) from DavHau/clan-core:DavHau-rename-clanCore into main 2024-07-04 10:09:17 +00:00
DavHau
afbd4a984d clan.core: rename clan.{deployment,networking} -> clan.core.{deployment,networking} 2024-07-04 17:05:37 +07:00
clan-bot
737cf9412c Merge pull request 'vars: add generator.runtimeInputs' (#1705) from DavHau/clan-core:DavHau-dave into main 2024-07-04 06:45:32 +00:00
DavHau
32f3b3a309 vars: add generator.runtimeInputs 2024-07-04 13:42:25 +07:00
clan-bot
d9c8079eae Merge pull request 'reference docs: add missing description fields and enforce it from now on' (#1704) from DavHau/clan-core:DavHau-dave into main 2024-07-04 06:38:15 +00:00