diff --git a/flake.lock b/flake.lock index 9bf3c99..2a0a50a 100644 --- a/flake.lock +++ b/flake.lock @@ -759,29 +759,6 @@ "type": "github" } }, - "hydra": { - "inputs": { - "nix": "nix", - "nixpkgs": [ - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1679916613, - "narHash": "sha256-Nj9U0V7Zv7XoRDdO7ECphTk6jHfOgeZe6G0x4FQLpJ0=", - "owner": "NixOS", - "repo": "hydra", - "rev": "082495e34e094cae1eb49dbfc5648938e23c6355", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "hydra", - "type": "github" - } - }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -864,22 +841,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "mk-naked-shell": { "flake": false, "locked": { @@ -971,7 +932,7 @@ "nil": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -988,27 +949,6 @@ "type": "github" } }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_5", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1677045134, - "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", - "owner": "nixos", - "repo": "nix", - "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "2.13.3", - "repo": "nix", - "type": "github" - } - }, "nix-serve-ng": { "inputs": { "flake-compat": "flake-compat_4", @@ -1069,7 +1009,7 @@ }, "nixos-vscode-server": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1676501444, @@ -1204,22 +1144,6 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1671271954, @@ -1332,22 +1256,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1670461440, - "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1680487167, "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", @@ -1363,7 +1271,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1672441588, "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", @@ -1377,7 +1285,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1675942811, "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", @@ -1392,7 +1300,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1678470307, "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", @@ -1411,7 +1319,7 @@ "nom": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -1558,7 +1466,7 @@ "fan-control": "fan-control", "flake-parts": "flake-parts_2", "kernel-src": "kernel-src", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-kernel": "nixpkgs-kernel", "panfork": "panfork", "tow-boot": "tow-boot", @@ -1591,7 +1499,6 @@ "helix": "helix", "homeManager": "homeManager", "homeManagerGitWorkspace": "homeManagerGitWorkspace", - "hydra": "hydra", "hyprland": "hyprland", "hyprpaper": "hyprpaper", "nil": "nil", diff --git a/flake.nix b/flake.nix index 66ef150..b9b90f9 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; - hydra.url = "github:NixOS/hydra"; + # hydra.url = "github:NixOS/hydra"; nixos-vscode-server.url = "github:msteen/nixos-vscode-server"; helix.url = "github:helix-editor/helix"; nil.url = "github:oxalica/nil"; diff --git a/hosts/default.nix b/hosts/default.nix index 0e1dd67..669dfc6 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -186,6 +186,7 @@ ]; secrets = { "rock5b-wireguard-private-key" = {}; + "hercules-ci-join-token".owner = "hercules-ci-agent"; }; colmena.deployment.buildOnTarget = true; }; @@ -207,7 +208,7 @@ extraModules = with inputs; [ disko.nixosModules.disko nix-serve-ng.nixosModules.default - hydra.nixosModules.hydra + # hydra.nixosModules.hydra ]; extraHmModules = [ inputs.ccrEmacs.hmModules.default @@ -227,9 +228,10 @@ "cachix-personal-token".owner = "ccr"; "git-workspace-tokens".owner = "ccr"; "magit-forge-github-token".owner = "ccr"; - "hydra-admin-password".owner = "root"; - "hydra-github-token".group = "hydra"; + # "hydra-admin-password".owner = "root"; + # "hydra-github-token".group = "hydra"; "cache-private-key".owner = "nix-serve"; + "hercules-ci-join-token".owner = "hercules-ci-agent"; }; }; }; diff --git a/hosts/mothership/default.nix b/hosts/mothership/default.nix index ab3f651..c675fba 100644 --- a/hosts/mothership/default.nix +++ b/hosts/mothership/default.nix @@ -1,5 +1,5 @@ { - modulesPath, + # modulesPath, fleetModules, lib, pkgs, @@ -13,13 +13,14 @@ "mosh" "ccr" "nix" - "vm-sala" + # "vm-sala" "vm-mara" - "hydra" + # "hydra" + "hercules-ci" "nix-serve" "cgit" "docker" - "binfmt" + # "binfmt" ]; ccr = { diff --git a/hosts/rock5b/default.nix b/hosts/rock5b/default.nix index 7d9c559..8b3d2db 100644 --- a/hosts/rock5b/default.nix +++ b/hosts/rock5b/default.nix @@ -14,6 +14,7 @@ "wireguard-client" "minidlna" "transmission" + "hercules-ci" ] ++ [ ./disko.nix diff --git a/modules/hercules-ci/default.nix b/modules/hercules-ci/default.nix new file mode 100644 index 0000000..10beff5 --- /dev/null +++ b/modules/hercules-ci/default.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + ... +}: { + services.hercules-ci-agent = { + enable = true; + settings = { + concurrentTasks = 8; + clusterJoinTokenPath = config.age.secrets.hercules-ci-join-token.path; + # Don't need using private caches, if I would ever need remember to use agenix! + binaryCachesPath = pkgs.writeText "binary-caches-path" (builtins.toJSON {}); + # secretsJsonPath = config.hci-secrets.hci-mlabs-haskell.target; + }; + }; +} diff --git a/secrets/autistici-password.age b/secrets/autistici-password.age index d516d47..b6793ce 100644 --- a/secrets/autistici-password.age +++ b/secrets/autistici-password.age @@ -1,31 +1,31 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -SavKqjsDkmbSWGn8nFuPX3+V20g9ciJZGrnO7dk7rlnifGHqzYjFz9HzDmWsoZT6 -vhAeblNv0UenSZt6PpVwBAJP1vsXzCuM60Dx29PqvLs8BzyaWEDozL/SC/jVTRDz -VGCwCSfb17QOOcdamGnJQJlHvWpuB9RKuGMwwMdhchHV+EzMBQnshBovtjIEN7rE -tu7LahBKBFWnnT0ymCphYAIUif1duhSZqXYwZDMledV5nWyddB3WhaR2l6ZwaKVg -UiS5ztqeXqVVATvxeOTCzUDH9NO8FBqdWYj5dmh8nTdnUPd0eOtiTXQpECv2wmGo -xaaOHKvSbrt7SUvdwjaQcYE5Ystqm6MUTzxrnFQ8GgINh0vCDnfcHR+gjFFAfBxb -pcG34pnx07PvdVimJ/CojTd5wDHJtdM1l+HX8CGvmEr8hV2z7AaKJSUcpfHEQxKf -mv02I5kVzFSRkI9MCUJpOan+G1b9lVDvEL8bhxmRy/V+iJ/QPcuj33SXFyynjmrY -VgmSY0X3rd0+89FHaZeyI+KdEnh6YDBwwimh1+FnJV0NOJtnl04q578Vmx0LWFrT -yO7NNWzd6+EZPzRBMWtAD6Nei2OLJXH177778R4ntu639BFYm5MOqADB39jXbQBS -RUZt1fMXDFEI3jNk5I2AEU6hNO6gxoKhngDdyiQyzaA +Klg0lEeYAlohVeUjeeuJpRPcNYLHpglVpV+7xy59WSe+O9ZGaUwKqHhe2fVwk/8D +AFaT1ZTLTJhXnYPdBnwX0y8ALbjOaRRzvnWSeiC4upGW+cCxllwrP1A1TtHRQ3n0 +KgZzn7CMo4AvScZtR/LBRDkFZSYTg7R1lwy0tRoGAbUZkpFF0628QadRKvwuWRNq +BpHkvMxEt6f5LTnUz7AJuMp8IvpoY2Ixops8RUfANcgm4tBa+mUpo4vEPdaYRX6v +2QM6/Y3lexxbvbuT+5Y8tQCZrNJ+mhx9AZtYEPS46RNv+VuEJvg6v8PRctvc8Zcf +P0MED1QIrvJQdT0g67of2NZtPLdyPSVHBYlmuZWSlgQ9Ev52GsgxkR15foF7OHXT +iNTnMgWDQ40ogyEXMFg8PiLDsSpTVdaW+mFblCBGAD/T6I/VgmUaCFpduTiTIiLn +nPLpYgSkHPyxA5rQAfIroVaSTzc856mfSiw/ufW6uvnF+jh4IfmSIAS7eBPXh14B +MgOavQeCwGOWJ9+3FSVem4ySmHXDr5GdygOUAsItCFaqvXYKRlIKYRtK7fQIS4Je +GGBf6PMFN/L/dzO3FsWULVcneVT1NL5TApsZYTywTOkMv+ncKMX3y+vKoyth7feC +F00108iy2YNo8ATRG0+vcJQbLA7Krzb/VJl9XtUp9fA -> ssh-rsa QHr3/A -iUZBRkiEu/iEIVzZAGpDuHVIs85eCcen6rArUtXGBa1ZbsI2VGEH56GhuuNswnw+ -x5/JMJQ1JYbJcsxKw0u0cH0U5Z+hgg2XvqAuO6/UAyv6kHf8g1r+gvMke4+BOjKp -UshNLiVbbyqGPVRXqzj7tGZwE/z1UQHDjVpCj9f8j1mX7KvsTJvPl1Wo9LHXDK0H -/C2D9R29NymAEZW2x3Yol2Bv1xIK8SA6qsYaxmWrLfw/69iqurE49s2nx8tkjWhg -jFPDyO8Lnyj5oNvnkA2XPsuVNUIDQbxUrPZecAhpMn8gAxKbaSgmqWTPMeK1cIU/ -RcYhIisQhrC7E9jQXpscjHOwrc049Y42b2qjaqSxl5hs/9LE8f3avv+UzROsNAeJ -ImiCmUkZqhizePciOx8HqS9Qf8wTrIPpHEzD/27TZABLlF7bpPn+cHz4XNx0WpP1 -bnlfn4sRk32ZKzy89GJbnfAHyyCx+eY3Gjgc8N1LWKG3Hl4sIziCMnR8XQEEnFj/ -GcdVIaF4kRJasofFaoBWZC3HtGeybirRRl/e8v63Lkw9NJfHcmC85rdo1Q5UBYl4 -wLmIgYK4d9WQMSNVXmBGX7Y4tlFh3ls2vI7hW8EL/4RG9QTSGDDYHQJlnHQ/a7rL -RGQyHKUItB3z+QQuduYu2WBrwgKSXiwYVPgrH9zvJcM --> ssh-ed25519 GVMLQg 5cjQIFpgP28Ma+6/blU4w4HibLWXdJ0L0KdtvwfR0GI -6nXKmrUBM40PX29dnQqBxLz6VQu0BQiNmsTwLXisi1o --> Gzx&jr-grease 6]{'em3l a^Ij~& !Ty~ZY WI'5 -5w8dd5FAMwU7 ---- yjqhOfQNPT2npvK0Rjitk9BQywBCYpupFhOO8bVWGKk -;S7y m :Q,罹O \ No newline at end of file +hjpOIFi3jK+XeRIb7GLOudMnOoM8QHRlHslUdQQDOZKfgmoAXW6XkEC2dx8GeEmK +KPn+5crZuPN34d/VZ3oTGCD4zNiAHvz0uDt1K6vysnVYyvCadiIyYu0ylympPjN8 +JUQRVXxAKj5S2QgfGiengsvo7cIwDO8K0JM22viQQRU4smxc/guf9/UVSH+2zm+Z +yhlhZVUs8k5fAkJrn3Zyt5kKf4yv4XKvlNUQ65EG5czKsvNgxR7CQlHB1JYiwCFR +W93hYDiLaRQaNLRJGLty2gmAGB6mmNsriAlkSyBtlKSjeQovVAzt2D57wGdbG300 +lvRkGPdaD28qSXczJ1U5ZvMBxtpw8gEq92vZDS2MKv56Kscxg0KlFgaLzRupEEru +wfaGoxUkUpTKLQMK+ZCnYwgJy0y9fDbDsXd+yid/yBcOUuoAEkpq3/dJcaTpCv5C +b4ERHM0wPubyoscyk1InGP7zaUaBtOHzfwDamKZ2ahu86+skf/NPmeo85mdJiLSZ +lZ7gs5X92+hgxdxr+8NI2AJxy72emVmGpKzr914+hIa0BrKQhtadqaZc2cqyMCmm ++jTwXliBY6PE5Uv/yrTPL+hJ5yfc4RM6T21BsKzqR08/496lvFWYY2uPEMAaubnZ +yrFX5ne4m4uXj0d2OcGa4H3Z8OnrLdfmgysx5IJIxj4 +-> ssh-ed25519 GVMLQg 4Fd61NYElKYQqZacALS/QuQ2yL4vOLrSpuEVKpQAo0w +OhnGd5pXN6Uvxblw2VIwWjFldc9t1BerpQa4KAi21q0 +-> j=-grease yOMTm"#> +QQBUO+uWgj1YmqLea1rmUVRxy9hA/k7SCi7S +--- JqsFWi0axwaVJ2K4bxi8suyGdKYopsIl7h1jEw5ivss +o ssh-rsa /AagBw -m73z4roKXoHfLZH2uJesip/21ytdiBw6LKB1lRS3gOPhBzYwIkUcsXuIfAEuV8zQ -baESUwxFY5/Cq8b2LIOlrDFCeM6AlV6YfXMzmDWRkeCzRgHWOo60NQqY/yLFq98k -I2YhSpim1+mRJgEedpw4+KWkxu8cjajoYj/EHQxoqx0+WgSFA19qrJl1Cl3RGKYJ -Xu7Je07532HMWflNpBl6BskYZ7bYs9DE5iDD47ZsI7a3BIqvLjo4mQ52fGZKe7KW -J8dY2gIuVPJCRCZ6LYztt6VUXmy9Y0PHBSJsQkKLgNdEiJ1I5IaELG3yaJqX2p9V -Fm981HnQaBq/v97jDFJ3RMrfeGQN32SFP+KDGf0z3ZIXZniOG+eCL7FCysrS2mfX -hKpIrg4m3GJy7ZwclfKVIBbxtwsAEEM817byoh2bCV91HpQNVQ3zxiW/ribRf7Lh -GGRHvoz+xzRAsaexmBZ92M3V1z9PiumYOM712/jYxEI5zunR2HJej4Wx5bmG9zJj -cmoo0542WkF/73vHv+TDu0gVYwjjkT1zv2FUdJKVYCTuACVHMMChy3q6EllpDQVS -AG+pfjo9nd73QdpfejbPEOiRWIIxb1pjlQj1pDkZtZ06RQ5naQPGJb+7xSWZYG6q -6J8mj6Xug56novLh70dyv2r3o0QA3fa/hr/FEqpkXMY +kR8vBBJWJ+n5oB5dM+RqqgYBN9y4IFIz66W8F6h+8eNQ7WLsp7qggwztqzkDveuC +yz37rnq7Uq8ExsP8bdBNoJKLJYGeoF2nX1/LsJQJg0qutwzxCIdqqFxGeLKB1Bn+ +n1XNdpoIXBbKajSh9uGGigPZDSlpS8eoAesY6JIqDZwCuups+Ajja1VQEPk2gFAV +3kg33xJc7l+32E3ONuixiIcz8xBnggs0n3zDKTIIigUoW4rrRnx6dI7urkquA7WX +8huykb2lchEIAZVlgEjSNxT8JjifmjUjouNsp79//H9sqpxfGW6GQYQa8uwXuIs4 +cbDC/3TKalQBOnS91WrO2FUHFcgESsAySIeerbAIAwUarEAoYzIz0fA6rY6S5e9Q +whzHPS9TCx+Vk3rj5sJpfKaJctg1XkTdeYpwSbZQmvQHzFd6pwfnUVLLLdWpNptO +VNmtlqwkrQiy0JajyaObyJkdIrjxWq9uDGAGrNxyTpFJJ+KpcYXnGP2vIMxObtTN +En/qWqPlMg7w7s8zoz3OHtjleLWVe1yy442XdLOtjn46KDBjMx1smpV3jxfsiq6Y +I+VOMXZ9MscDrsfyy1L6r9VfLyv65e4ZZ8iu31UBmCwDQvLro9xkXCW7D3iTtCua +WgM9l3PqbrnrdAiqtmh/dCiXE2LBZOyoiNDGeqa1sUs -> ssh-rsa QHr3/A -t0hJvp0CTxh7K5OAPR8AEhoQPfW8mM+IGkBBGk5+kA34BP2LX+gD1dE0L4DJ5tiS -cCL6EhJNcYYpktvUbzqWsp72WTTZX791w5XGirgcPGmHJWBxYio/NlQh86FI8MdJ -38bdIJI+wcDb1pj1Sqope/jsePuNg2bDstRShFzdxpanZayTgE6bAKgyth4ln8qB -nDmtGdHS/ZjadGM5lg0fSglhlSEiKeqnRkYsa3f8qi5qSqB0nZ+owtBZySg8fWlr -cDfW3yDy7r6ttTZNMQ3PVXyBAuwWMAPIAhWTcQyBo6C1d19R9gfsIh0T57JwJriv -9QRc9LhXedcAA3yyX+SpI/3Rh0bmEf5mJeZ4mowZIdguKvyAxpCkUGCdZJbnFtZZ -o1F4jIgyOsNp3m9BupMklmG6LDcbVSgwTZsDmsNxtjfbKp+DZ7IFDFs1g9XFuzyy -4S9RzhVIULAO4zPqoV16u3NsfpOIei/ji5TncAibvQ1hD1bZfO/CNtKqRsbotwdU -pmdU7TQjlbijw6JAuOH1CcEQP3UUORGxVjNs2NEFbDD5skX6IyOJR9GcsuT62xaH -BeU19TKz4KA6gq2hmqzHdSFMOwsQ9XeS3tjH++OuIszj16e2SJExIWiIwHfCWnXQ -D3woBgXS7vIgnFKMg4QTojiEo5p6W2MCGVdExyhi8eQ --> ssh-ed25519 q+UPnA 5uFtZEn7wxhnFOtU1Xa8hLKr3drt+DY3eAaCKyk3BVw -fYQCRS5249+O6nt6gT/slipU4t8fE4sKVC3nGCIrwzM --> ssh-ed25519 GVMLQg GRDDcNOWSg2DEDHJWHkx47yKQO8WXLnd/LHBrncU+lw -/99NgBi4VcPQXyALpWqCIVJjVhtw0yUp41pTvYdPSBg --> L'-grease :*aX 8M,ns~&, -vhPrxCwtTJxSDDcoZZpIi2uD5M3qolG2C9T1iIb84aTkLMRVKsL/ ---- 39DVLa8A03sMDh7yEsaJqFUqi4yqhD80Xg2x4INj2qo -0}!pˬ6׿|/?kzb; +m\4-Oΐ[M8L ?x aH琮s \ No newline at end of file +JUCBXZJFKzimFZC4mg4YFUXzXkXkcC95+wFutEqedZWCwnhYq/OZ3OG8p2GgVe7s +ftIMkNSY2K+H25yKqubuhz+vDgtoTUOYnYkI9XHom7OmC/OAidVT1LTnXXwyGWSI +uM3q+r+e79MFXJJdhYbDhgKYmaS6LmFN6RGx3WG+uGoSw0ZOLCs1j/SdCvDiBf3o +ib5++OfsOHwtcqkgQMNhddQtle8vjuAdKBjuner2bMXwBuAsJLPVKMq4Edo+XHr4 +bYO0ZT38h7zU+IgWpkENNdgDoTglERih4D+7lMFy8Brw6Kr49gypv398BXrbvwtg +8YPd5x4UNFWhMhZ0qvJOI2U0tm9FV1zenJQjsLcPmfOGGO3bSKuFr6ihw5ObJSsg +TTXdUob0FII3701S2074tstRV47GMd98rPJrQ6Crnqy6puLtN2adHkLr+I8agzln +bdPhQ9pYJhICRlwdyQe1Y5l6kgsn8yZVygmMQBF69qJSnnXBuMiRoudQZDzXMdtM ++cWntBt2j6uSno7jMsOR8DZLwZQaso96UiXxstBX5uYhuqEpUk12uIUDFPVcovzx +RBt6fNjkkK1nc2JXr5td3d+rfAJxiOGr8p5YHGWW3RE24qJYVg1doiOyCsHX2XEA +oImTlruNm8MJAuGz8l3L/wKe+v+lwqI94zBPrb/SYwc +-> ssh-ed25519 q+UPnA j9rU2qfTAHjL/+wdP7PcsAu6QO96RPTPszS4qWjiBRw +8ziPmZ3asg/1tOZvI8k0jvNSjeAmhDXYVGtXCi2ShxY +-> ssh-ed25519 GVMLQg Pw0Rs0GhAEGADsd8tc/n5FAhyQHDO9uOh3A8IifHPmg +4o+K44rs+0KVb2LWMf4AQ6JPp6pjUi5IeGg0SZy5Eao +-> g0-v_{W-grease P2 h/otU +keMrgZKkqyoyTiCUR1bqG8j9++6Tl318j3FDMPZ14l3lNbYASe+esj6W1VVQLP6F +CwOZP7mKvlS3jiNTLes +--- hJiPwZY5H5IVDPi8eeVW5bTnrR2eMV22ldDzcdQzWoE +wi=3<_3F.ي*ɟ4!U$IAڮf(03`O~;+F,^I Q%;!oF \ No newline at end of file diff --git a/secrets/hercules-ci-join-token.age b/secrets/hercules-ci-join-token.age new file mode 100644 index 0000000..69c8170 Binary files /dev/null and b/secrets/hercules-ci-join-token.age differ diff --git a/secrets/hydra-admin-password.age b/secrets/hydra-admin-password.age index 8f89d78..c481225 100644 Binary files a/secrets/hydra-admin-password.age and b/secrets/hydra-admin-password.age differ diff --git a/secrets/hydra-github-token.age b/secrets/hydra-github-token.age index 5f83d00..f9dff08 100644 Binary files a/secrets/hydra-github-token.age and b/secrets/hydra-github-token.age differ diff --git a/secrets/magit-forge-github-token.age b/secrets/magit-forge-github-token.age index 1a839ab..55c3bb0 100644 Binary files a/secrets/magit-forge-github-token.age and b/secrets/magit-forge-github-token.age differ diff --git a/secrets/mothership-wireguard-private-key.age b/secrets/mothership-wireguard-private-key.age index c0dae05..54d2fee 100644 --- a/secrets/mothership-wireguard-private-key.age +++ b/secrets/mothership-wireguard-private-key.age @@ -1,33 +1,32 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -DXkRhGDz9k3L6uhx2Gmqg5ihAQEBVmtdwBFDIceLi+U0w+1nND1RHqTPc/WXEQAU -2b+BtYi9Hze7zYPmWiiAggvmfip/1vndPIUpOoywsE+IHMu2kmMkP/dqYXzglzcF -il2mfsIshjDjCGTw9oGYy+pGCHu5ORc8W54QjVnvVsCg3O2kaLy2zJCVjLpjvXZH -WwCbvecZacBx3CiHy1ek3bCGUFOviyt4zD36WBTqKqEBHQvGli0B0Zj6O7FK1iZf -2bKV5VqcUxjiBqX7ARO2Np9dpJxwJUGhQJYTUZUSqu5C0y94VkIZJDioJ0Pu8AYB -RVhmNdhn9GA4JoeV0VHYPSybTDN4Ubrphy2kG/PVqiXMRNliTcN+4yjj31ymmZV+ -VqyCBV/6YdbOsl8OD8V5DYIKxlyq0PVLVZbz/Jq/aX0vPqn8K8Z6JGS20FtnCvp7 -qpWtFvYOeKVzoM/RNa6umOp0KbyKrIpVsw1u25oYpofHCf5qlITCNdgW/Flb39en -nBmbp1D06w2uTbcC29wdTIdlp3p0pQemtmFbc6WwaFBN+7YUE16Av8i+wI6Kxn9V -YAmcvnw+npSNpZX2IejGb2Gu4tXSHGh3SnGalTOwYnmXIra7nonJodOZYrmR932e -pO32ImFuPiaHn0QY5JCR8dX3gzmU2+j64OFMWYU/cKU +ZyAIFd7Y1Gf2IPgt0CpjC71pUwSp+DlS+rGwQlB8IWXUULkzzbO9f/9VAK7NXScu +YaqY5PjgZ9rm7fztJU8LJR+BD8L3VxKSmNIf7UeRjAalC19l4qw4yBq43SPmEBxl +Uzql9M+w+Ad9hyM+zcZC9EBKC6NEgt7nY2V4Ar+xaZrK+422ZzoARh92UPyD2PRr +NTk9SwJnuOUH6VjbtVeTgOumdc5+ervoG+OcYbSx1J8IA+I7sVSTLGIIfyksH/Vb +ISHP6x9258HweDwuCevM6FGpSjo1pZ07vvTrwElCQTmyUI5VSsSivzBsxJW5vTOD +/ZSiNIbWGWaDzBKEZyirLtnx69ymYqQyAzXCH/Syljowan+7x92sAyNjKQ664FP0 +BIkR2Xi/ICnws2v0YmPhQgRHzEoQXYG+A5opAO2hT2hIDGYtPh9bNBjZjXyr+Hh1 +KijGogGeWHE5SxGAV46t80tvo9BbUVhBFKkwezeCoZ8/pzoh7nzkFXyDK2zgWMUW +dEPWolIMLNbvr79oUnkZqHKqtsl/phdrziSt4P8hNtVctfEhChZuTLBHPLx9ac/e +EdU/7sW+XiOJD+BCRyCthAQADSJ4A6iZCp8iCSPts4AV36DFHhX0mG8TOCPF/Djz +t4nI0R/OugAlcaeIU7VBJplAXlwz32B5freu1NF+Cqw -> ssh-rsa QHr3/A -UjF5zTysGertTmYVlbno0aNGZwCnC9pj0pFS7dY17Bs8HXKgQmAz/0Pz1Lo0wYxp -2NbnoityNv/InILUj5ojqA9r4fFWZf32YmRszFfQeaxIPIaMbeEcsMBpem7ct0lG -LOFOXIrNqNqkWTmhlPqnDaOy20ayqlLjzrf9ZiJG42gsZWeiWrekuMllXEEdxxMu -bjEPB7QUpDyFpcWMF++0Fi6u8a0mepKT6idi2D/WCJAU1oar1sGHWb2mItcYcIFI -0Q8ICUborJ1XJbiJCxqYaNA2E61GDjwkOYRpshl6HESTSMwy/ZWiVkacjMx432en -5OPXkCglSDP4wtU1dKczXZBw5fZzcuEeC5YC56rPMuXFXIALwc+Wy2IQJYeFkaaN -nN+TmkydV4vChldLQi0UQuszA/Wlcz83aZO9Qh1WROoIZcR5tkS/VpEcqAhoJ7xZ -MdB32HtvN+aG1xXltWNvTIj+l1kVEB6Q6dAmzL4K9IMQyh1DtnYvFIzLJBzDPPJa -eVvuzC+Nhb2sxlyadE2ey9ghcOHbHx/s/J9dUniqwZCeIwIK+IpK4mY6PIANdRzT -Re7Q3Erbub+/xTFvNGFhBXbtDfjTIqmCvSc+iLLLlmwekcVas9csGnBmBFV0C24b -n9R75KNS9ceG3pdCpTUC7v8vGwxnzk5iq/vbBYDnqEU --> ssh-ed25519 q+UPnA XBenOEk4yVL/NMsmoGw8wofmXpLlR4he4AnP71TDuEQ -Rzo7H3oaCq9CNMiIqCMq+MTifAZ2K6nJniZO8WL3gBg --> 7p.-grease \ ssh-ed25519 q+UPnA TodcF2hzoDbPkcGP4WvWQ+PtTVW2ae2Nf3kvqNrjuzI +ftRwtL4Gkjj5VU4mw15teicD0aa2qMOZxVUYCVtj+v0 +-> ;sH;-grease +ZcjMolRojM91kXtIOEj4C3BplSI8rSALBKn2ny2CfjAS2X5Ml0F/i4SJa7ElVBfI +IvN6OcEf/o5awlcqAC0GtccYwv1X+yASx7HC7jb9Kjd83oULGwY8BuHx0sTm +--- vnVqrDhP0rS+X3DDzDeDdY7Ah+a/+XGAjKabfYMXulk +e>{͗'f%L==J@*aQ5O)RFfcPn*D6{8}.|- \ No newline at end of file diff --git a/secrets/pbp-wireguard-private-key.age b/secrets/pbp-wireguard-private-key.age index b59f71a..96b410d 100644 Binary files a/secrets/pbp-wireguard-private-key.age and b/secrets/pbp-wireguard-private-key.age differ diff --git a/secrets/rock5b-wireguard-private-key.age b/secrets/rock5b-wireguard-private-key.age index ed2c87a..99f30e7 100644 --- a/secrets/rock5b-wireguard-private-key.age +++ b/secrets/rock5b-wireguard-private-key.age @@ -1,32 +1,34 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -Y3q/0GgMhQG33xiULXLL4bAGbkO4FJX0Vs4oMHRDc/Ho+HS6ae/VeZUEJnuIZpQC -g9HrtKW5VigMWszLGcGi+OwlmX5OYUPLWFT/UUg6MBBN7TmjDL39P/Il7m9qV/xP -8phrUnJTcalQ2+pdii6wDtKlhHtVPyXPP8S+sEAU22DyL1lW2Bdb5PYEbM9Xbi9R -nnXGau6A5PwxrSNjrwx0zZpspuwEcdn62awC1CkRQg8H0ZoI8Ps8Aj9iW4a8ert3 -8nggVUWK+ZAeoroUgnWSDe5INQhaMs3elqD4IdsKzWogaOE8xe34nIejrm8/kHAL -y0YEzVAiFcqWK9tAU9wA/cdO9i0E8xbzN9VwurmAHqT87aIkwIiR6VBEZ3NZDlpt -lEi5iPPShi3vBHg5+BZc3pM+qPG8wwus11g+aVSTDsNVtG/GzQaBdHmzzbJyqDMN -zk6PnJlbpoNOUNIzYH8Jb6EmgfL/sgmWyMVgakMGlwXwjnQWgsPfHQfiBmdz12xs -sHwimwKrkJQGoGww3M7+/22oBpkqMHtBZv2f5RZptcciwjhfazlvwkgmGGpE2HF7 -m38i2U+JzgMMXspTI74+c3RyDMNrFt3ZL4jX5mdz2HLlCdnIwHTAQceSD2wy1fe9 -tn5Yb8cGCxF/qzu/oKqGMcVM0emAqjIP4RyTtf3w9sM +BFYnzNCrRsdN6BFF7lujlt4rk0eBMITxptFjrYh9mApIn4aSGUamfR5qHzHIWT2w +KBTlYpc/h/IhWEBVAI/XrpfxY7uYbzFAW5D9pn8nJOGpR23tI06F/lkBtmJbM6FN +c0iDzQS1EZGdDsTB42SqkWfBSMpiwBay3sQSdSjhtFP0yTLPwPL9urpAD/IRTe8c +v2XK79YjgwUHf8S3dJdzRiqaxlK+v+eHia01lRuItzHklWb14bsaFgEpyAJXYEme +e1L3xOc+x2moWwSEgnBiRzu4XkSohslSLM+CAswejW0i/YBRPveDR0YHIgqTjL7e +3s4qVo6p5Q64EDYlvO8Fi0hrz+hu0p59jpoPtrIAGjDiFJQmF1nSBLw8Q40gXy/d +jGCD1l7SKvrx4crwnzuAeMCK9RWi6LtNzXeDG2ygkMmKGWQdKM9fP0AtF1iQSFmW +Rj2JNCb7d67uitkovkwm1pcoVg0Nv3BjFTVf4dt8dxdWZcoPSf5Q2BQmKNuyScoX +Cean8TdS52c87eEklhPOchJE4461MhMYTwJozRqdTWSlFJ7GIzxDKksHY7Xs4oOZ +2CmJjSxAntY13Xm/V6x5MCl/M9yRJ5p6eejzv0nrk63MJQ+9bXCrq4gGwRYDhng3 +jWZOPSLwtPpBGCfPb8/mMmknF5QZBFMViXo1VxGlF8Y -> ssh-rsa QHr3/A -Bq/6Msux5Bn0oRUNB7DpfROmwO29uIhQIdGQn40DdJzEVQVPCscpU2CSVp6BAVOj -B2S9fLjf4eF5kywqjMZJZeBphX8jwjsRuuaWDgC/ZhS/MG/xmMYK4UBNZQ+YJjO5 -Lp1Ib1NR5ek/VBLBu6PXu2bzMFIHlCN4GGNBu/ypqV20bWhW8Ee3cvUsNapFNfDn -1M62m9fYxY6VnqJDIVBEsiuMUTWxtFgVJEQao4HbtKDbpM5SbXRbg4D3fGl4Wfoy -Zgqk1qgbK5t/wFtKtCRyti8EWnvndO3mMpF1Xs/oRaGU6b5WtbSI/dtQnJBTGSjZ -NtWScWSmaJxSyjQ12oQzH63xkk9nXNm39k1vBgwce2JtXpMdvnOB22jfNhiZ9rLn -Ujj0zZ076EinHXJZLgmyQHROK/5i+Wh77JvuP5gyizsRP/YQoHeDJ9U2Dcaiunjn -bIbCzCQqoda+PXWtFeddFvVgDHmn0mSx25ZNVArmycdj+bl/HWjJa71YEkkUcGGD -QreKVnJPnTTGnv/i5oDiA9c9v5A/FkmOPxm4aGpi+q3/Cn3tmQp2sRQ1QhnyuKjW -9B8yRxOn0t1fdlMC1XeKT6mxgNF2ucoAQhoEoIyOtJHbRf+AFZe0Xq2Cx7oGfzpy -qiaKxAABlfF/Lnc5MOVl7Lusc6z0/GUZxLk3rMQKE14 --> ssh-ed25519 uy/XKQ DMda0wHEZRf3A750AiwhPbBO6JXFLh/xOUk9h6k9GSs -8OIhtrKaGCrFtyNzTAROLAaeFGM/rGdctFfdm2j6fpQ --> nqA]-.i-grease vQ -IZRcjeYqUXB1j7rq8OaWv3hRdc5yGME+e4oVdEXDT8bWQSS0qV/7FIdjbYKd2cve -kcdpZH8MHn0T ---- eR1kvzM4onqP7nVZRkhn6DYIAqvOfEmOHZJ04TCrfGU -xlm# Im E=Sܰam$9Oj,61,^hqj`4}ZK&A \ No newline at end of file +RYlsXMb4/LEvxDc75aP5Z7MjBkiAmJy+QB6XkJ/tjEPTxH4B97WguNCrmKd1TKkv +NY5WW85mRj5xjcYNx21vXlz0y+NnTB1Jpg3PnxcfiD3F1M9E1kUKSY0Sv/bbi8KT +4JqPkkdbR55csNp76gsdRUweNPVLQCiRXyCYQbD17/KQR1e3gZ1nlHJyOzk8uwcd +6emM0XsVMjhzjwnoHy9rVvL4GYYTsRdMwRd+kDyve4punPKcEYdhnUQse7buaNJs ++tbuMhfNYVSBw5vAXreMVe7Iw6aILQ7Jp7O87eJmefDB/hOSoiXkqPnQELpUwPQO +aBVctDyRX0IoerFXx0/KMsjIO3r+rdVr4aPEqA33ouwzJhggs603023DaDtmTBkW +RZic+BtKIgdi6qQEGShp8SRMLGBWhH0911A6w0wc5k55JhmAEfxx0rcBnDuWjfMb +mPUQWnbejXWz+5UU5QTzkaULDqDXgecDq/tggsbBNF6CffoeSrHFLtfQe8Fv03nX +zwMXyxUaYJqEA+RWlmrBicq3Szin+Kryy9PHf1xpJl7kuE/eMxwK2oOeQldTxdif +H2r4TM4Qp1pAFvwH/PdDg1FzxhT7MvQRpOHOuERZaSyJbi1uxZpEhGL4xBItNiSr +pXoDEDStlcc4u2eM/5G1dHDOljWYsYrkml2ZBaq+/4I +-> ssh-ed25519 uy/XKQ 3PT1CZWG9XgErLjp/4xfQA2H7YjuVLqZemPpfk1Rfzo +Maf6azjqf4OClb3Njv++lnJ+0rB86RsXb61v1C/IYkk +-> x$=KD+-grease _ Q +xlWMjdHLXOR2Ghtic6ogLRpDZd5yunAKqrbNCJWWd5c+FxKdjlFvQnKE8iZoXEoj +xBGsGJxWwwe4LshbkMxyAuDz6N1kjz6GL+JO7/XrqMf0m3Supqmqir3483tTo2n2 +Xq9s +--- wFqmYwUiaNZW/4LSCZtVnob4z5rfXds3lCawk7Z8E48 +y[\PIA/gJĆ?7[līUI߻yj^Em7cO +x-)>y+KoS9 \ No newline at end of file diff --git a/secrets/thinkpad-wireguard-private-key.age b/secrets/thinkpad-wireguard-private-key.age index 25a1020..eca3d18 100644 Binary files a/secrets/thinkpad-wireguard-private-key.age and b/secrets/thinkpad-wireguard-private-key.age differ