From bca8c2f9df8160076b4cfbd14ffdc858351013d6 Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Mon, 13 Jul 2026 00:36:52 +1000 Subject: [PATCH] move docker system packages to docker-service module --- hosts/docker/configuration.nix | 17 ++--------------- modules/nix/docker-service.nix | 5 +++++ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix index 9354e7a..93381cc 100644 --- a/hosts/docker/configuration.nix +++ b/hosts/docker/configuration.nix @@ -25,27 +25,14 @@ in networking.hostName = "docker"; # Define your hostname. networking.hostId = "007f0200"; boot.zfs.forceImportRoot = false; -# virtualisation.docker.enable = true; -# virtualisation.docker = { -# enable = true; -# package = pkgs.docker; -# listenOptions = [ -# "unix:///var/run/docker.sock" -# "tcp://0.0.0.0:2375" -#]; -# daemon.settings = { -# metrics-addr = "0.0.0.0:9323"; -# experimental = true; -# }; -#}; services.tailscale.enable = true; # Enable docker-compose environment.systemPackages = with pkgs; [ - docker-compose - docker-buildx +# docker-compose +# docker-buildx nfs-utils ]; diff --git a/modules/nix/docker-service.nix b/modules/nix/docker-service.nix index 19a7a7c..2b7c0cd 100644 --- a/modules/nix/docker-service.nix +++ b/modules/nix/docker-service.nix @@ -15,4 +15,9 @@ # experimental = true; # }; }; + +environment.systemPackages = with pkgs; [ + docker-compose + docker-buildx +]; } \ No newline at end of file