Commit Graph

2493 Commits

Author SHA1 Message Date
clan-bot
f710a66a53 Merge pull request 'init: sunshine-moonlight-accept module' (#1002) from a-kenji-init/sunshine-accept into main 2024-03-19 11:50:15 +00:00
a-kenji
c6928fc1ac fmt 2024-03-19 12:40:58 +01:00
a-kenji
bd801ca292 Merge branch 'main' into init/sunshine-accept 2024-03-19 12:33:45 +01:00
a-kenji
2897124a12 fmt: module 2024-03-19 12:30:40 +01:00
a-kenji
60bb5dc8e0 init: sunshine-moonlight-accept module 2024-03-19 12:11:09 +01:00
clan-bot
7d09b0ad75 Merge pull request 'devshell: remove dependency on clan-cli derivation' (#1000) from DavHau-dave into main 2024-03-19 06:05:15 +00:00
DavHau
056742a44d devshell: remove dependency on clan-cli derivation
The devShell depended on clan-cli due to it being included as a dependency in the treefmt config. This is not optimal because this makes the devshell rebuild unnecessary often and also lead to build failures of the dev-shell if the clan-cli code is in a broken state (git rebasing, or during development etc.)
2024-03-19 13:00:59 +07:00
clan-bot
da986d85f7 Merge pull request 'Automatic flake update - 2024-03-18T00:00+00:00' (#998) from flake-update-2024-03-18 into main 2024-03-18 00:11:00 +00:00
Clan Merge Bot
520ba0cba0 update flake lock - 2024-03-18T00:00+00:00
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/fe064a639319ed61cdf12b8f6eded9523abcc498' (2024-03-11)
  → 'github:nix-community/disko/21d89b333ca300bef82c928c856d48b94a9f997c' (2024-03-14)
• Updated input 'nixos-generators':
    'github:nix-community/nixos-generators/1d9c8cd24eba7942955f92fdcefba5a6a7543bc6' (2024-03-11)
  → 'github:nix-community/nixos-generators/efd4e38532b5abfaa5c9fc95c5a913157dc20ccb' (2024-03-14)
• Updated input 'nixos-generators/nixlib':
    'github:nix-community/nixpkgs.lib/7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c' (2024-03-03)
  → 'github:nix-community/nixpkgs.lib/630ebdc047ca96d8126e16bb664c7730dc52f6e6' (2024-03-10)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e4e2121b151e492fd15d4bdb034e793738fdc120' (2024-03-12)
  → 'github:NixOS/nixpkgs/f471be9644f3ab2f3cb868de1787ab70a537b0e7' (2024-03-17)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/e52d8117b330f690382f1d16d81ae43daeb4b880' (2024-03-11)
  → 'github:Mic92/sops-nix/83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616' (2024-03-17)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/720322c5352d7b7bd2cb3601a9176b0e91d1de7d' (2024-03-10)
  → 'github:numtide/treefmt-nix/35791f76524086ab4b785a33e4abbedfda64bd22' (2024-03-12)
2024-03-18 00:00:14 +00:00
clan-bot
3da245a616 Merge pull request 'nixos-install: also respect port' (#997) from Mic92-openssh into main 2024-03-17 21:23:24 +00:00
Jörg Thalheim
f9241448c5 nixos-install: also respect port 2024-03-17 22:18:22 +01:00
clan-bot
e8f74ea5d6 Merge pull request 'drop secret store logging from install command' (#996) from Mic92-openssh into main 2024-03-17 20:41:39 +00:00
Jörg Thalheim
7412ae027e allow to debug nixos-anywhere 2024-03-17 21:36:22 +01:00
Jörg Thalheim
36b788853a drop secret store logging from install command 2024-03-17 21:32:23 +01:00
Mic92
a6c87d3abc Merge pull request 'change from nixpkgs-fmt to rfc style formatter' (#995) from openssh into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/995
2024-03-17 18:53:59 +00:00
Jörg Thalheim
ede4d3f6e5 re-format with nixfmt 2024-03-17 19:48:49 +01:00
Jörg Thalheim
f2a0f84bc2 change from nixpkgs-fmt to rfc style formatter 2024-03-17 19:44:57 +01:00
clan-bot
ab658bc610 Merge pull request 'make installer nixos module stand-alone' (#994) from openssh into main 2024-03-17 18:42:55 +00:00
Jörg Thalheim
13b69ca63a make installer nixos module stand-alone 2024-03-17 19:38:50 +01:00
clan-bot
2171e665e8 Merge pull request 'installer: also match qemu and serial consoles for prompting qrcode' (#993) from openssh into main 2024-03-17 18:23:07 +00:00
Jörg Thalheim
b33751e8f8 installer: also match qemu and serial consoles for prompting qrcode 2024-03-17 19:14:24 +01:00
clan-bot
5852a0b870 Merge pull request 'add nix to devShell' (#992) from openssh into main 2024-03-17 17:36:00 +00:00
Jörg Thalheim
81bd63fe8b add nix to devShell
It's important for some tests that package manager used inside NixOS vms is the same as outside
2024-03-17 18:31:16 +01:00
clan-bot
66e57b1f04 Merge pull request 'sshd: module fix impurity' (#987) from openssh into main 2024-03-17 17:20:10 +00:00
Jörg Thalheim
99ea2ffe1c fix evaluation of backup module 2024-03-17 18:16:08 +01:00
Jörg Thalheim
7fb05130c9 don't use impure builtins.storePath 2024-03-17 18:10:23 +01:00
Jörg Thalheim
789bb82835 change facts path to be reachable as a store path 2024-03-17 18:10:23 +01:00
clan-bot
1bc61bb4af Merge pull request 'clan-vm-manager: init log view with current state of log' (#990) from hsjobeki-main into main 2024-03-17 14:03:49 +00:00
Johannes Kirschbauer
384b0697fb clan-vm-manager: init log view with current state of log 2024-03-17 14:57:32 +01:00
clan-bot
ff38569a36 Merge pull request 'clan-vm-manager: connect log view to build state of machines' (#989) from hsjobeki-main into main 2024-03-17 13:14:49 +00:00
Johannes Kirschbauer
3888a7dba3 clan-vm-manager: connect log view to build state of machines 2024-03-17 14:08:39 +01:00
clan-bot
999574a353 Merge pull request 'dev-shell: make python shell load fast' (#985) from DavHau-dave into main 2024-03-14 10:23:53 +00:00
DavHau
bbab5a2952 dev-shell: make python shell load fast
- Add caching for editable installs
- Remove sleep statement in GUI code
2024-03-14 17:19:08 +07:00
DavHau
63444b012a merge-after-ci: fix bug 2024-03-14 12:46:17 +07:00
clan-bot
e6325ee11e Merge pull request 'openssh fixes' (#983) from openssh into main 2024-03-13 14:04:25 +00:00
Jörg Thalheim
406033b69a fix openssh secrets
change facts path to be the full path

sshd: fixup store path
2024-03-13 14:59:46 +01:00
Mic92
210b1f7741 Merge pull request 'fix openssh secrets' (#982) from openssh into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/982
2024-03-13 13:27:10 +00:00
Jörg Thalheim
67f2c89a99 fix openssh secrets 2024-03-13 13:27:10 +00:00
clan-bot
0300c9ff8b Merge pull request 'merge-after-ci: set labels correctly' (#981) from DavHau-dave into main 2024-03-13 12:20:20 +00:00
DavHau
22369298fa merge-after-ci: set labels correctly 2024-03-13 19:11:12 +07:00
clan-bot
fef4ea2f7a Merge pull request 'secrets-improvements' (#948) from secrets-improvements into main 2024-03-13 10:23:27 +00:00
Jörg Thalheim
6bcddae692 allow multi-line interactive secrets 2024-03-13 11:18:56 +01:00
Jörg Thalheim
c52cffca37 allow fact-only secrets 2024-03-13 11:08:36 +01:00
Jörg Thalheim
e9ab0417d8 add sshd module 2024-03-13 11:08:36 +01:00
clan-bot
413c93a496 Merge pull request 'sunshine: add path' (#947) from a-kenji-sunshine/add-path into main 2024-03-12 22:06:37 +00:00
a-kenji
8600af7b28 sunshine: add path 2024-03-12 23:01:02 +01:00
clan-bot
37f41e588d Merge pull request 'sunshine: add apps, improve uaccess rules' (#946) from a-kenji-imp/sunshine into main 2024-03-12 21:23:06 +00:00
a-kenji
69aca55feb sunshine: add apps, improve uaccess rules 2024-03-12 22:17:08 +01:00
clan-bot
181380ac33 Merge pull request 'sunshine: improve module' (#945) from a-kenji-imp/sunshine into main 2024-03-12 19:59:09 +00:00
a-kenji
f39d47b5b7 sunshine: improve module 2024-03-12 20:53:04 +01:00