Commit Graph

3651 Commits

Author SHA1 Message Date
kenji
04422850b0 Merge pull request 'fix: forward meta attributes in flake-parts module' (#1852) from kenji/clan-core:forward-meta into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1852
2024-08-07 09:33:49 +00:00
a-kenji
e7c6333e06 Fix: forward meta attributes in flake-parts module
This fixes building machines with the flake-parts module.

Since the inventory merges the machines, the `clan.core.meta` attribute
is now a submodule and conditionally imported.

Also drops the following attributes:
- clan.core.meta.icon
- clan.core.meta.description

In favor of specifying them inside the inventory.

This doesn't use `mkRemovedOptionsModule`, because in our case it would
cause infinite recursion.
2024-08-07 09:33:49 +00:00
clan-bot
ec16059abc Merge pull request 'Clan-app: refine create machine workflow via query operation' (#1853) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-06 14:11:58 +00:00
Johannes Kirschbauer
6158e82f43 Clan-app: refine create machine workflow via query operation 2024-08-06 16:04:21 +02:00
clan-bot
52e2ba9801 Merge pull request 'Clan-core: Rename clanName within Machines' (#1851) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-06 10:30:52 +00:00
Johannes Kirschbauer
a4bbdcb010 Clan-core: Rename clanName within Machines 2024-08-06 12:21:46 +02:00
kenji
329b70d653 Merge pull request 'mumble: remove traces' (#1850) from kenji/clan-core:mumble/remove-traces into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1850
2024-08-06 10:09:20 +00:00
a-kenji
83aa4002bd mumble: remove traces 2024-08-06 11:53:26 +02:00
clan-bot
4b757d62a2 Merge pull request 'Clan-app: show nixos machines and inventory machines' (#1849) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-06 08:47:35 +00:00
Johannes Kirschbauer
e0d7a423b4 Clan-app: show nixos machines and inventory machines 2024-08-06 10:44:31 +02:00
clan-bot
1397beb95e Merge pull request 'clan-cli/vms: add option --publish to forward ports from host to guest' (#1847) from DavHau/clan-core:DavHau-vars into main 2024-08-04 08:32:02 +00:00
DavHau
9381d78feb clan-cli/vms: add option --publish to forward ports from host to guest 2024-08-04 15:28:51 +07:00
clan-bot
0fdfbf99e6 Merge pull request 'tests: improve testing framework for impure vm tests' (#1846) from DavHau/clan-core:DavHau-vars into main 2024-08-04 06:43:44 +00:00
DavHau
b2646aa0fe tests: improve testing framework for impure vm tests
Also fix computet sops secret paths for vars
2024-08-04 13:40:12 +07:00
clan-bot
b93aa1896e Merge pull request 'build-clan: fix specialArgs not passed' (#1845) from DavHau/clan-core:DavHau-dave into main 2024-08-04 06:10:37 +00:00
DavHau
d7475bef37 build-clan: fix specialArgs not passed 2024-08-04 13:06:51 +07:00
clan-bot
a9f0e90d12 Merge pull request 'devshell: remove dependency on clan-cli' (#1844) from DavHau/clan-core:DavHau-vars into main 2024-08-03 15:42:27 +00:00
DavHau
c5b8948509 devshell: remove dependency on clan-cli
This stops the devshell from being re-built constantly, when the source code changes.

Based on a new feature in treefmt-nix: https://github.com/numtide/treefmt-nix/pull/208
2024-08-03 22:37:03 +07:00
clan-bot
337a2ea883 Merge pull request 'Add build-clan module' (#1843) from hsjobeki/clan-core:hsjobeki-flake-parts into main 2024-08-03 11:38:18 +00:00
Johannes Kirschbauer
15ba9b8bfb Fix: type test 2024-08-03 13:14:08 +02:00
Johannes Kirschbauer
91397adbfc Fix: regression list_machines. Split into multiple functions
list_inventory_machines, list_nixos_machine, list_sops_machines
The caller of the function should specify which machines they wants to see
2024-08-03 12:43:35 +02:00
Johannes Kirschbauer
79e15bff24 Add: legacy support for implicitly creating machines through creating a directory
This will be deprecated as soon as the tests dont rely on this behavior anymore
2024-08-03 12:05:09 +02:00
Johannes Kirschbauer
5d12154f96 Forward clan name for vm test compatibility 2024-08-03 12:05:09 +02:00
Johannes Kirschbauer
ac6b7f84e0 Fix wrong unit tests 2024-08-03 12:05:09 +02:00
Johannes Kirschbauer
ef58bea020 Fix wrong default for imports 2024-08-03 12:05:09 +02:00
Johannes Kirschbauer
d51508656f Add flake-parts module 2024-08-03 12:05:09 +02:00
Johannes Kirschbauer
8fd09b8403 Add build-clan module 2024-08-03 12:05:09 +02:00
clan-bot
f6daaf79a7 Merge pull request 'vars: simplify tests' (#1842) from DavHau/clan-core:DavHau-vars into main 2024-08-03 08:51:39 +00:00
DavHau
d3542cf1c8 vars: simplify tests 2024-08-03 15:47:35 +07:00
clan-bot
844c219348 Merge pull request 'vars: introduce share flag' (#1841) from DavHau/clan-core:DavHau-vars into main 2024-08-03 08:33:38 +00:00
DavHau
8086f70b79 clan-cli/tests: improve test helpers for VMs 2024-08-03 15:26:53 +07:00
DavHau
cc9c828598 vars: introduce share flag 2024-08-03 15:26:53 +07:00
clan-bot
a40ddd2b24 Merge pull request 'clan-app: Finish flash view. clan-cli: Flash cli now verifies if language and keymap are valid. formatter.nix: Add deno as formatter' (#1839) from Qubasa/clan-core:Qubasa-Qubasa-main into main 2024-08-02 17:02:32 +00:00
Qubasa
58a36a5c12 formatter.nix: Add prettier 2024-08-02 18:56:53 +02:00
Qubasa
f1d124dabd clan-app: Finish flash view. clan-cli: Flash cli now verifies if language and keymap are valid. 2024-08-02 17:51:45 +02:00
kenji
e2bdf22f78 Merge pull request 'formatter: remove broken vale configuration' (#1835) from kenji/clan-core:clan/rm-broken-vale into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1835
Reviewed-by: Luis Hebendanz <consulting@qube.email>
2024-07-31 17:04:54 +00:00
a-kenji
c7c6012bcc formatter: remove broken vale configuration
Removes the broken and uncommented value configuration for vale.

While vale can be a valuable tool, we need a working configuration if we
want to use it. Keeping a broken configuration on main is not a
sustainable model.

We can fix it and reintroduce it cleanly at a later stage.
2024-07-31 18:42:16 +02:00
Mic92
b3af929490 Merge pull request 'clan: remove config subcommand' (#1828) from kenji/clan-core:clan/remove-config into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1828
2024-07-31 16:35:36 +00:00
a-kenji
a465ad8638 clan: remove config subcommand
This removes the `config` subcommand from the cli and the documentation
to keep the api surface small.

While this functionality was convenient it doesn't need to be surfaced
by the clan cli.

The remaining `config` python module should be ported to the `clan-app`
in a follow up pr. Because the functionality is currently only used by
the `clan-app`.
Ideally together with: #1830.
2024-07-31 16:35:36 +00:00
clan-bot
26edcb8562 Merge pull request 'Deserializer: add Literal; Annotated fields' (#1833) from hsjobeki/clan-core:hsjobeki-main into main 2024-07-31 11:06:48 +00:00
Johannes Kirschbauer
6c5f9ca6db Deserializer: add Literal; Annotated fields 2024-07-31 13:00:28 +02:00
clan-bot
0894ee95c8 Merge pull request 'Deserializer: replace pydantic' (#1826) from hsjobeki/clan-core:hsjobeki-main into main 2024-07-30 12:36:08 +00:00
kenji
350d565ddd Merge pull request 'clan: remove flatpak check' (#1831) from kenji/clan-core:clan/rm-flatpak into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1831
2024-07-30 12:34:19 +00:00
Johannes Kirschbauer
4b2d1b7923 Deserializer: add Nullable fields 2024-07-30 14:26:13 +02:00
a-kenji
acb5560de8 clan: remove flatpak check
This check logs, if the cli is started inside a flatpak environment.
2024-07-30 14:21:15 +02:00
kenji
2d4cd0c9be Merge pull request 'merge-after-ci: use nix fmt' (#1823) from kenji/clan-core:feat/merge-after-ci into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1823
2024-07-30 11:43:40 +00:00
a-kenji
d360cf86cb merge-after-ci: use nix fmt
Use `nix fmt` instead of `treefmt` directly, since `treefmt` depends on
the cached devshell. This can lead to confusing errors.
2024-07-30 11:43:40 +00:00
kenji
f11ddf92e9 Merge pull request 'checks/mumble: improve dependency closure' (#1827) from kenji/clan-core:mumble-improve-closure into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1827
2024-07-30 11:40:13 +00:00
a-kenji
9f6f754606 checks/mumble: improve dependency closure 2024-07-30 13:11:50 +02:00
kenji
03f87b24d3 Merge pull request 'clan/secrets: improve naming of secret key' (#1825) from kenji/clan-core:kenji-cli-change-wording into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1825
Reviewed-by: Mic92 <joerg@thalheim.io>
2024-07-30 10:58:45 +00:00