diff --git a/flake.lock b/flake.lock index 1d733af..ddb9686 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { @@ -78,14 +78,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "parts": { @@ -93,11 +96,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { diff --git a/nix/application/containers.nix b/nix/application/containers.nix index cf43197..b178b66 100644 --- a/nix/application/containers.nix +++ b/nix/application/containers.nix @@ -42,6 +42,24 @@ }; + gitea-runner = { + image = "docker.io/gitea/act_runner:latest"; + volumes = [ "/home/sezycei/srv/containerdata/gitea/runner/config.yaml:/config.yaml" + "/home/sezycei/srv/containerdata/gitea/runner/data:/data" + "/run/podman/podman.sock:/var/run/docker.sock" + ]; + environment = + { + CONFIG_FILE = "/config.yaml"; + GITEA_INSTANCE_URL = "https://git.eversole.co"; + GITEA_RUNNER_REGISTRATION_TOKEN = "Rxl7OYPb4ysOmDZB3jnmzm7hJtQQYeaKHdn4jrbR"; + GITEA_RUNNER_NAME = "nix0-primary"; + + }; + + }; + + jellyfin = { image = "linuxserver/jellyfin:latest"; ports = [ "8096:8096" "8920:8920" ]; diff --git a/nix/application/nginx.nix b/nix/application/nginx.nix index 2886925..10e2ab9 100644 --- a/nix/application/nginx.nix +++ b/nix/application/nginx.nix @@ -44,13 +44,13 @@ }; in { + "default.host" = { default = true; root = "/var/www/default";}; "atuin.matri.cx" = proxied { target = "http://127.0.0.1:8888"; }; "brohan.lol" = static { dir = "/var/www/brohan.lol"; }; "cache.matri.cx" = proxiedLAN { target = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; }; "caitlynncox.com" = static { dir = "/var/www/caitlynncox.com"; }; - "dallasmed65.com" = static { dir = "/var/www/dallasmed65.com"; }; "docker.matri.cx" = proxiedAuth { auth = config.age.secrets.htpasswd-dock.path; target = "http://127.0.0.1:3001"; diff --git a/nix/system/network.nix b/nix/system/network.nix index 933155c..709cfe9 100644 --- a/nix/system/network.nix +++ b/nix/system/network.nix @@ -2,7 +2,7 @@ networking = { hostName = "eve-psr-nix0"; firewall = { - allowedTCPPorts = [ 22 80 443 23231 23232 23233 ]; + allowedTCPPorts = [ 22 80 443 5000 23231 23232 23233 ]; allowedUDPPorts = [ 53 51820 ]; trustedInterfaces = [ "tun0" ]; };