This commit is contained in:
parent
fa628ab6ce
commit
da1e34198e
|
@ -3,7 +3,10 @@ pipeline:
|
||||||
image: nixos/nix:2.15.0
|
image: nixos/nix:2.15.0
|
||||||
environment:
|
environment:
|
||||||
- NIX_CONFIG=experimental-features = nix-command flakes
|
- NIX_CONFIG=experimental-features = nix-command flakes
|
||||||
|
- NIX_STORE_DIR=unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt
|
||||||
commands:
|
commands:
|
||||||
- nix run 'nixpkgs#statix' check
|
- nix run 'nixpkgs#statix' check
|
||||||
- nix run 'nixpkgs#deadnix' -- -f
|
- nix run 'nixpkgs#deadnix' -- -f
|
||||||
- nix run 'nixpkgs#yamllint' .
|
- nix run 'nixpkgs#yamllint' .
|
||||||
|
volumes:
|
||||||
|
- /nix:/mnt/nix:ro
|
||||||
|
|
13
flake.nix
13
flake.nix
|
@ -119,12 +119,13 @@
|
||||||
++ [ (import ./nixos/templates/proxmox-lxc.nix) ];
|
++ [ (import ./nixos/templates/proxmox-lxc.nix) ];
|
||||||
};
|
};
|
||||||
|
|
||||||
proxmox-vm = nixos-generators.nixosGenerate {
|
# Broken
|
||||||
inherit system pkgs;
|
# proxmox-vm = nixos-generators.nixosGenerate {
|
||||||
format = "proxmox";
|
# inherit system pkgs;
|
||||||
modules = util.base_imports
|
# format = "proxmox";
|
||||||
++ [ (import ./nixos/templates/proxmox-vm.nix) ];
|
# modules = util.base_imports
|
||||||
};
|
# ++ [ (import ./nixos/templates/proxmox-vm.nix) ];
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use by running `nix develop`
|
# Use by running `nix develop`
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://nixpkgs-review-bot.cachix.org"
|
"https://nixpkgs-review-bot.cachix.org"
|
||||||
"https://colmena.cachix.org"
|
"https://colmena.cachix.org"
|
||||||
"https://hyprland.cachix.org"
|
|
||||||
"https://cache.garnix.io"
|
"https://cache.garnix.io"
|
||||||
"https://0x76-infra.cachix.org"
|
"https://0x76-infra.cachix.org"
|
||||||
"https://webcord.cachix.org"
|
"https://webcord.cachix.org"
|
||||||
|
@ -36,7 +35,6 @@
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
"nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE="
|
"nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE="
|
||||||
"colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg="
|
"colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg="
|
||||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
|
||||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||||
"0x76-infra.cachix.org-1:dC1qp+VEN3jj5pdK4URlXR9hf3atT+MnpKGu6PZjMc8="
|
"0x76-infra.cachix.org-1:dC1qp+VEN3jj5pdK4URlXR9hf3atT+MnpKGu6PZjMc8="
|
||||||
"webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs="
|
"webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs="
|
||||||
|
|
|
@ -27,18 +27,19 @@ in {
|
||||||
quoteEnvironmentValues = false; # Needed for docker
|
quoteEnvironmentValues = false; # Needed for docker
|
||||||
};
|
};
|
||||||
|
|
||||||
# For some reason networking is broken in podman
|
|
||||||
virtualisation.podman = {
|
virtualisation.podman = {
|
||||||
enable = false;
|
enable = true;
|
||||||
dockerSocket.enable = true;
|
dockerSocket.enable = true;
|
||||||
dockerCompat = true;
|
dockerCompat = true;
|
||||||
};
|
|
||||||
|
|
||||||
virtualisation.docker = {
|
|
||||||
enable = true;
|
|
||||||
autoPrune.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 = {
|
services.woodpecker-server = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environment = {
|
environment = {
|
||||||
|
@ -57,12 +58,12 @@ in {
|
||||||
docker = {
|
docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environment = {
|
environment = {
|
||||||
# DOCKER_HOST = "unix:///run/podman/podman.sock";
|
DOCKER_HOST = "unix:///run/podman/podman.sock";
|
||||||
WOODPECKER_BACKEND = "docker";
|
WOODPECKER_BACKEND = "docker";
|
||||||
WOODPECKER_SERVER = "localhost:9000";
|
WOODPECKER_SERVER = "localhost:9000";
|
||||||
};
|
};
|
||||||
environmentFile = [ "${vs.woodpecker}/environment" ];
|
environmentFile = [ "${vs.woodpecker}/environment" ];
|
||||||
extraGroups = [ "docker" ];
|
extraGroups = [ "podman" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue