From da1e34198e0eddf57212a93367d420aa7bff3312 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 12 May 2023 15:00:03 +0200 Subject: [PATCH] try using nix store --- .woodpecker.yml | 3 +++ flake.nix | 13 +++++++------ nixos/common/common.nix | 2 -- .../hosts/olympus/woodpecker/configuration.nix | 17 +++++++++-------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 0a65993..cb47814 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,10 @@ pipeline: image: nixos/nix:2.15.0 environment: - NIX_CONFIG=experimental-features = nix-command flakes + - NIX_STORE_DIR=unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt commands: - nix run 'nixpkgs#statix' check - nix run 'nixpkgs#deadnix' -- -f - nix run 'nixpkgs#yamllint' . + volumes: + - /nix:/mnt/nix:ro diff --git a/flake.nix b/flake.nix index 21a3d4d..d5ff657 100644 --- a/flake.nix +++ b/flake.nix @@ -119,12 +119,13 @@ ++ [ (import ./nixos/templates/proxmox-lxc.nix) ]; }; - proxmox-vm = nixos-generators.nixosGenerate { - inherit system pkgs; - format = "proxmox"; - modules = util.base_imports - ++ [ (import ./nixos/templates/proxmox-vm.nix) ]; - }; + # Broken + # proxmox-vm = nixos-generators.nixosGenerate { + # inherit system pkgs; + # format = "proxmox"; + # modules = util.base_imports + # ++ [ (import ./nixos/templates/proxmox-vm.nix) ]; + # }; }; # Use by running `nix develop` diff --git a/nixos/common/common.nix b/nixos/common/common.nix index 2cf7461..cc67573 100644 --- a/nixos/common/common.nix +++ b/nixos/common/common.nix @@ -26,7 +26,6 @@ "https://nix-community.cachix.org" "https://nixpkgs-review-bot.cachix.org" "https://colmena.cachix.org" - "https://hyprland.cachix.org" "https://cache.garnix.io" "https://0x76-infra.cachix.org" "https://webcord.cachix.org" @@ -36,7 +35,6 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE=" "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "0x76-infra.cachix.org-1:dC1qp+VEN3jj5pdK4URlXR9hf3atT+MnpKGu6PZjMc8=" "webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs=" diff --git a/nixos/hosts/olympus/woodpecker/configuration.nix b/nixos/hosts/olympus/woodpecker/configuration.nix index c5da5db..68c896b 100644 --- a/nixos/hosts/olympus/woodpecker/configuration.nix +++ b/nixos/hosts/olympus/woodpecker/configuration.nix @@ -27,18 +27,19 @@ in { quoteEnvironmentValues = false; # Needed for docker }; - # For some reason networking is broken in podman virtualisation.podman = { - enable = false; + enable = true; dockerSocket.enable = true; dockerCompat = true; - }; - - virtualisation.docker = { - enable = true; autoPrune.enable = true; }; + # Fix DNS Lookup in podman + virtualisation.podman.defaultNetwork.settings.dns_enable = true; + networking.firewall.interfaces."podman+" = { + allowedUDPPorts = [ 53 ]; + allowedTCPPorts = [ 53 ]; + }; services.woodpecker-server = { enable = true; environment = { @@ -57,12 +58,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 = [ "docker" ]; + extraGroups = [ "podman" ]; }; }; }