diff --git a/dragonwell/caddy.nix b/dragonwell/caddy.nix index 911aae6f0e901e27f36d4959f407ec6959ea89ca..3f36e5dcbbe5daf33f90a423cc2c3f5862fc07ca 100644 --- a/dragonwell/caddy.nix +++ b/dragonwell/caddy.nix @@ -59,9 +59,6 @@ }; "git.jolheiser.com".extraConfig = '' reverse_proxy localhost:8449 ''; - "ci.jolheiser.com".extraConfig = '' - reverse_proxy localhost:2423 - ''; "pr.jolheiser.com".extraConfig = '' reverse_proxy localhost:7449 ''; diff --git a/dragonwell/default.nix b/dragonwell/default.nix index 5046cfd03dd00c75fea802e1b428550723d12814..92b754277fdd5a5c1213a7e94c51f96a3502efd1 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -23,7 +23,6 @@ ./pubserve.nix ./restic.nix ./soju.nix ./ugit.nix - ./woodpecker.nix ./hardware.nix ]; diff --git a/dragonwell/woodpecker.nix b/dragonwell/woodpecker.nix deleted file mode 100644 index fe15c4920b73acf406a5cfac5dad3bc425f0dba7..0000000000000000000000000000000000000000 --- a/dragonwell/woodpecker.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs, config, ... }: -{ - age.secrets.woodpecker.file = ../secrets/woodpecker.age; - services = { - woodpecker-server = { - enable = true; - environment = { - WOODPECKER_HOST = "https://ci.jolheiser.com"; - WOODPECKER_OPEN = "true"; - WOODPECKER_ADDON_FORGE = "${pkgs.lib.getExe pkgs.jolheiser.gitpecker}"; - WOODPECKER_ADMIN = "jolheiser"; - WOODPECKER_SERVER_ADDR = ":2423"; - GITPECKER_REPOS = "/var/lib/ugit/repos"; - GITPECKER_URL = "https://git.jolheiser.com"; - GITPECKER_PROVIDER = "https://id.jolheiser.com"; - GITPECKER_CLIENT_ID = "6975ecea-ce29-48f0-ad8d-323e419f7732"; - GITPECKER_REDIRECT = "https://ci.jolheiser.com/authorize"; - GITPECKER_LOG_FILE = "/var/lib/woodpecker-server/gitpecker.log"; - }; - environmentFile = [ config.age.secrets.woodpecker.path ]; - }; - woodpecker-agents.agents."007" = { - enable = true; - path = with pkgs; [ - git - bash - coreutils - woodpecker-plugin-git - ]; - environmentFile = [ config.age.secrets.woodpecker.path ]; - }; - }; - systemd.services.woodpecker-server.serviceConfig.SupplementaryGroups = [ "ugit" ]; -} diff --git a/flake.lock b/flake.lock index 0b47f8a1d1fce44ef4a307f7f92a099b870c9df1..c3bd8314caf1c7bdf450a90301d01b636fbb885b 100644 --- a/flake.lock +++ b/flake.lock @@ -235,27 +235,9 @@ "repo": "gitignore.nix", "type": "github" } }, - "gitpecker": { - "inputs": { - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1770466719, - "narHash": "sha256-xiYIZtQYAHHZuKWm7kb23ucae4y8JfxgrIPvGCnbpno=", - "owner": "jolheiser", - "repo": "gitpecker", - "rev": "c6c44039ffc6a735b68da61e5145a53547e65eea", - "type": "github" - }, - "original": { - "owner": "jolheiser", - "repo": "gitpecker", - "type": "github" - } - }, "golink": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "systems": "systems_3" }, "locked": { @@ -274,7 +256,7 @@ } }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1758288820, @@ -291,7 +273,7 @@ } }, "horcrux": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1757854957, @@ -309,7 +291,7 @@ } }, "mazanoke": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1749738796, @@ -327,7 +309,7 @@ } }, "mint": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1758713828, @@ -390,22 +372,6 @@ } }, "nixpkgs_10": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { "lastModified": 1756819007, "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "nixos", @@ -420,7 +386,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1746397377, "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", @@ -436,7 +402,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1758446476, "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", @@ -452,7 +418,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1765186076, "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", @@ -468,7 +434,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1752012998, "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=", @@ -484,7 +450,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1697383814, "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=", @@ -499,7 +465,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1748856973, "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", @@ -515,7 +481,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_17": { "locked": { "lastModified": 1743583204, "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", @@ -530,7 +496,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1755205935, "narHash": "sha256-EQ6qHuJWguaoBZyxdqsgJqyEdS77k+2CnlKrfFxlkRY=", @@ -546,13 +512,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_19": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", "type": "github" }, "original": { @@ -562,13 +528,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_20": { + "nixpkgs_2": { "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -578,7 +544,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_20": { "locked": { "lastModified": 1753399495, "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", @@ -594,7 +560,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_21": { "locked": { "lastModified": 1699343069, "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", @@ -691,38 +657,38 @@ } }, "nixpkgs_8": { "locked": { - "lastModified": 1766410818, - "narHash": "sha256-ruVneSx6wFy5PMw1ow3BE+znl653TJ6+eeNUj4B/9y8=", - "owner": "nixos", + "lastModified": 1753934836, + "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a7affa77a5a539afa1c7859e2c31abdb1aeadf3", + "rev": "8679b16e11becd487b45d568358ddf9d5640d860", "type": "github" }, "original": { - "owner": "nixos", + "id": "nixpkgs", "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs_9": { "locked": { - "lastModified": 1753934836, - "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8679b16e11becd487b45d568358ddf9d5640d860", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "oidc": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1752529116, @@ -740,7 +706,7 @@ } }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1753062776, @@ -766,14 +732,13 @@ "forge-lines": "forge-lines", "foundry": "foundry", "git-age": "git-age", "git-pr": "git-pr", - "gitpecker": "gitpecker", "golink": "golink", "home-manager": "home-manager", "horcrux": "horcrux", "mazanoke": "mazanoke", "mint": "mint", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "oidc": "oidc", "resume": "resume", "tailproxy": "tailproxy", @@ -844,7 +809,7 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1755099374, @@ -904,7 +869,7 @@ } }, "tailwind-ctp-lsp_2": { "inputs": { - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1699401590, @@ -922,7 +887,7 @@ } }, "tailwind-ctp_2": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1753803577, @@ -940,7 +905,7 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "utils": "utils" }, "locked": { @@ -959,16 +924,16 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, "locked": { - "lastModified": 1770468130, - "narHash": "sha256-MiAxb2zUgnNO95iqCMEsWUzDscjSrI/jmCEjixK8EmU=", + "lastModified": 1761913622, + "narHash": "sha256-khh7xc2CzK/MYAoF6KABk0iuKzC82dPIKjDDbOUYecQ=", "ref": "refs/heads/main", - "rev": "4ffe885f97514eefbf6f6f53417ea44c916ce8eb", - "revCount": 101, + "rev": "804f234707a6f29344bb299ef1431a412c695cf3", + "revCount": 98, "type": "git", "url": "https://git.jolheiser.com/ugit.git" }, @@ -997,7 +962,7 @@ } }, "website": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_19", "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index 58010150b543e6d65025f511f50759c2cbb19196..5707830e70063d7a64a9240db74d44abeaf65d35 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,6 @@ foundry.url = "github:reckenrode/nix-foundryvtt"; tailproxy.url = "git+https://git.jolheiser.com/tailproxy.git"; forge-lines.url = "git+https://code.winston.sh/winston/forge-lines.git"; mazanoke.url = "github:jolheiser/mazanoke-nix"; - gitpecker.url = "github:jolheiser/gitpecker"; }; outputs = @@ -50,7 +49,6 @@ git-age = inputs.git-age.packages.${prev.system}.default; blog = inputs.blog.packages.${prev.system}.default; bennet = inputs.bennet.packages.${prev.system}.default; mint = inputs.mint.packages.${prev.system}.default; - gitpecker = inputs.gitpecker.packages.${prev.system}.default; }; tclip = inputs.tclip.packages.${prev.system}.tclip; templ = inputs.templ.packages.${prev.system}.templ; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e2c6fa5f0b352eac9528667762bd4e76a390663f..ca90266465f13a5d9bb57209ec60f78ebffe6f09 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -45,5 +45,4 @@ "mint.age".publicKeys = dragonwellKeys; "cifs.age".publicKeys = jasmineKeys; "beanboy.age".publicKeys = peachKeys; "oa2p.age".publicKeys = dragonwellKeys; - "woodpecker.age".publicKeys = dragonwellKeys; } diff --git a/secrets/woodpecker.age b/secrets/woodpecker.age deleted file mode 100644 index 34aa96968839dff5385b125e21366c3d1b507678..0000000000000000000000000000000000000000 Binary files a/secrets/woodpecker.age and /dev/null differ