diff --git a/.helix/config.toml b/.helix/config.toml new file mode 100644 index 0000000..082416b --- /dev/null +++ b/.helix/config.toml @@ -0,0 +1 @@ +editor.insert-final-newline = false diff --git a/hosts/default.nix b/hosts/default.nix index 9798296..364ba05 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -26,8 +26,8 @@ }; systems = { - lungmen = "x86_64-linux"; - tkaronto = "x86_64-linux"; + # lungmen = "x86_64-linux"; + # tkaronto = "x86_64-linux"; wolumonde = "x86_64-linux"; wsl = "x86_64-linux"; }; diff --git a/hosts/tkaronto/modules/nixbuild.nix b/hosts/tkaronto/modules/nixbuild.nix deleted file mode 120000 index 2df9fa9..0000000 --- a/hosts/tkaronto/modules/nixbuild.nix +++ /dev/null @@ -1 +0,0 @@ -../../../modules/develop/nixbuild/default.nix \ No newline at end of file diff --git a/hosts/tkaronto/modules/secrets.nix b/hosts/tkaronto/modules/secrets.nix index bf62cd6..24b7c63 100644 --- a/hosts/tkaronto/modules/secrets.nix +++ b/hosts/tkaronto/modules/secrets.nix @@ -9,10 +9,10 @@ group = "systemd-network"; }; - age.secrets.nixBuildKey = { - file = ../../../secrets/nixBuildKey.age; - owner = "root"; - group = "nix-build-key-access"; - }; - users.groups."nix-build-key-access" = {}; + # age.secrets.nixBuildKey = { + # file = ../../../secrets/nixBuildKey.age; + # owner = "root"; + # group = "nix-build-key-access"; + # }; + # users.groups."nix-build-key-access" = {}; } diff --git a/hosts/wolumonde/default.nix b/hosts/wolumonde/default.nix index c4c059e..5ebeafd 100644 --- a/hosts/wolumonde/default.nix +++ b/hosts/wolumonde/default.nix @@ -23,7 +23,7 @@ allowedUDPPortRanges = []; }; - # virtualisation.docker.enable = true; + virtualisation.docker.enable = true; system.stateVersion = "22.05"; } diff --git a/hosts/wolumonde/modules/forgejo-runner.nix b/hosts/wolumonde/modules/forgejo-runner.nix new file mode 100644 index 0000000..0dc3300 --- /dev/null +++ b/hosts/wolumonde/modules/forgejo-runner.nix @@ -0,0 +1,11 @@ +{pkgs, config, ...}: { + services.gitea-actions-runner.package = pkgs.forgejo-runner; + services.gitea-actions-runner.instances."thermex" = { + enable = true; + url = config.services.forgejo.settings.server.ROOT_URL; + name = "thermex"; + tokenFile = config.age.secrets.forgejoActRunnerToken.path; + labels = ["docker:docker://yusdacra/lixpine:latest"]; + settings.container.privileged = true; + }; +} diff --git a/hosts/wolumonde/modules/secrets.nix b/hosts/wolumonde/modules/secrets.nix index 25f43b8..e9995ec 100644 --- a/hosts/wolumonde/modules/secrets.nix +++ b/hosts/wolumonde/modules/secrets.nix @@ -10,6 +10,7 @@ # age.secrets.tmodloaderServerPass.file = ../../../secrets/tmodloaderServerPass.age; age.secrets.websiteConfig.file = ../../../secrets/websiteConfig.age; # age.secrets.giteaActRunnerToken.file = ../../../secrets/giteaActRunnerToken.age; + age.secrets.forgejoActRunnerToken.file = ../../../secrets/forgejoActRunnerToken.age; # age.secrets.xrayConfig = { # name = "xrayConfig.json"; # file = ../../../secrets/xrayConfig.age; diff --git a/secrets/forgejoActRunnerToken.age b/secrets/forgejoActRunnerToken.age new file mode 100644 index 0000000..25acaf7 --- /dev/null +++ b/secrets/forgejoActRunnerToken.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-rsa Abmvag +OmNZB1HxonlxQcPAmmJtUW5aZULDXFJBiBcswviAqTqZESzGCzZSe/dGEEsh9QOF +ZZpC699LqLqNMJUJFCRuy+eiXgi98J4MVMlMFPBScGF3huhuNlZ7EvryB+MAibqa +SouBuR0JXJ4dWhB5SJkA/Z5uFxwABCqvRzBZrjL5ldJoVXeTVl+e+8W/dR7VB/u1 +nzdlDaVxziH6aO/al0qeaNIQXCtUmmy+IKVZ8dnwwEDZwcgNp0p227K62R0UqI95 +Qsp/w+xTJyIu1XC2CaRvKA304PHbzUAqhAvexgvMXFi0A6cM4VoTk9Hrk1TH38VK +tF8LU6jh873g9JpxCXwIJlATuiXMWO8u6EWEDPs7uJm+3Pvzja1qqUrBk7kwgZy6 +iLOJndyL0i52/PK6Rlt0mqsUNSzXvNuvtViKbvXsTCXPOG8vQCXj6hqNtXfFzipX +laNlH8tyLhjMaQZzlU1SS0F+J3LSpF7gDpQywr6m5HNL7iaEL+zUEinn2lpDQCD6 +OWh1kTcPj8RprnH701P7vcS+21e5S0zxGXPGoYF/Xhj/BYGPz44I1d6hTYWuqSB2 +n/Xw21GFykIVPSWT32Yt/zVlaQagMUHDvMDUTK7yZmxT9BYO6a783KdE2G2hPy6V +Uup5AKvbTpWtDtZ8D5u37/YO1li4Cquigw6QV7AUz5k +-> ssh-ed25519 KjIL7g 1Ctb1OJio8Uues4VZyrgvo3G4Av4TRQ8EepnoIWaJ2M +AZJRr+JmLcJ9lvhnSpw6LOCtWbi/0nQe6mL7ugRsNUg +--- Ruv76wNOAJ0qhpvcoNa06V0Eml/a+FeyPXCCTXhAdrI +��]KE���Ԫ��W�,��[_��5'J����2��j��h^��so ��W��7�@���M�g�X��%����� \ No newline at end of file diff --git a/secrets/giteaActRunnerToken.age b/secrets/giteaActRunnerToken.age deleted file mode 100644 index 14af133..0000000 --- a/secrets/giteaActRunnerToken.age +++ /dev/null @@ -1,18 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa Abmvag -QRbeL4d60GYob6F2OKpZEJUFzHTuxZorUsPvgNdIBqBKDGEQcTXEc064QCeIbvzC -Gy8UW8GXng+VFlxRnFDhTpIjOw9j0/azbTN8YzCtWpYmzNVLtGEcsnt3TJQYT45Y -voIjm/PXcObH8Qj+dCcyeRkUij0HHsJmxFWgYSoKwR9PpeN9uDWWmJ3LZeFZs2ju -RJmtOTasvQ5AwTwEIUTH1yR6iT81qLAUPDVTbMKz6QhRfLz/Vd3Db0DHcj6Q9UD/ -ompDcyOLflHrdvVAomz0++nJjHFP228hnmpDKS7heo8dwOwm1FSoS+qYCB/r+mFZ -MvYlj6+gbVJ6WjUt6MRdOeqB5aO+WDHCKfv0Ld34LQrDdVxoR6x6yO23AfquEH8c -OLeat2omAhU/Hk76+EfgJYUT60MKgsNeQyufAfUd+KbonGURL4IbYGkj26a+Fiby -8a2Ya5VrHUloyjL/fbF46vFJuHmV7wbc7de8yH/NSj9VMs7G+OXR/VtQREDImeq8 -MEzdQyWrLnlQMe4ONNYmnqjANAn40IMTTRO97vGyILVyDGPTO8gPixCFe9H08t6x -XMm13Kh3LsDr3+UJ1gi8AWNdB7IXEpsReHOO+SHDN5bxn4kq6C1O5wl8AhE3e5+a -0AmVpjByWykEbgVDisT96xgSW9d35BJGPfKR5HkT6Ck --> ssh-ed25519 KjIL7g qb2Rb0oSREc426K0+Z9oL+TXxIUB+n8+cdWri+HyHyY -i6oIGtvXTbA6Hotg8jdG2BeNcuQrkiIfJYgOK8WqEyg ---- 0/5wQye+3Z1EeHOLFduhhh9V0GBKBrIzIvHLNvJPg4w -?=@��.@�Ļ�v�g��;�QF�} Mڟ��D I��ߧ�&�(T -�Hes�����Ø��1Ijо4tX�i�������� \ No newline at end of file diff --git a/secrets/nixBuildKey.age b/secrets/nixBuildKey.age deleted file mode 100644 index 7d4fde5c2a0de5069d65229bf6b5140c5b1bde1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1315 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!*`Do#{zOv)`wOy>&rige4>P7XA7 z4c7NePl?jkE{P1vNiHb!D)3A<4mLD0v@82@fv!4RQ3m6(+?;yh;+*HGB+xBEY{8` zHOo)+Gb~9hDRnYS^74-I3^S}M^9hOyH!^lI;))0jbjxrmH}Z4NOG*qfHc1clE=rFm zO)qxyN=>gU^r$Q@NUbul^bJTX_KZk(O*JtH%F*{T2n{Ls$;o%jw&bcXa7m5|Ne_ys z2=}+h$_WoQDl>~rDKRfI&rA0(2=z$!iZoA&Do=DZEUWa5^fS$K^hokIbIkEJbj^0ahuu{3saHw#JeNX;)c2@Q-0aWQwy3-Iv^NKUi# zb$3d4^!0MA@(zyh4$gMs%F0P9DyWRg)AuPh@O2I-^fj?`@$gMf&9n3{j0|!Mtu)Rp zaPkPSEGqJH^r;B*Hpnpa4ogbUEcM7tbMx^?=L*lVhzd+|FDS_IFwXVxO3n(%G4?3R zb94$VPBh97FEh6APb@BR_Ak%O(RM0LNp#A#EGfzj^C&V;$#*LW$ma4X4=qdd_YchU z^0kNzF^}|5tFp+m2y)6x^-at1Nb+=d4D`EH?@=F)(*^_Dr?(%FfLRFby(F zElsOP_0moTrDID|-Snc=#Nt$i{HQpEVx#0l1w}5)kdQLRs#3>Xv+%0?l3?dF4==yG zsC?JF%8cM7XKnqmT)zMdQ|-!}z^alwC-a+?e#z z$8_z*&62`?AErFf$bXY7E+BSVMehjHD;}nmC$9aPc$nw&$~Uzs8>QO0h4dEenRW8@ z#iI-k{P{KCou{0CxoiEMf2#g@Pt@mZTW9+~Yst^0W@$CY7M(C`5K3=+A#iwwZRsly zhD#>jzXW{}zIgIy&!rUcgxq&g|7QQ@)7=$ybG|n7-sH;!4G5KQ{ z=l-nx=l8FS_Lno3&AfW`UscTm27`y^o@+NBQ9tqi?u#jt7r#sX?yK7Q$1M5e)(=-N zY-Y{shzS+fH($NfN6a!gN@wSVY+7)vZfd73r2g?0?k~TUv8VU&xvniIbys@c=zOa7vNm1s t_(RW)a|E?Et(8wV)$;ECxRh0#=krO6S!s43T&9-a`H`DDqyL1_0{}BT{4W3i diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 7af5aa9..80aa9f4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,10 +7,8 @@ in { "bernbotToken.age".publicKeys = [yusdacra wolumonde]; "musikquadConfig.age".publicKeys = [yusdacra wolumonde]; "nixGithubAccessToken.age".publicKeys = [yusdacra]; - "nixBuildKey.age".publicKeys = [yusdacra]; - "tmodloaderServerPass.age".publicKeys = [yusdacra wolumonde]; "websiteConfig.age".publicKeys = [yusdacra wolumonde]; - "giteaActRunnerToken.age".publicKeys = [yusdacra wolumonde]; + "forgejoActRunnerToken.age".publicKeys = [yusdacra wolumonde]; "xrayConfig.age".publicKeys = [yusdacra wolumonde]; "pdsConfig.age".publicKeys = [yusdacra wolumonde]; } diff --git a/secrets/tmodloaderServerPass.age b/secrets/tmodloaderServerPass.age deleted file mode 100644 index b035887..0000000 --- a/secrets/tmodloaderServerPass.age +++ /dev/null @@ -1,19 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa Abmvag -0F4C6sVSL7x9LUPXO1REpj8tnlnEbQWUaebc79Tc0nj8YJ4c4mrR3IVYq8UiObUV -xUMDjO0+XgHd4udJjmThD2UtBVYApmhYEc9Zv7199CHZARrXIgaFfNQvCnNC1E02 -FKUGSh42eQuXcQIGpmj5fU9HVoAfp6VKHvp1CFYRn3J03u9yB589ROIH4ySdWSQP -cetenbKXKaZCYO8ipERumxyb76sninZjWc6BGj8HNF2ePEtXVcFOc5C/DrYX8xrs -0wzCtzj2bUZhtYFT5OAiaDBOi1dbC+eyER1uK6qC4ZFNMAuhVLeU6774QxQ5dL7G -g3FTNkyZdS9KZWl+4yntX0yFfXQbRGJErSRWW2g4w43EPniIgrMcqK5N1X+pycBD -gt1qofz07YGwXUPJfurWkuFpHcsO2/0SXsOSpuxYyzuu/tIdmjGMmiEilQUtQC++ -yXdIXQzIyB9jWTwoXUMPMfsLtjwcok8l/dH+/9VWjgQZ+4wycHPDemhawnI33CDg -04zAJEimqoavHY2BD9K88qJSJViKBfSvMPSittblBlMNjvOQ0uedGwB98axXe9mh -LXa4rHnF48uL10HI0byYivamJNyfFug5G9WpH2fSjn1n90o1lp8ZPWKDVR/kj6+9 -01zzFthLXqBQ6s5AyVtOP9yLWU06d2lhhBr+g5+J5WU --> ssh-ed25519 KjIL7g sFHELT2wiMJBp/8HrwSbJPMWthkbpU72Kizvkikc60A -l6kk0fyz1mX8E5y37srUgW3zaZVtKdXyBoD55EgQaaY --> N/}--grease Y -iItOxVW8A6Mv+7+7bPiMfkxX80VizsYC ---- hfAvTCpVuTOQnTkLljMOpbH9g6gYN+V9FruGBG99YdM -��35�W��@����lg���GƏ����T-N���[{��qE�!L"��/�~ \ No newline at end of file