diff --git a/modules/docker.nix b/modules/docker.nix index f04b3b0..86a33d2 100644 --- a/modules/docker.nix +++ b/modules/docker.nix @@ -1,5 +1,17 @@ { lib, ... }: { + users = { + users.docker-service = { + isSystemUser = true; + group = "docker-service"; + extraGroups = [ "docker" ]; + uid = 600; + }; + groups.docker-service = { + gid = 600; + }; + }; + virtualisation.docker = { enable = lib.mkDefault true; logDriver = "local"; diff --git a/systems/jeeves/docker/default.nix b/systems/jeeves/docker/default.nix index 41d7fa6..514c522 100644 --- a/systems/jeeves/docker/default.nix +++ b/systems/jeeves/docker/default.nix @@ -6,17 +6,5 @@ ./postgresql.nix ]; - users = { - users.docker-service = { - isSystemUser = true; - group = "docker-service"; - extraGroups = [ "docker" ]; - uid = 600; - }; - groups.docker-service = { - gid = 600; - }; - }; - virtualisation.oci-containers.backend = "docker"; } diff --git a/systems/palatine-hill/docker.nix b/systems/palatine-hill/docker.nix index 4b7eed2..b79eb6f 100644 --- a/systems/palatine-hill/docker.nix +++ b/systems/palatine-hill/docker.nix @@ -2,14 +2,4 @@ { virtualisation.docker.daemon.settings.data-root = "/var/lib/docker2"; - - users = { - users.docker-service = { - isSystemUser = true; - group = "docker-service"; - extraGroups = [ "docker" ]; - uid = 600; - }; - groups.docker-service = { }; - }; }