Commit Graph

8751 Commits

Author SHA1 Message Date
Jörg Thalheim
e8b111e229 run flake updates every 5 hours 2025-07-15 16:11:54 +02:00
Luis Hebendanz
1d8445a347 Merge pull request 'pkgs/cli: Fix ssh logging' (#4362) from kenji/ke-ssh-remove-debug into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4362
2025-07-15 13:00:00 +00:00
kenji
d84822ae39 Merge pull request 'pkgs/clan(templates): Add shell completions' (#4327) from kenji/ke-disko-shell into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4327
2025-07-15 12:58:59 +00:00
a-kenji
c40fca6261 pkgs/clan(templates): Add shell completions 2025-07-15 14:46:04 +02:00
kenji
c2229b4da3 Merge pull request 'pkgs/cli: Add facts deprecation warning to clan facts help output' (#4329) from kenji/ke-facts-cli-warning into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4329
2025-07-15 12:43:19 +00:00
a-kenji
936290b01d pkgs/cli: Add facts deprecation warning to clan facts help output 2025-07-15 14:28:36 +02:00
clan-bot
d8dbdb4419 Merge pull request 'Update sops-nix' (#4361) from update-sops-nix into main 2025-07-15 12:28:25 +00:00
pinpox
bd3861c580 Merge pull request 'Remove clanModules/*' (#4202) from remove-modules into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4202
2025-07-15 12:25:15 +00:00
pinpox
13d69bcd66 Merge pull request 'clanServices: users -> remove isNormalUser option, set automatically' (#4351) from Qubasa/clan-core:good_default_for_users into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4351
Reviewed-by: lassulus <clanlol@lassul.us>
Reviewed-by: pinpox <clan@pablo.tools>
2025-07-15 12:24:55 +00:00
a-kenji
e342996306 pkgs/cli: Fix ssh logging
Fix the ssh logging level.
Currently the ssh commands is printed every time on an ssh connection.
While seeing the command is useful, we should print this when running
clan with the `--debug` flag.
2025-07-15 14:20:40 +02:00
kenji
bfec09e652 Merge pull request 'pkgs/clan: Add clan validation to vars' (#4360) from kenji/ke-add-clan-validation into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4360
2025-07-15 12:14:18 +00:00
gitea-actions[bot]
42ac9f3579 Update sops-nix 2025-07-15 12:14:08 +00:00
a-kenji
8178c41c7b pkgs/clan: Add clan validation to vars
Add clan validation to vars and facts subcommmands
2025-07-15 14:01:41 +02:00
pinpox
2a50dadf84 fmt 2025-07-15 13:48:37 +02:00
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
pinpox
aeb555a320 Fix tests 2025-07-15 13:40:54 +02:00
pinpox
8caaaa5b8b wip 2025-07-15 13:17:34 +02: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
Qubasa
70c1648caf clanServices: users -> remove isNormalUser option, set automatically
nix fmt
2025-07-15 17:21:52 +07: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
pinpox
0e53499f40 Remove clanModules 2025-07-15 11:53:32 +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