pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

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
Conversation 0 Commits 18 Files changed 17 +2
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d83389b1dd - Show all commits

1
modules/docker/default.nix
View file

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

1
overlays/overrides.nix
View file

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