Commit Graph

8459 Commits

Author SHA1 Message Date
Qubasa
56a76242ca clan-cli: Fix incorrect ipv6 check in check_machine_ssh_reachable 2025-07-17 12:12:40 +02:00
hsjobeki
a4d26497f9 Merge pull request 'cli: fix dot files not copied to $out in buildPythonApplication' (#4371) from pkgs-for into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4371
2025-07-17 12:12:40 +02:00
hsjobeki
503bb62864 Merge pull request 'clanInternals: refactor configsPerSystem, minimize diff' (#4369) from pkgs-for into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4369
2025-07-17 12:12:40 +02:00
Johannes Kirschbauer
c0225ea757 cli: fix dot files not copied $out in buildPythonApplication
File such as .envrc, .gitignore where not copied into the package and thus missing in all templates
2025-07-17 12:12:40 +02:00
Johannes Kirschbauer
91434044e0 clanInternals: refactor configsPerSystem, minimize diff 2025-07-17 12:12:40 +02:00
Kenji Berthold
7255673440 Merge pull request 'pkgs/cli: Validate clan directory for update-hardware-config' (#4367) from kenji/ke-hardware-update-validation into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4367
2025-07-17 12:12:39 +02:00
hsjobeki
b1aa79b33f Merge pull request 'revert bd3861c58056a847556c459ce420968044ce1459' (#4368) from hsjobeki-patch-1 into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4368
2025-07-17 12:12:39 +02:00
a-kenji
26fdfeec00 pkgs/cli: Validate clan directory for update-hardware-config 2025-07-17 12:12:39 +02:00
Mic92
8be8af9117 Merge pull request 'gitignore-images' (#4364) from gitignore-images into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4364
2025-07-17 12:12:39 +02:00
hsjobeki
338a6ad340 revert bd3861c580
revert Merge pull request 'Remove clanModules/*' (#4202) from remove-modules into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4202

See: https://git.clan.lol/clan/clan-core/issues/4365

Not all modules are migrated.
If they are not migrated, we need to write migration docs and please display the link to the migration docs
2025-07-17 12:12:39 +02:00
Luis Hebendanz
5b651752ba 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-17 12:12:39 +02:00
Jörg Thalheim
2dcc4bba15 update-flake-inputs: email/user doesn't need to be configured 2025-07-17 12:12:39 +02:00
kenji
a0c3b6d33e 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-17 12:12:39 +02:00
Jörg Thalheim
b640be3dd2 run flake updates every 5 hours 2025-07-17 12:12:39 +02:00
kenji
38fafba6d8 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-17 12:12:39 +02:00
clan-bot
b57897c6c9 Merge pull request 'Update sops-nix' (#4361) from update-sops-nix into main 2025-07-17 12:12:39 +02:00
pinpox
7266e4b273 Merge pull request 'Remove clanModules/*' (#4202) from remove-modules into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4202
2025-07-17 12:12:39 +02:00
pinpox
546eeb22d0 Remove clanModules 2025-07-17 12:12:39 +02:00
a-kenji
c40fca6261 pkgs/clan(templates): Add shell completions 2025-07-15 14:46:04 +02:00
a-kenji
936290b01d pkgs/cli: Add facts deprecation warning to clan facts help output 2025-07-15 14:28:36 +02: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
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
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
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