From ec5aeddc64f026f817d809af3e3cdfd0d3977b60 Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Mon, 17 Jun 2024 16:30:00 +0200 Subject: [PATCH] pinwheel: Use `podman` alongside `docker` --- hosts/pinwheel/modules/containers/default.nix | 8 ++++++-- hosts/pinwheel/modules/default.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hosts/pinwheel/modules/containers/default.nix b/hosts/pinwheel/modules/containers/default.nix index 126ebf0..a0aefa2 100644 --- a/hosts/pinwheel/modules/containers/default.nix +++ b/hosts/pinwheel/modules/containers/default.nix @@ -24,13 +24,17 @@ in podman = lib.mkIf podmanEnabled { enable = true; + defaultNetwork.settings.dns_enabled = true; }; }; users.users.alex.extraGroups = lib.mkIf dockerEnabled [ "docker" ]; - home-manager.users.alex = lib.mkIf dockerEnabled { - home.packages = [ pkgs.docker-compose ]; + home-manager.users.alex = { + home.packages = [ + (lib.mkIf dockerEnabled pkgs.docker-compose) + (lib.mkIf podmanEnabled pkgs.podman-compose) + ]; }; }; } diff --git a/hosts/pinwheel/modules/default.nix b/hosts/pinwheel/modules/default.nix index 65b12a7..4721bcb 100644 --- a/hosts/pinwheel/modules/default.nix +++ b/hosts/pinwheel/modules/default.nix @@ -32,7 +32,7 @@ in keyboard.enable = true; containers = { docker.enable = true; - podman.enable = false; + podman.enable = true; }; vm.enable = true; scripts.enable = true;