Commit Graph

3792 Commits

Author SHA1 Message Date
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
Jörg Thalheim
d6b70f8fd7 remove ipdb again
ipdb doesn't work with capsys and breakpoint
2024-08-21 15:00:47 +02:00
Jörg Thalheim
2fbd0b6796 test_create_flake: use template name instead of url 2024-08-21 13:59:38 +02:00
Jörg Thalheim
3cdf9b513d ui: fix type errors 2024-08-21 13:53:49 +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
clan-bot
751b2d0b9e Merge pull request 'Automatic flake update - treefmt-nix - 2024-08-20T14:47+02:00' (#1937) from flake-update-treefmt-nix-2024-08-20 into main 2024-08-20 12:59:55 +00:00
Clan Merge Bot
3ddd8d8fee update flake lock - treefmt-nix - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/4a6d7dccf80a1aa2d04cfaa88d9e5511542a2486' (2024-08-14)
  → 'github:numtide/treefmt-nix/1d07739554fdc4f8481068f1b11d6ab4c1a4167a' (2024-08-16)
2024-08-20 14:47:44 +02:00
Clan Merge Bot
daad15430c update flake lock - sops-nix - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9' (2024-08-05)
  → 'github:Mic92/sops-nix/be0eec2d27563590194a9206f551a6f73d52fa34' (2024-08-12)
2024-08-20 14:47:41 +02:00
Clan Merge Bot
2b748a4198 update flake lock - nixpkgs - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/03bd12dcf88b6aabc047fbf909bda4c7e344416c' (2024-08-15)
  → 'github:NixOS/nixpkgs/d2fa2514f041934a6aa261c66dc44829251cffd3' (2024-08-20)
2024-08-20 14:47:38 +02:00
Clan Merge Bot
2ee7839f80 update flake lock - nixos-images - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'nixos-images':
    'github:nix-community/nixos-images/617f2cb56213d10574bc6fdb390f6e7f5b551d7e' (2024-08-08)
  → 'github:nix-community/nixos-images/b733f0680a42cc01d6ad53896fb5ca40a66d5e79' (2024-08-19)
2024-08-20 14:47:36 +02:00
kenji
d15acf318d Merge pull request 'facts: fix typo' (#1909) from kenji/clan-core:fix-typos into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1909
2024-08-20 11:44:29 +00:00
a-kenji
a13864f202 facts: fix typo 2024-08-20 11:44:29 +00:00
clan-bot
0689ccdcb6 Merge pull request 'API/show_block_devices: add option for remote devices' (#1903) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-20 10:10:48 +00:00
Johannes Kirschbauer
f63940e2ba init: Set/get single disk 2024-08-20 12:05:22 +02:00
kenji
9d36262a13 Merge pull request 'state: remove /home from default state folders' (#1886) from kenji/clan-core:remove-home-from-state into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1886
Reviewed-by: lassulus <clanlol@lassul.us>
2024-08-20 10:02:12 +00:00
a-kenji
54ad16a9fd state: remove /home from default state folders
Home should not always be set by default.
In the UI we can suggest it, but it catches a lot of state you might not
want to back up.

The default has been moved to be automatically set by vm's in `vm.nix`.
2024-08-20 10:02:12 +00:00
Johannes Kirschbauer
b8feff9ca6 Fix: types 2024-08-20 11:33:23 +02:00
Johannes Kirschbauer
92e3c3f40b Clan-app: connection check & show remote devices 2024-08-20 09:53:15 +02:00
Johannes Kirschbauer
340babd348 API/show_block_devices: add option for remote devices 2024-08-20 09:53:15 +02:00
clan-bot
b29f649343 Merge pull request 'clanModules: Init nginx module. matrix-synapse: don't assume domain names' (#1906) from Qubasa/clan-core:Qubasa-new-main into main 2024-08-19 10:59:16 +00:00
Qubasa
c14a0689bc clanModules: Add acme secret prompt for nginx 2024-08-19 12:53:15 +02:00
Qubasa
586c5adf71 clanModules: Init vaultwarden, the bitwarden server 2024-08-19 12:00:35 +02:00
Qubasa
234ac6965a clanModules: Init nginx module. matrix-synapse: don't assume domain names 2024-08-19 12:00:35 +02:00
clan-bot
9c8be387fa Merge pull request 'golem: add golem-provider clan module' (#1890) from DavHau/clan-core:DavHau-dave into main 2024-08-19 09:55:54 +00:00
DavHau
8b75b16ccf golem: add golem-provider clan module 2024-08-19 11:50:04 +02:00
clan-bot
2e2c29381e Merge pull request 'Classgen: fix dict type conversion for trivial dicts' (#1905) from hsjobeki/clan-core:class into main 2024-08-19 06:58:49 +00:00
Johannes Kirschbauer
0296693680 Classgen: fix dict type conversion for trivial dicts 2024-08-19 08:48:31 +02:00
kenji
d0d95d0189 Merge pull request 'vars: fix using vars module with multiple machines' (#1891) from kenji/clan-core:fix-vars-multiple-machines into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1891
2024-08-17 14:00:56 +00:00
a-kenji
6130505177 vars: fix using vars module with multiple machines
This filters the secrets to only include the secrets managed under `per-machine` and `shared`,
otherwise new deployments will fail, when using the vars module for multiple machines:

```
[vyr] /nix/store/[…]sops-install-secrets: failed to decrypt '/nix/store/[…]/sops/vars/per-machine/draper/garage/admin_token/secret': Error getting data key: 0 successful groups required, got 0
```

This doesn't fix all the edge cases with this approach.
We get a similar error if we deploy shared vars that are not
encrypted for our machine key. This needs to be addressed when
implementing the shared vars functionality.
2024-08-17 14:00:56 +00:00
clan-bot
ab5425e1f3 Merge pull request 'zerotierone: fix with recent nixpkgs update' (#1902) from zerotierone into main 2024-08-16 09:08:18 +00:00
Jörg Thalheim
a067895bee bcachefs: use unstable for zfs 2024-08-16 11:04:42 +02:00
Jörg Thalheim
e9d63c5a84 bump nixpkgs 2024-08-16 11:04:42 +02:00
Jörg Thalheim
0e3b16578e zerotierone: use our own upgraded zerotierone package in nixos module 2024-08-16 11:04:42 +02:00
Jörg Thalheim
e12ab8f70e zerotierone: fix build against rust 1.80 2024-08-16 10:54:48 +02:00
clan-bot
0fc7213094 Merge pull request 'fix group settings not applied correctly' (#1901) from group-secrets into main 2024-08-15 21:00:54 +00:00
Mic92
4e7b14b908 Merge pull request 'feat(flake): make systems overridable' (#1893) from zimbatm/clan-core:overridable-flake-systems into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1893
2024-08-15 20:53:44 +00:00