Commit Graph

851 Commits

Author SHA1 Message Date
Jörg Thalheim
2048ffccb0 drop clan_flake fixture 2023-09-14 16:57:48 +02:00
clan-bot
85f46d69b9 Merge pull request 'move machine_flake fixture to its own file' (#288) from Mic92-flake-archive into main 2023-09-14 14:52:15 +00:00
Jörg Thalheim
4905e0cecd move machine_flake fixture to its own file 2023-09-14 16:49:02 +02:00
clan-bot
667ada75f5 Merge pull request 'gitignore: use absolute paths' (#287) from Mic92-flake-archive into main 2023-09-14 14:29:10 +00:00
Jörg Thalheim
837ebda70d gitignore: use absolute paths 2023-09-14 16:28:01 +02:00
Qubasa
e6fabdcda5 Merge pull request 'Removed workflow' (#286) from Qubasa-main into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/286
2023-09-14 13:28:11 +00:00
Luis-Hebendanz
fb583a7b34 Removed workflow 2023-09-14 13:28:11 +00:00
Luis-Hebendanz
2c80f6feac Removed workflow 2023-09-14 15:27:53 +02:00
Qubasa
b6232899b0 Merge pull request 'Qubasa-main' (#285) from Qubasa-main into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/285
2023-09-14 12:58:24 +00:00
Luis-Hebendanz
ddc5528e05 Fixed push perms error 2023-09-14 14:57:41 +02:00
Luis-Hebendanz
bcdee2c2a2 Changed to on_push and force 2023-09-14 14:46:52 +02:00
Qubasa
e8e5375600 Merge pull request 'Added assets CI' (#284) from Qubasa-main into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/284
2023-09-14 12:38:54 +00:00
ui_assets[bot]
c948e645c2 update ui-assets.nix 2023-09-14 12:37:24 +00:00
Luis-Hebendanz
989f9e20e9 Changed to on_push 2023-09-14 14:36:18 +02:00
Luis-Hebendanz
e6733bcb6b Added assets CI 2023-09-14 14:34:40 +02:00
clan-bot
93f501bfbe Merge pull request 'rename test_api_machines test to be consistent with the rest' (#279) from Mic92-flake-archive into main 2023-09-14 11:05:29 +00:00
Jörg Thalheim
451ecbb691 rename test_api_machines test to be consistent with the rest 2023-09-14 13:02:58 +02:00
clan-bot
a66fe90b79 Merge pull request 'update: use run_local command to print executed command' (#278) from Mic92-flake-archive into main 2023-09-14 09:23:18 +00:00
Jörg Thalheim
2d934d527a update: use run_local command to print executed command 2023-09-14 11:20:45 +02:00
Jörg Thalheim
b97db58316 deploy: use nix-flake-archive instead of rsync to upload 2023-09-13 20:33:53 +02:00
clan-bot
e4e888251e Merge pull request 'nix_build_machine: escape json' (#277) from Mic92-main into main 2023-09-13 14:42:42 +00:00
Jörg Thalheim
3d071396d0 nix_build_machine: escape json 2023-09-13 16:40:26 +02:00
clan-bot
b59298c8db Merge pull request 'add nix_build_machine function' (#275) from Mic92-nix_build_machine into main 2023-09-13 14:06:00 +00:00
Jörg Thalheim
825caeb63a add nix_build_machine function 2023-09-13 16:01:43 +02:00
clan-bot
0f1c3fcabd Merge pull request 'replace pre-commit hook with hook in pre-create' (#274) from Mic92-pre-commit into main 2023-09-13 13:54:57 +00:00
Jörg Thalheim
f63cfb4462 replace pre-commit hook with hook in pre-create 2023-09-13 15:53:36 +02:00
Mic92
61367a1f63 Merge pull request 'replace ci script with nix-ci-build' (#268) from nix-ci-build into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/268
2023-09-13 11:10:54 +00:00
Jörg Thalheim
a11a62cd4e replace ci script with nix-ci-build 2023-09-13 13:09:35 +02:00
Qubasa
41a29b5464 Merge pull request 'Fixed nix flake check failure' (#270) from Qubasa-main into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/270
2023-09-13 10:32:41 +00:00
Luis-Hebendanz
70fe2db135 Fixed nix flake check failure 2023-09-13 12:24:49 +02:00
clan-bot
b16cd35370 Merge pull request 'add missing secrets instruction' (#267) from Mic92-main into main 2023-09-13 09:22:47 +00:00
Jörg Thalheim
2f9413d2e9 docs/secrets: more consistent formatting 2023-09-13 11:21:19 +02:00
Jörg Thalheim
7eac9f6ed9 add missing secrets instruction 2023-09-13 11:19:32 +02:00
clan-bot
28fc8e4592 Merge pull request 'add secrets documentation' (#266) from Mic92-main into main 2023-09-13 09:17:14 +00:00
Jörg Thalheim
4256f3045f add secrets documentation 2023-09-13 11:15:06 +02:00
clan-bot
7a8eb3500e Merge pull request 'add edit flag to secret cli' (#265) from Mic92-main into main 2023-09-13 08:55:19 +00:00
Jörg Thalheim
17af763ad1 add edit flag to secret cli 2023-09-13 10:52:03 +02:00
clan-bot
d74dc7fe22 Merge pull request 'Automatic flake update - 2023-09-12T10:27+00:00' (#264) from flake-update-2023-09-12 into main 2023-09-12 10:32:00 +00:00
Clan Merge Bot
c4f9fb60af update flake lock - 2023-09-12T10:27+00:00
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/f9907fcf6df79a76ea7e3a3afe9340a672cb9c6e' (2023-09-09)
  → 'github:nix-community/disko/be98cffef02e5ebf438ea80b34b86e669c48eff1' (2023-09-12)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b' (2023-09-08)
  → 'github:NixOS/nixpkgs/3a2786eea085f040a66ecde1bc3ddc7099f6dbeb' (2023-09-11)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/faf21ac162173c2deb54e5fdeed002a9bd6e8623' (2023-09-05)
  → 'github:Mic92/sops-nix/ea208e55f8742fdcc0986b256bdfa8986f5e4415' (2023-09-12)
2023-09-12 10:27:31 +00:00
Qubasa
aa5976f046 Qubasa-Qubasa-main (#262)
UI: Connected UI to API
2023-09-11 12:59:24 +00:00
clan-bot
bf4db16209 Merge pull request 'Automatic flake update - 2023-09-11T00:00+00:00' (#260) from flake-update-2023-09-11 into main 2023-09-11 00:07:10 +00:00
Clan Merge Bot
4f54127707 update flake lock - 2023-09-11T00:00+00:00
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/06481a9836c37b7c1aba784092a984c2d2ef5431' (2023-09-02)
  → 'github:nix-community/disko/f9907fcf6df79a76ea7e3a3afe9340a672cb9c6e' (2023-09-09)
• Updated input 'nixos-generators':
    'github:nix-community/nixos-generators/b1171de4d362c022130c92d7c8adc4bf2b83d586' (2023-07-23)
  → 'github:nix-community/nixos-generators/8ee78470029e641cddbd8721496da1316b47d3b4' (2023-09-04)
• Updated input 'nixos-generators/nixlib':
    'github:nix-community/nixpkgs.lib/02fea408f27186f139153e1ae88f8ab2abd9c22c' (2023-07-16)
  → 'github:nix-community/nixpkgs.lib/f5af57d3ef9947a70ac86e42695231ac1ad00c25' (2023-09-03)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e56990880811a451abd32515698c712788be5720' (2023-09-02)
  → 'github:NixOS/nixpkgs/db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b' (2023-09-08)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/d9c5dc41c4b1f74c77f0dbffd0f3a4ebde447b7a' (2023-08-30)
  → 'github:Mic92/sops-nix/faf21ac162173c2deb54e5fdeed002a9bd6e8623' (2023-09-05)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/e3e0f9f6d47f8fc68aff15150eda1224fb46f4d4' (2023-09-02)
  → 'github:numtide/treefmt-nix/b8d3a059f5487d6767d07c3716386753e3132d9f' (2023-09-04)
2023-09-11 00:00:08 +00:00
clan-bot
8f467335d2 Merge pull request 'CLI: Added example machine to machines list on shellHook' (#259) from Qubasa-Qubasa-main into main 2023-09-07 11:51:55 +00:00
Luis-Hebendanz
58bb1b9914 Added example machine to machines list 2023-09-07 13:42:48 +02:00
clan-bot
29d8a126a8 Merge pull request 'secrets cli: hint that group/user/machine flags can be repeated' (#258) from Mic92-main into main 2023-09-07 11:12:42 +00:00
Jörg Thalheim
62e5c66867 secrets cli: hint that group/user/machine flags can be repeated 2023-09-07 13:06:31 +02:00
clan-bot
cbff4a44e0 Merge pull request 'clan/secrets: fix if user/machine directory does not contain a key.json' (#257) from Mic92-main into main 2023-09-07 10:52:00 +00:00
Jörg Thalheim
c3ccf68007 only list valid secrets/users/machines
Git often leaves empty directories behind
2023-09-07 12:48:34 +02:00
Jörg Thalheim
ae3283a762 clan/secrets: fix if user/machine directory does not contain a key.json 2023-09-07 12:30:29 +02:00
clan-bot
80e75fc502 Merge pull request 'sops: add explicit commands to generate secrets' (#256) from Mic92-main into main 2023-09-07 09:44:51 +00:00