From bf589d3463124ef242b091550417141199efe09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 29 Jul 2024 15:15:21 +0300 Subject: [PATCH] dockerd seems to work now --- modules/profiles/desktop/default.nix | 5 +++-- shared/work/default.nix | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix index 91d878b..e0cfdf4 100644 --- a/modules/profiles/desktop/default.nix +++ b/modules/profiles/desktop/default.nix @@ -1,4 +1,5 @@ { + lib, pkgs, config, ... @@ -26,7 +27,7 @@ in { }; }; - mj.base.users.user.extraGroups = ["adbusers" "networkmanager" "wireshark" "podman"]; + mj.base.users.user.extraGroups = ["adbusers" "networkmanager" "wireshark" "podman" "docker"]; services = { fwupd.enable = true; @@ -100,7 +101,7 @@ in { }; virtualisation.podman = { - enable = true; + enable = lib.mkDefault true; extraPackages = [pkgs.zfs]; }; diff --git a/shared/work/default.nix b/shared/work/default.nix index 80d3f84..92ee8d9 100644 --- a/shared/work/default.nix +++ b/shared/work/default.nix @@ -55,10 +55,8 @@ Group = "clamav"; }; - virtualisation.podman = { - dockerCompat = true; - dockerSocket.enable = true; - }; + virtualisation.podman.enable = false; + virtualisation.docker.enable = true; home-manager.users.${config.mj.username} = { home.sessionVariables = {