diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix index 868f7d0..f0fc910 100644 --- a/modules/profiles/desktop/default.nix +++ b/modules/profiles/desktop/default.nix @@ -31,7 +31,6 @@ in "adbusers" "networkmanager" "wireshark" - "podman" "docker" ]; @@ -107,11 +106,6 @@ in command-not-found.enable = false; }; - virtualisation.podman = { - enable = lib.mkDefault true; - extraPackages = [ pkgs.zfs ]; - }; - security.rtkit.enable = true; networking.networkmanager.enable = true; @@ -123,6 +117,8 @@ in #}; #location.provider = "geoclue2"; + virtualisation.docker.enable = true; + documentation = { dev.enable = true; doc.enable = true; diff --git a/shared/work/default.nix b/shared/work/default.nix index 8fe3451..e4e86c2 100644 --- a/shared/work/default.nix +++ b/shared/work/default.nix @@ -1,7 +1,6 @@ { config, pkgs, ... }: { mj.base.users.email = null; - mj.base.users.user.extraGroups = [ "docker" ]; environment.systemPackages = with pkgs; [ #swc @@ -52,14 +51,10 @@ Group = "clamav"; }; - virtualisation.podman.enable = false; - virtualisation.docker.enable = true; - home-manager.users.${config.mj.username} = { home.sessionVariables = { GOFLAGS = "-tags=integration,cluster_integration"; GOPRIVATE = "github.com/chronosphereio"; - CONTAINER_HOST = "unix://run/podman/podman.sock"; BUILDKIT_COLORS = "run=123,20,245:error=yellow:cancel=blue:warning=white"; }; programs = {