chore: merge main into infra #255

Merged
b12f merged 18 commits from chore/infra-merge-main into infra 2023-09-13 11:29:20 +00:00
2 changed files with 2 additions and 0 deletions
Showing only changes of commit d83389b1dd - Show all commits

View file

@ -14,6 +14,7 @@ in {
config = mkIf cfg.enable {
virtualisation.docker.enable = true;
virtualisation.docker.package = pkgs.docker_24;
users.users = with pkgs;
pkgs.lib.setAttrByPath [psCfg.user.name] {
extraGroups = ["docker"];

View file

@ -4,6 +4,7 @@ channels: final: prev: {
inherit
(channels.latest)
nixd
docker_24
;
inherit