Commit Graph

8433 Commits

Author SHA1 Message Date
kenji
143fbb929f Merge pull request 'pkgs/clan: Further unify clan flake validation' (#4358) from kenji/ke-non-clan-commands into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4358
2025-07-15 11:46:04 +00:00
a-kenji
6347bb7f3a pkgs/clan: Further unify clan flake validation
Further unify clan flake validation and improve test coverage.
2025-07-15 13:03:49 +02:00
Mic92
9a7288df3d Merge pull request 'add images to gitignore' (#4355) from gitignore-images into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4355
2025-07-15 10:37:25 +00:00
kenji
ce0ff60ad3 Merge pull request 'pkgs/clan: Add flake validation to clan show' (#4352) from kenji/ke-non-clan-show into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4352
2025-07-15 10:30:19 +00:00
Jörg Thalheim
d76dc55325 add images to gitignore
images now needed to be added with `git add --force`.
This makes accidential commits of large files harder.
2025-07-15 12:30:04 +02:00
a-kenji
2ddba36b17 pkgs/clan: Add flake validation to clan show 2025-07-15 12:04:23 +02:00
a-kenji
d4cb206e3e pkgs/cli: Add require_flake clan validation logic
Add a `require_flake` function that checks, if no argument is passed, if
we are in a clan directory.
If not will throw a helpful error.

Before `clan show`:

```
Traceback (most recent call last):
  File "/nix/store/8kb3l3yvz6svygnxdlrw5lmd3h3chc8a-clan-cli/bin/.clan-wrapped", line 9, in <module>
    sys.exit(main())
             ~~~~^^
  File "/nix/store/8kb3l3yvz6svygnxdlrw5lmd3h3chc8a-clan-cli/lib/python3.13/site-packages/clan_cli/cli.py", line 493, in main
    args.func(args)
    ~~~~~~~~~^^^^^^
  File "/nix/store/8kb3l3yvz6svygnxdlrw5lmd3h3chc8a-clan-cli/lib/python3.13/site-packages/clan_cli/clan/show.py", line 12, in show_command
    meta = get_clan_details(flake)
  File "/nix/store/8kb3l3yvz6svygnxdlrw5lmd3h3chc8a-clan-cli/lib/python3.13/site-packages/clan_lib/clan/get.py", line 22, in get_clan_details
    if flake.is_local and not flake.path.exists():
       ^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'is_local'
```

with `require_flake`:

```
No clan flake found in the current directory or its parents - Use the --flake flag to specify a clan flake path or URL
```
2025-07-15 12:01:20 +02:00
Mic92
1befc86308 Merge pull request 'Update disko' (#4347) from update-disko into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4347
2025-07-15 09:50:39 +00:00
gitea-actions[bot]
999ade9dc4 Update disko 2025-07-15 09:03:02 +00:00
Mic92
01ab9e5dbf Merge pull request 'update-flake-inputs: enable auto-merge' (#4346) from flakes into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4346
2025-07-15 09:02:06 +00:00
Jörg Thalheim
2ef248a10e update-flake-inputs: enable auto-merge 2025-07-15 10:55:28 +02:00
Mic92
24493e8768 Merge pull request 'Update nixpkgs' (#4340) from update-nixpkgs into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4340
2025-07-15 08:43:26 +00:00
DavHau
b91158f454 vars/interface: make type of dependencies configurable
One vars get lifted to the global scope, dependencies need to be structured differently, eg. categorized by instances
2025-07-15 13:41:05 +07:00
DavHau
66a6758db4 vars/interface: cleanup + don't use specialArgs for pkgs 2025-07-15 13:07:18 +07:00
DavHau
61df393c2d vars: reduce dependency on pkgs
pass pkgs only to generators submodule which is the only place where it is needed because of finalScript
2025-07-15 12:15:12 +07:00
gitea-actions[bot]
13458e4f58 Update nixpkgs 2025-07-14 18:45:03 +00:00
Mic92
dc3a41f403 Merge pull request 'update-flake-inputs: set gitea-token/github-token correctly' (#4339) from flakes into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4339
2025-07-14 18:32:00 +00:00
Jörg Thalheim
a424f318e4 update-flake-inputs: set gitea-token/github-token correctly 2025-07-14 20:28:30 +02:00
Mic92
36adc38ec4 Merge pull request 'update-flake-inputs: drop gitea vars' (#4338) from flakes into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4338
2025-07-14 15:45:21 +00:00
Jörg Thalheim
29581cd1f4 update-flake-inputs: drop gitea vars 2025-07-14 17:41:48 +02:00
Mic92
4523596eba Merge pull request 'drop renovate' (#4337) from merge-when-green-joerg into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4337
2025-07-14 15:41:00 +00:00
Jörg Thalheim
e97b06c410 drop renovate
we now use gitea actions for it.
2025-07-14 17:37:32 +02:00
Mic92
f79b3c2761 Merge pull request 'add new workflow to do flake updates' (#4336) from flakes into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4336
2025-07-14 15:14:42 +00:00
Jörg Thalheim
a509e16627 add new workflow to do flake updates 2025-07-14 17:11:22 +02:00
Luis Hebendanz
e05f4380d4 Merge pull request 'clan-cli: Make 'clan ssh' read out the targetHost to connect to' (#4335) from Qubasa/clan-core:fix_clan_ssh into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4335
2025-07-14 13:57:45 +00:00
Qubasa
e8b5e2c2c5 clan-cli: Fixup clan install which depends on ssh_parseargs.
clan-cli: Remove --ssh-option for now, as it can't work in current state

clan-cli: Remove nix_config from test as its impure
2025-07-14 20:47:49 +07:00
Qubasa
9630b6dbe4 clan-cli: Make 'clan ssh' read out the targetHost to connect to 2025-07-14 19:35:48 +07:00
DavHau
1c2b72c6f0 vars: cleanup nix interface 2025-07-14 18:20:04 +07:00
pinpox
c49a7c8277 Merge pull request 'Remove clanModules dependencies from admin service' (#4237) from admin-no-modules into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4237
2025-07-14 08:32:27 +00:00
pinpox
939f724878 Remove clanModules dependencies from admin service 2025-07-14 10:26:35 +02:00
Luis Hebendanz
8a56776032 Merge pull request 'Simplify flake.select logs, make logs readable again' (#4333) from Qubasa/clan-core:improve_log_output into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4333
2025-07-14 05:14:12 +00:00
Qubasa
60f7f8598b docs: Document new debug env vars in debugging.md 2025-07-14 12:11:16 +07:00
Qubasa
36282b92bc clan-cli: improve log messages further
nix fmt
2025-07-14 12:02:03 +07:00
Qubasa
0cf35480a2 clan-cli: Filter out flake select traces to improve debug log visibility 2025-07-14 11:51:35 +07:00
renovate[bot]
e875df5665 chore(deps): update data-mesher digest to 309e06f 2025-07-14 00:10:13 +00:00
hsjobeki
92d5ea82a7 Merge pull request 'deploy: add warning about disko.nix' (#4330) from docs-3 into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4330
2025-07-13 19:29:52 +00:00
Johannes Kirschbauer
8f5bf1ff2a deploy: add warning about disko.nix 2025-07-13 21:26:07 +02:00
hsjobeki
311d68dfff Merge pull request 'ui/scene: refactor simplify select animation' (#4325) from ui-scene-1 into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4325
2025-07-13 18:56:12 +00:00
Johannes Kirschbauer
8627398e3e ui/scene: simplify select animation 2025-07-13 20:44:12 +02:00
Johannes Kirschbauer
d87a771a78 ui/scene: rename file 2025-07-13 20:43:35 +02:00
hsjobeki
e8ecd22bab Merge pull request 'clan_cli: move __init__.py into cli.py' (#4323) from cli into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4323
2025-07-13 16:14:21 +00:00
Johannes Kirschbauer
b0ef0cf341 clan_cli: add empty __init__.py for relative imports 2025-07-13 18:03:56 +02:00
Johannes Kirschbauer
3e82e63443 clan_cli: rename references 2025-07-13 15:53:10 +02:00
Johannes Kirschbauer
f3dab3f9bb clan_cli: move __init__.py into cli.py
This helps to reduce import cycles in python
If ANY python module from clan_cli is imported all the imports of the __init__.py are executed leading to a lot of cycles
2025-07-13 15:52:29 +02:00
hsjobeki
22ba30896b Merge pull request 'api/services: add get_service_module_schema endpoint' (#4324) from lazy-schemas into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4324
2025-07-13 13:07:48 +00:00
Johannes Kirschbauer
fc6faa882b api/services: add get_service_module_schema 2025-07-13 14:56:57 +02:00
Johannes Kirschbauer
e7c9d1e6d0 services: add modules schema to inventoryClass 2025-07-13 14:17:57 +02:00
hsjobeki
b0a1f5e0c7 Merge pull request 'api/modules: remove redundant localModules' (#4322) from api-modules into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4322
2025-07-13 12:05:11 +00:00
Johannes Kirschbauer
9c7f684ec5 instances: create_service_instance init 2025-07-13 13:57:02 +02:00
Johannes Kirschbauer
6d2f522cbb lib/modules: list modules consistent argument 2025-07-13 13:57:02 +02:00