From e7bc043b882eb16f4528daf7409a0b748ed73d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Sat, 13 Jan 2024 17:18:25 +0100 Subject: [PATCH] =?UTF-8?q?=E2=8F=AA=20(silicium/system)=20switch=20back?= =?UTF-8?q?=20to=20docker=20(from=20podman)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- home/packages.nix | 4 ++-- hosts/silicium/system/docker/default.nix | 11 ++++++----- hosts/silicium/system/users/default.nix | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/home/packages.nix b/home/packages.nix index 62eef74..0475a1f 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -12,8 +12,8 @@ })) borgbackup # backup dconf # required by home-manager - distrobox # podman wrapper - podman-compose # "docker" compose + distrobox # docker utils + docker-compose # docker compose duf # replacement for df feh # image viewer gnome.nautilus # file explorer diff --git a/hosts/silicium/system/docker/default.nix b/hosts/silicium/system/docker/default.nix index 9124cea..f94fbc4 100644 --- a/hosts/silicium/system/docker/default.nix +++ b/hosts/silicium/system/docker/default.nix @@ -1,11 +1,12 @@ {...}: { - virtualisation.podman = { + virtualisation.docker = { enable = true; - dockerCompat = true; - dockerSocket.enable = true; - defaultNetwork.settings.dns_enabled = - true; # required by networks in compose + storageDriver = "btrfs"; + enableOnBoot = false; autoPrune.enable = true; }; + + # docker users + users.users.laurent.extraGroups = ["docker"]; } diff --git a/hosts/silicium/system/users/default.nix b/hosts/silicium/system/users/default.nix index 70ecca8..e427ce8 100644 --- a/hosts/silicium/system/users/default.nix +++ b/hosts/silicium/system/users/default.nix @@ -7,7 +7,7 @@ users.laurent = { isNormalUser = true; initialPassword = "laurent"; - extraGroups = ["wheel" "video" "docker"]; + extraGroups = ["wheel" "video"]; shell = pkgs.zsh; }; };