Commit Graph

3823 Commits

Author SHA1 Message Date
Johannes Kirschbauer
76fbac8431 API: prepare hw_generate for facter 2024-08-23 11:13:06 +02:00
clan-bot
3fe873855a Merge pull request 'API: hw_generate commit generated config' (#1957) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-22 14:17:19 +00:00
Johannes Kirschbauer
64f0aeea65 API: hw_generate commit generated config 2024-08-22 16:11:08 +02:00
clan-bot
cd5dc2edea Merge pull request 'Clan-app: generate hw report' (#1956) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-22 14:01:49 +00:00
Johannes Kirschbauer
4080fe41f8 Clan-app: generate hw report 2024-08-22 15:57:00 +02:00
clan-bot
4a04775b1d Merge pull request 'bump nixpkgs' (#1955) from flake-update into main 2024-08-22 11:46:29 +00:00
Jörg Thalheim
7fd20a8b38 bump nixpkgs 2024-08-22 13:41:03 +02:00
clan-bot
0d7bb8f910 Merge pull request 'Clan-app: install machine' (#1954) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-22 08:21:10 +00:00
Johannes Kirschbauer
543f412051 Clan-app: install machine interaction 2024-08-22 10:16:43 +02:00
Johannes Kirschbauer
f7e64cc3b5 API: serde fix nullable fields should be allowed to be none 2024-08-21 17:53:25 +02:00
clan-bot
564efd1199 Merge pull request 'Clan-app: fix welcome screen for initially empty clan' (#1953) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-21 15:22:59 +00:00
Johannes Kirschbauer
f300a12309 Clan-app: fix welcome screen for initially empty clan 2024-08-21 17:06:49 +02:00
clan-bot
ff2ec42d4d Merge pull request 'clan-vm-manager: Fix regression' (#1944) from Qubasa/clan-core:Qubasa-new_clan_vm_manager into main 2024-08-21 13:54:31 +00:00
Qubasa
6c4d7494f6 clan-cli: Fix some type errors in tests 2024-08-21 15:48:43 +02:00
Qubasa
1cb26b41e7 clan-vm-manager: Fix regression 2024-08-21 15:48:43 +02:00
clan-bot
0a1f30e614 Merge pull request 'UI: install improve UI workflow' (#1952) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-21 13:40:01 +00:00
Johannes Kirschbauer
0834829a80 Format 2024-08-21 15:32:38 +02:00
Johannes Kirschbauer
f627817968 Clan-app: improve install machine workflow 2024-08-21 15:31:33 +02:00
Johannes Kirschbauer
c2b4aad634 UI: add classes to SelectInput 2024-08-21 15:29:08 +02:00
Johannes Kirschbauer
0e5c6ad4dc UI: add placeholder to fileInput 2024-08-21 15:29:08 +02:00
Johannes Kirschbauer
1b146943d8 API: init set_machine 2024-08-21 15:29:08 +02:00
Mic92
1b6f86a6f7 Merge pull request 'rework-installation' (#1804) from rework-installation into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1804
Reviewed-by: kenji <aks.kenji@protonmail.com>
2024-08-21 13:28:54 +00:00
Mic92
cf3a1d6b7a Merge branch 'main' into rework-installation 2024-08-21 13:28:29 +00:00
Jörg Thalheim
81c941aba6 fix template path for relative clan create template 2024-08-21 15:16:46 +02:00
Jörg Thalheim
d20287f9e3 capture_output: only start capturing when we enter the with statement 2024-08-21 15:16:46 +02:00
clan-bot
aeb62e8de8 Merge pull request 'Revert "vars: fix - upload machines own secrets only"' (#1950) from DavHau/clan-core:DavHau-dave into main 2024-08-21 13:02:27 +00:00
Jörg Thalheim
d6b70f8fd7 remove ipdb again
ipdb doesn't work with capsys and breakpoint
2024-08-21 15:00:47 +02:00
DavHau
0cd29daf88 Revert "vars: fix - upload machines own secrets only"
This reverts commit 2a8958f494.
2024-08-21 14:59:05 +02:00
clan-bot
9b929f6f0d Merge pull request 'vars: fix - upload machines own secrets only' (#1949) from DavHau/clan-core:DavHau-dave into main 2024-08-21 12:51:28 +00:00
DavHau
2a8958f494 vars: fix - upload machines own secrets only 2024-08-21 14:47:41 +02:00
Jörg Thalheim
2fbd0b6796 test_create_flake: use template name instead of url 2024-08-21 13:59:38 +02:00
clan-bot
dab39476e1 Merge pull request 'formatter: rm uncommented code' (#1947) from kenji/clan-core:formatter-rm into main 2024-08-21 11:59:29 +00:00
clan-bot
6b4a7ab66e Merge pull request 'clan-app: Fix nix run .#clan-app' (#1948) from Qubasa/clan-core:Qubasa-clan-app-fix into main 2024-08-21 11:59:29 +00:00
Jörg Thalheim
3cdf9b513d ui: fix type errors 2024-08-21 13:53:49 +02:00
Qubasa
b2530f0b19 clan-app: Fix nix run .#clan-app 2024-08-21 13:52:25 +02:00
a-kenji
710d34b9b4 formatter: rm uncommented code 2024-08-21 13:50:50 +02:00
Jörg Thalheim
9f66ded76a Merge remote-tracking branch 'origin/main' into rework-installation 2024-08-21 13:38:04 +02:00
clan-bot
bcf7517435 Merge pull request 'clan-app: Fix name, desktop file and uri handling' (#1945) from kenji/clan-core:clan-app into main 2024-08-21 10:38:06 +00:00
a-kenji
0c811f90b0 clan-app: Fix name, desktop file and uri handling
This fixes the desktop file and uri handling.
Also brings app window class and name and build in line with the actual
naming.
2024-08-21 12:31:02 +02:00
clan-bot
9847f835b2 Merge pull request 'flash: fix finding disko-install when sudo is used' (#1943) from Mic92-main into main 2024-08-21 10:01:48 +00:00
Jörg Thalheim
8b918ab4b1 flash: fix finding disko-install when sudo is used 2024-08-21 11:57:41 +02:00
Mic92
cd8033d70f Merge pull request 'fix(installer): Fix language check case' (#1940) from aos/clan-core:aos/fix-language-installer into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1940
2024-08-21 08:15:49 +00:00
Aos Dabbagh
7281cef29e fix(installer): Fix language check case
When attempting to follow the docs on the installer, this error comes
up:
```
$ clan flash --flake git+https://git.clan.lol/clan/clan-core \
             --ssh-pubkey ~/.ssh/id_ed25519.pub \
             --keymap us \
             --language en_US.utf-8 \
             --dry-run flash-installer

ERROR: Language 'en_US.utf-8' is not a valid language. Run 'clan flash --list-languages' to see a list of possible languages.
```

I only decided to clean up the docs, but I'm also okay with just
downcasing the locales in `list_possible_languages()`.
2024-08-21 08:15:49 +00:00
clan-bot
ed4503bce8 Merge pull request 'Revert "Merge pull request 'clanModules: Init nginx module. matrix-synapse: don't assume domain names' (#1906) from Qubasa/clan-core:Qubasa-new-main into main"' (#1941) from Mic92-main into main 2024-08-21 08:14:07 +00:00
Jörg Thalheim
2fc4bccfd5 Revert "Merge pull request 'clanModules: Init nginx module. matrix-synapse: don't assume domain names' (#1906) from Qubasa/clan-core:Qubasa-new-main into main"
This reverts commit b29f649343, reversing
changes made to 9c8be387fa.

Apparently this breaks assumptions about matrix: https://git.clan.lol/clan/clan-core/pulls/1906#issuecomment-13184
2024-08-21 10:03:13 +02:00
clan-bot
4a06ea9391 Merge pull request 'clanModules/mumble: prefer str instead of string' (#1939) from kenji/clan-core:mumble-str into main 2024-08-20 13:22:24 +00:00
a-kenji
7712533304 clanModules/mumble: prefer str instead of string 2024-08-20 15:15:19 +02:00
clan-bot
771761702c Merge pull request 'Automatic flake update - nixos-images - 2024-08-20T14:47+02:00' (#1934) from flake-update-nixos-images-2024-08-20 into main 2024-08-20 13:00:08 +00:00
clan-bot
146f5d3c0d Merge pull request 'Automatic flake update - nixpkgs - 2024-08-20T14:47+02:00' (#1935) from flake-update-nixpkgs-2024-08-20 into main 2024-08-20 13:00:08 +00:00
clan-bot
284f3abbd2 Merge pull request 'Automatic flake update - sops-nix - 2024-08-20T14:47+02:00' (#1936) from flake-update-sops-nix-2024-08-20 into main 2024-08-20 12:59:55 +00:00