diff --git a/home/crow/common/optional/deferred-apps.nix b/home/crow/common/optional/deferred-apps.nix index c59af46..1b0d923 100644 --- a/home/crow/common/optional/deferred-apps.nix +++ b/home/crow/common/optional/deferred-apps.nix @@ -23,8 +23,6 @@ blender # Local AI lmstudio - # Dev - ddev ; inherit (pkgs) # Utilities diff --git a/hosts/common/optional/docker.nix b/hosts/common/optional/docker.nix index 0aeaf0d..14616ae 100644 --- a/hosts/common/optional/docker.nix +++ b/hosts/common/optional/docker.nix @@ -1,8 +1,10 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ virtualisation.docker = { enable = true; extraPackages = [ pkgs.docker-compose + pkgs.docker-buildx ]; }; } diff --git a/hosts/common/optional/podman.nix b/hosts/common/optional/podman.nix index db5659b..a156031 100644 --- a/hosts/common/optional/podman.nix +++ b/hosts/common/optional/podman.nix @@ -2,7 +2,7 @@ { virtualisation.podman = { enable = true; - dockerCompat = true; + #dockerCompat = true; defaultNetwork.settings.dns_enabled = true; extraPackages = with pkgs; [ podman-compose diff --git a/hosts/nixos/Parzival/default.nix b/hosts/nixos/Parzival/default.nix index 09cd2ac..87e7680 100644 --- a/hosts/nixos/Parzival/default.nix +++ b/hosts/nixos/Parzival/default.nix @@ -37,6 +37,8 @@ "hosts/common/optional/pentesting.nix" "hosts/common/optional/gaming.nix" "hosts/common/optional/podman.nix" + "hosts/common/optional/docker.nix" + "hosts/common/optional/vms.nix" "hosts/common/optional/printing.nix" "modules/services/jellyfin"