diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index cbb4d31..72ea977 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -47,7 +47,6 @@ in pkgs.openssh pkgs.file pkgs.fastfetch - pkgs.toybox ]; home-manager.useGlobalPkgs = true; diff --git a/hosts/common/optional/docker.nix b/hosts/common/optional/docker.nix index 14616ae..3046eef 100644 --- a/hosts/common/optional/docker.nix +++ b/hosts/common/optional/docker.nix @@ -1,9 +1,13 @@ { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + docker + ]; + virtualisation.docker = { enable = true; + package = pkgs.docker; extraPackages = [ - pkgs.docker-compose pkgs.docker-buildx ]; }; diff --git a/hosts/nixos/Incarceron/default.nix b/hosts/nixos/Incarceron/default.nix index a472d2b..fc28cd9 100644 --- a/hosts/nixos/Incarceron/default.nix +++ b/hosts/nixos/Incarceron/default.nix @@ -44,6 +44,7 @@ "hosts/common/optional/printing.nix" "hosts/common/optional/gaming.nix" "modules/services/mesh/client.nix" + "modules/ddev.nix" ]) ];