From 74a5d6c4c636513cc7d8b97f91891f7cbc8f7142 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 29 Apr 2023 13:44:23 +0200 Subject: [PATCH] fix woodpecker --- nixos/common/desktop/home.nix | 2 ++ nixos/hosts/olympus/woodpecker/configuration.nix | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix index 6458b8d..b169f54 100644 --- a/nixos/common/desktop/home.nix +++ b/nixos/common/desktop/home.nix @@ -9,6 +9,7 @@ in { home.packages = with pkgs; [ btop calibre + celluloid element-desktop fusee-launcher gcc @@ -17,6 +18,7 @@ in { inputs.webcord.packages.${pkgs.system}.default jetbrains.clion jetbrains.idea-ultimate + kdenlive mullvad-vpn neofetch nixfmt diff --git a/nixos/hosts/olympus/woodpecker/configuration.nix b/nixos/hosts/olympus/woodpecker/configuration.nix index a0590fb..682338b 100644 --- a/nixos/hosts/olympus/woodpecker/configuration.nix +++ b/nixos/hosts/olympus/woodpecker/configuration.nix @@ -25,12 +25,18 @@ in { quoteEnvironmentValues = false; # Needed for docker }; + # For some reason networking is broken in podman virtualisation.podman = { - enable = true; + enable = false; dockerSocket.enable = true; dockerCompat = true; }; + virtualisation.docker = { + enable = true; + autoPrune.enable = true; + }; + services.woodpecker-server = { enable = true; environment = { @@ -49,12 +55,12 @@ in { docker = { enable = true; environment = { - DOCKER_HOST = "unix:///run/podman/podman.sock"; + # DOCKER_HOST = "unix:///run/podman/podman.sock"; WOODPECKER_BACKEND = "docker"; WOODPECKER_SERVER = "localhost:9000"; }; environmentFile = [ "${vs.woodpecker}/environment" ]; - extraGroups = [ "podman" ]; + extraGroups = [ "docker" ]; }; }; }