diff --git a/flake.lock b/flake.lock index 950b91a..f3e6e2c 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1746638861, - "narHash": "sha256-fmphHNrbydmLECpXp2q9egb2IsqIjzvPboGkndGOye0=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "78d6a1365cde90a479edc9ff7ea5dbd8b2e0cfb8", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -121,11 +121,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1746590608, - "narHash": "sha256-YOAq1/TwrJCskpn+inpV6WoH/h27DII+O7rQ3qZbuUQ=", + "lastModified": 1748405006, + "narHash": "sha256-pmt0SFjACJJAI8g8QU5arg2c9BXNZG9/okVwRSDJkG8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0c84460279d64a35225529b90d906b15d7e30068", + "rev": "f9801a86d6603260940890c36650275090d1dceb", "type": "gitlab" }, "original": { @@ -138,11 +138,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -215,6 +215,54 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "snm", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "snm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "snm", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -222,11 +270,11 @@ ] }, "locked": { - "lastModified": 1746632058, - "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=", + "lastModified": 1748455938, + "narHash": "sha256-mQ/iNzPra2WtDQ+x2r5IadcWNr0m3uHvLMzJkXKAG/8=", "owner": "nix-community", "repo": "home-manager", - "rev": "708074ae6db9e0468e4f48477f856e8c2d059795", + "rev": "02077149e2921014511dac2729ae6dadb4ec50e2", "type": "github" }, "original": { @@ -288,11 +336,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1746651240, - "narHash": "sha256-J2i+3FWP5BR1PToKQPbp5OWRmuyF2Qlvr/nVVaLF+No=", + "lastModified": 1747902977, + "narHash": "sha256-P39dIT2qvpjZzWI+tUIHUQEQ36YKzlOPSXpE5ccikMY=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "39866afc0a91087de3ff880cdfe47daa7111b8d5", + "rev": "b21cc6ab00338644ce7ccdc390343dd3a1ee3960", "type": "github" }, "original": { @@ -334,11 +382,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746621361, - "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -359,11 +407,11 @@ ] }, "locked": { - "lastModified": 1744853194, - "narHash": "sha256-NBOdBdQdxb3FdM4Ywb4cATMLfFtkPqDYh0LIQMZ7eRY=", + "lastModified": 1747271391, + "narHash": "sha256-dI5ZPey12JQq+9VyfufwchPC4gGjQB46zVyEfLcnJdU=", "owner": "nix-community", "repo": "nixos-images", - "rev": "8f6f8060a13096934c2a502eb0508bdc3f1284a1", + "rev": "20a679e918b5b47850b9f98b4ad4f8d3eac0741f", "type": "github" }, "original": { @@ -374,11 +422,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1747335874, + "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858", "type": "github" }, "original": { @@ -390,11 +438,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -404,19 +452,20 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "root": { @@ -439,17 +488,18 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat", + "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1746637515, - "narHash": "sha256-bUq2uHmsfY3SpJrR4dpncITykufTiD2320JsOKgIYl0=", + "lastModified": 1747965231, + "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "a7d2b05a9920d90f5eb8076f449acdb6c1ad79ca", + "rev": "53007af63fade28853408370c4c600a63dd97f41", "type": "gitlab" }, "original": { @@ -491,11 +541,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -511,11 +561,11 @@ ] }, "locked": { - "lastModified": 1746407175, - "narHash": "sha256-8boiOaVo0c4MEgcoeiLeZU9kiQLf3+LHmsjBLTJoggo=", + "lastModified": 1748221540, + "narHash": "sha256-hlf/ILKLU98P38mXQxm6kxbxjt3eI0vUcDZhXjf2HJg=", "owner": "nix-community", "repo": "srvos", - "rev": "beeea09cd4aa38fc1889c4a48d97cc93b9c9eff6", + "rev": "37ce28d34cf7b416bf8eb0974a99e85ad65fbe84", "type": "github" }, "original": { @@ -590,11 +640,11 @@ ] }, "locked": { - "lastModified": 1744961264, - "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", + "lastModified": 1747469671, + "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8d404a69efe76146368885110f29a2ca3700bee6", + "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", "type": "github" }, "original": { diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 875084f..d38583f 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -145,8 +145,12 @@ in environment = { WOODPECKER_HOST = "https://ci.missing.ninja"; WOODPECKER_OPEN = "true"; - WOODPECKER_GITEA = "true"; - WOODPECKER_GITEA_URL = "https://git.mixel.cloud"; + WOODPECKER_FORGEJO = "true"; + WOODPECKER_ADMIN = "irgendwas"; + WOODPECKER_FORGEJO_URL = "https://git.missing.ninja"; + WOODPECKER_FORGEJO_CLIENT = ""; + WOODPECKER_FORGEJO_SECRET = ""; + WOODPECKER_AGENT_SECRET = ""; }; }; @@ -155,11 +159,25 @@ in enable = true; environment = { WOODPECKER_SERVER = "localhost:9000"; - WOODPECKER_MAX_WORKFLOWS = "6"; + WOODPECKER_MAX_WORKFLOWS = "8"; + WOODPECKER_AGENT_SECRET = ""; + WOODPECKER_BACKEND= "docker"; + DOCKER_HOST = "unix:///run/podman/podman.sock"; }; + extraGroups = [ "podman" ]; }; }; + virtualisation.podman.defaultNetwork.settings.dns_enable = true; + virtualisation.podman.enable = true; + virtualisation.podman.dockerCompat = true; + + networking.firewall.interfaces."podman+" = { + allowedUDPPorts = [ 53 ]; + allowedTCPPorts = [ 53 ]; + }; + + users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index fd62a6e..d79be8e 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -86,6 +86,7 @@ picard gh kdePackages.wallpaper-engine-plugin + nix-output-monitor ]; programs = {