Commit Graph

3823 Commits

Author SHA1 Message Date
Johannes Kirschbauer
1e766feb40 API: prepare hw_generate for facter 2024-08-23 11:13:06 +02:00
clan-bot
dcb51d0af3 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
b0d57cbdf5 API: hw_generate commit generated config 2024-08-22 16:11:08 +02:00
clan-bot
05d604e464 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
2d119ae750 Clan-app: generate hw report 2024-08-22 15:57:00 +02:00
clan-bot
0b777dcf32 Merge pull request 'bump nixpkgs' (#1955) from flake-update into main 2024-08-22 11:46:29 +00:00
Jörg Thalheim
d8d2c8b071 bump nixpkgs 2024-08-22 13:41:03 +02:00
clan-bot
68c25d6aeb 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
ed85df6998 Clan-app: install machine interaction 2024-08-22 10:16:43 +02:00
Johannes Kirschbauer
b7d0314826 API: serde fix nullable fields should be allowed to be none 2024-08-21 17:53:25 +02:00
clan-bot
0bd6921c5d 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
1d6ff67905 Clan-app: fix welcome screen for initially empty clan 2024-08-21 17:06:49 +02:00
clan-bot
6305667e62 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
19fe0432d9 clan-cli: Fix some type errors in tests 2024-08-21 15:48:43 +02:00
Qubasa
f74df54edd clan-vm-manager: Fix regression 2024-08-21 15:48:43 +02:00
clan-bot
8796f53f4a 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
10e3664bf3 Format 2024-08-21 15:32:38 +02:00
Johannes Kirschbauer
819db34d99 Clan-app: improve install machine workflow 2024-08-21 15:31:33 +02:00
Johannes Kirschbauer
4862171e85 UI: add classes to SelectInput 2024-08-21 15:29:08 +02:00
Johannes Kirschbauer
b5951146bc UI: add placeholder to fileInput 2024-08-21 15:29:08 +02:00
Johannes Kirschbauer
9a222d62a7 API: init set_machine 2024-08-21 15:29:08 +02:00
Mic92
3a254bee28 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
3710175785 Merge branch 'main' into rework-installation 2024-08-21 13:28:29 +00:00
Jörg Thalheim
666718287a fix template path for relative clan create template 2024-08-21 15:16:46 +02:00
Jörg Thalheim
a72498fe2c capture_output: only start capturing when we enter the with statement 2024-08-21 15:16:46 +02:00
clan-bot
d16a833bb1 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
a3699721c0 remove ipdb again
ipdb doesn't work with capsys and breakpoint
2024-08-21 15:00:47 +02:00
DavHau
cb860f9a03 Revert "vars: fix - upload machines own secrets only"
This reverts commit 8d61b03f8d.
2024-08-21 14:59:05 +02:00
clan-bot
977193ed41 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
8d61b03f8d vars: fix - upload machines own secrets only 2024-08-21 14:47:41 +02:00
Jörg Thalheim
6c421be9b2 test_create_flake: use template name instead of url 2024-08-21 13:59:38 +02:00
clan-bot
d6380bdbb3 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
1eafb183df 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
449db570b3 ui: fix type errors 2024-08-21 13:53:49 +02:00
Qubasa
e6dafd05f9 clan-app: Fix nix run .#clan-app 2024-08-21 13:52:25 +02:00
a-kenji
d4c70297f2 formatter: rm uncommented code 2024-08-21 13:50:50 +02:00
Jörg Thalheim
30bbb142e2 Merge remote-tracking branch 'origin/main' into rework-installation 2024-08-21 13:38:04 +02:00
clan-bot
721c5771c8 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
df04d68cf3 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
30fda8b986 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
262859fdb8 flash: fix finding disko-install when sudo is used 2024-08-21 11:57:41 +02:00
Mic92
1759a8a4dc 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
1e96f59ecd 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
13d4e5c7f3 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
3c04199447 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 88d3223ac0, reversing
changes made to f8c20fcbe1.

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
fa9bcbede2 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
3c916fc4ad clanModules/mumble: prefer str instead of string 2024-08-20 15:15:19 +02:00
clan-bot
45b586dbc6 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
952d5761df 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
c2e55fbc4f 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