Johannes Kirschbauer
c2e84f11af
persist/util: add field helper
2025-07-27 00:01:07 +02:00
Johannes Kirschbauer
bf2eb000d5
api/set_machine: add unit tests
2025-07-26 23:59:51 +02:00
Kenji Berthold
6e904de655
Merge pull request 'pkgs/cli: machines install handle invalid character' ( #4488 ) from kenji/ke-clan-machines-install-prompt into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4488
2025-07-26 13:29:10 +00:00
a-kenji
0a43721a45
pkgs/clan/lib: Fix clan template creation when already in a flake
...
Fix clan template creation when already in a flake.
Currently we already fail with very clear and descriptive error when
trying to evaluate the template of the flake we are in:
```
Failed to select template 'flake-parts' from flake '/tmp/superclan' (via attribute path: /tmp/superclan#clanInternals.templates.clan."flake-parts")
```
This is undesired behavior.
When we are trying to create a clan with `clan flakes create`.
We can't rely on the fact that the flake we are currently in exports flake templates.
Now we *try* to evaluate the flake we are in upon creation.
If there are no clan templates available, we now will fall back to
builtin templates.
Closes : #4472
2025-07-26 15:21:44 +02:00
a-kenji
51eb7bd0b5
pkgs/cli/create: Show less output by default
...
This masks the output of `nix flake update`, since it is quite verbose
and takes attention away to usually more interesting and pressing
information.
Example:
```
unpacking 'https://git.clan.lol/clan/clan-core/archive/main.tar.gz ' into the Git cache...
warning: creating lock file "/tmp/hoowowo/clan/flake.lock":
• Added input 'clan-core':
'1d8ac7b1b518dfd42bdb69d8bf5961https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre827262.be9e214982e2/nixexprs.tar.xz?narHash=sha256-lUi%2BsPH7Kuh9uP3PyfgbENcJGReUM8Ffk9GxGBFbSN8%3D ' (1980-01-01)
• Added input 'clan-core/sops-nix':
'github:Mic92/sops-nix/2c8def626f54708a9c38a5861866660395bb3461?narHash=sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U%3D' (2025-07-15)
• Added input 'clan-core/sops-nix/nixpkgs':
follows 'clan-core/nixpkgs'
• Added input 'clan-core/systems':
'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e?narHash=sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768%3D' (2023-04-09)
• Added input 'clan-core/treefmt-nix':
'github:numtide/treefmt-nix/421b56313c65a0815a52b424777f55acf0b56ddf?narHash=sha256-tzbhc4XttkyEhswByk5R38l%2BztN9UDbnj0cTcP6Hp9A%3D' (2025-07-20)
• Added input 'clan-core/treefmt-nix/nixpkgs':
follows 'clan-core/nixpkgs'
• Added input 'flake-parts':
'github:hercules-ci/flake-parts/644e0fc48951a860279da645ba77fe4a6e814c5e?narHash=sha256-TVcTNvOeWWk1DXljFxVRp%2BE0tzG1LhrVjOGGoMHuXio%3D' (2025-07-21)
• Added input 'flake-parts/nixpkgs-lib':
follows 'clan-core/nixpkgs'
• Added input 'nixpkgs':
follows 'clan-core/nixpkgs'
```
Those are 48 lines that seldom carry actual useful information.
This can be shown on running `clan flakes create` with the `--debug`
flag.
Closes : #4496
2025-07-26 14:11:56 +02:00
Kenji Berthold
1d8ac7b1b5
Merge pull request 'pkgs/cli/lib: Allow clan templates list to function outside a clan' ( #4490 ) from kenji/ke-templates-list-without-clan into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4490
Reviewed-by: hsjobeki <hsjobeki@gmail.com >
2025-07-25 14:32:15 +00:00
a-kenji
5b5f1975c5
pkgs/cli/lib: Allow clan templates list to function outside a clan
...
Allow `clan templates list` to function outside a clan.
Currently when bootstrapping a clan and trying to list the templates
it fails as follows:
```
Traceback (most recent call last):
File "/nix/store/pkrsr8zr90bps1fwrl8n74zbb9g038b8-clan-cli/bin/.clan-wrapped", line 9, in <module>
sys.exit(main())
~~~~^^
File "/nix/store/pkrsr8zr90bps1fwrl8n74zbb9g038b8-clan-cli/lib/python3.13/site-packages/clan_cli/cli.py", line 516, in main
args.func(args)
~~~~~~~~~^^^^^^
File "/nix/store/pkrsr8zr90bps1fwrl8n74zbb9g038b8-clan-cli/lib/python3.13/site-packages/clan_cli/templates/list.py", line 11, in list_command
templates = list_templates(args.flake)
File "/nix/store/pkrsr8zr90bps1fwrl8n74zbb9g038b8-clan-cli/lib/python3.13/site-packages/clan_lib/templates/__init__.py", line 20, in list_templates
custom_templates = flake.select("clanInternals.inventoryClass.templatesPerSource")
^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'select'
```
With the change we get the following output:
```
Available 'clan' templates
├── <builtin>
│ ├── default: Initialize a new clan flake
│ ├── flake-parts: Flake-parts
│ └── minimal: for clans managed via (G)UI
Available 'disko' templates
├── <builtin>
│ └── single-disk: A simple ext4 disk with a single partition
Available 'machine' templates
├── <builtin>
│ ├── flash-installer: Initialize a new flash-installer machine
│ └── new-machine: Initialize a new machine
```
Allowing to check for available templates without needing to have a
clan, which improves the bootstrapping experience.
2025-07-25 16:14:43 +02:00
a-kenji
326f418c88
pkgs/cli: Remove uncommented logic from creation test
2025-07-25 14:44:20 +02:00
lassulus
1a5b77d47a
refactor: generalize Tor support to SOCKS5 proxy in network module
...
- Replace Tor-specific implementation with generic SOCKS5 proxy support
- Change `tor_socks` boolean to `socks_port` and `socks_wrapper` parameters
- Move Tor functionality to clan_lib.network.tor submodule
- Add connection context managers to NetworkTechnologyBase
- Improve network abstraction with proper remote() and connection() methods
- Update all callers to use new SOCKS5 proxy interface
- Fix network ping command to properly handle connection contexts
This allows for more flexible proxy configurations beyond just Tor,
while maintaining backward compatibility for Tor usage.
2025-07-24 22:26:44 +02:00
lassulus
9e85c64139
clan-cli flake: show cache file location
2025-07-24 22:24:34 +02:00
lassulus
7dd9e6b97c
clan-cli vars: show which var we are getting in debug log
2025-07-24 22:24:15 +02:00
a-kenji
6cea3e6c60
pkgs/cli: machines install handle invalid character
...
Re-request prompt, if invalid character is specified.
None is still treated as no as per CLI hint [y/N].
We now also accept Y/N.
Closes : #4475
2025-07-24 22:00:31 +02:00
Luis Hebendanz
9668c318dc
Merge pull request 'fix flake select logging' ( #4483 ) from Qubasa/clan-core:fix_flake_select_logging into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4483
2025-07-24 11:44:21 +00:00
Qubasa
7146c97362
clan_lib: Fix flake.select logging, now we log the first time select queries a path for the first time, it doesn't matter if it is cached or not.
2025-07-24 18:27:40 +07:00
Brian McGee
d3d1489829
feat(ui): animate sidebar pane entry/exit
2025-07-24 11:40:54 +01:00
Qubasa
b74aa31b87
clan-lib: Fix missing logging for flake.select execution
2025-07-24 17:29:09 +07:00
Brian McGee
f18e70dda6
fix(ui): increase z index for sidebar dropdown
2025-07-24 10:23:43 +01:00
hsjobeki
5ddeb41a5d
Merge pull request 'ui/cubes: add labels' ( #4469 ) from scene-progress into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4469
2025-07-24 08:56:41 +00:00
Johannes Kirschbauer
fb5229a5f3
ui/cubes: adjust label style
2025-07-24 10:52:21 +02:00
Brian McGee
694059d3ce
feat(ui): waiting for necessary queries before dropping clan loader
2025-07-24 09:48:57 +01:00
Qubasa
94662b722d
clan-lib: Remove injected "op_key" argument from all functions and do it over the threadcontext instead. Remove double threading in http server
2025-07-24 14:25:20 +07:00
Johannes Kirschbauer
334fe45adc
ui/cubes: add labels
2025-07-23 16:41:24 +02:00
hsjobeki
ebdd3e8413
Merge pull request 'ui/cubes: reactive wiring, use orthographic camera' ( #4468 ) from scene-progress into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4468
2025-07-23 14:09:42 +00:00
hsjobeki
ffe58fc189
Merge pull request 'feat(ui): move toolbar lower down' ( #4467 ) from ui/refine-toolbar-position into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4467
2025-07-23 14:07:02 +00:00
Johannes Kirschbauer
7065464227
ui/cubes: reactive updates, use orthographic
2025-07-23 16:05:51 +02:00
Johannes Kirschbauer
5f567e2473
hooks: add maybeMachine hook
2025-07-23 16:04:55 +02:00
Johannes Kirschbauer
9afeec5683
ui: remove left over process-compose-2d.yml
2025-07-23 16:04:16 +02:00
hsjobeki
1e51439414
Merge pull request 'pytest: add simple clan_flake function' ( #4453 ) from api-fixes into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4453
2025-07-23 10:27:05 +00:00
Brian McGee
a472f7f696
feat(ui): move toolbar lower down
2025-07-23 11:23:31 +01:00
Johannes Kirschbauer
29c764773f
pytest: clan_flake allow usage of plain dicts
2025-07-23 12:15:54 +02:00
brianmcgee
af056f2355
Merge pull request 'feat(ui): set a fixed width for welcome screen' ( #4464 ) from ui/max-width-onboarding into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4464
2025-07-23 09:32:12 +00:00
Brian McGee
6803f3c6f5
feat(ui): set a fixed width for welcome screen
2025-07-23 10:27:33 +01:00
Brian McGee
38d62af1ba
feat(ui): add sidebar and flesh out app routes
2025-07-23 10:16:00 +01:00
Kenji Berthold
14f255c2d5
Merge pull request 'pkgs/cli: Fix fstring interplolation' ( #4459 ) from kenji/ke-fix-typo into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4459
2025-07-23 07:55:04 +00:00
Johannes Kirschbauer
34ccbcc13d
ui/scene: add timeout for splashscreen
2025-07-23 09:50:59 +02:00
a-kenji
f58a120db1
pkgs/cli: Fix fstring interplolation
...
Closes : #4458
2025-07-23 09:43:51 +02:00
DavHau
cc69892e3b
create clan: better info about existing sop keys
...
When creating a new clan, the key selection now looks like this:
```
Found existing admin keys on this machine:
1: type: AGE
pubkey: age1xyz...
source: /home/grmpf/.config/sops/age/keys.txt
2: type: PGP
pubkey: abc...
source: SOPS_PGP_FP
Select keys to use (comma-separated list of numbers, or leave empty to select all):
```
This is achieved by adding a `source` attribute to `SopsKey`.
2025-07-23 13:22:19 +07:00
DavHau
c94330ee9c
clan create: fix failure when path was single word
...
This should better be fixed with types. It should be possible to initialize a flake from a Path, making it very clear that a path `foo` is meant and not a remote flake called `foo`
2025-07-23 12:33:57 +07:00
Jörg Thalheim
377056e80c
clan flakes create: initialize keys automatically ( #4435 )
...
fixes https://git.clan.lol/clan/clan-core/issues/2665
fixes https://git.clan.lol/clan/clan-core/issues/4407
Co-authored-by: DavHau <d.hauer.it@gmail.com >
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4435
Co-authored-by: Jörg Thalheim <joerg@thalheim.io >
Co-committed-by: Jörg Thalheim <joerg@thalheim.io >
2025-07-23 04:44:55 +00:00
Johannes Kirschbauer
1dbaff7b61
pytest: add simple clan_flake function
...
Takes a clan nix expression as a string
Is empty by default and does nothing
Expensive lockfile patching is done once per session
2025-07-22 23:24:40 +02:00
Kenji Berthold
acfe3b0a04
Merge pull request 'pkgs/clan: Fix common command flags registering' ( #4451 ) from kenji/ke-completions-add-flake into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4451
2025-07-22 18:10:15 +00:00
a-kenji
04f36a4cb1
pkgs/clan: Fix common command flags registering
...
Fix common command flags registering.
Register the common command flags before triggering autocomplete,
that way we can use the flags in the autocompletions themselves.
2025-07-22 19:56:07 +02:00
hsjobeki
41a0138c16
Merge pull request 'clan/create: api fixes and unit tests' ( #4449 ) from api-fixes into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4449
2025-07-22 17:28:37 +00:00
Johannes Kirschbauer
f1be729206
create/clan: unit tests init
2025-07-22 19:17:41 +02:00
a-kenji
cacd853374
pkgs/cli: Support the flake argument for clan shell completions
2025-07-22 19:06:42 +02:00
Brian McGee
9706285474
chore(ui): finish simplifying clan query params
2025-07-22 17:45:23 +01:00
Kenji Berthold
1510b4014b
Merge pull request 'pkgs/cli: Autocomplete various vars subcommands' ( #4447 ) from kenji/ke-complete-vars into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4447
2025-07-22 16:27:32 +00:00
lassulus
d5e0f7e505
Merge pull request 'fix: handle arbitrary store paths references in flake cache' ( #4441 ) from fix-flake-caching into main
...
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4441
2025-07-22 16:18:15 +00:00
Johannes Kirschbauer
b9e5cf1220
clan/create: use post_processing hook
2025-07-22 18:14:56 +02:00
Johannes Kirschbauer
f4eb59c373
create/clan: add validation to create arguments
2025-07-22 18:13:56 +02:00
