From 702d522ee2b82b2a3d0d964fcf6431511dc87aa8 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 3 Jan 2024 12:35:30 -0600 Subject: [PATCH] Lots of jude updates --- flake.lock | 6 +++--- home/gui/default.nix | 2 +- home/home.nix | 1 - home/xonsh.nix | 2 +- hosts/jude/virt.nix | 15 ++++----------- modules/ci-runner.nix | 22 ++++++++++++++++++++-- secrets/jude-forgejo-runner.age | Bin 1125 -> 1182 bytes 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index aaccb3f..1d2f91d 100644 --- a/flake.lock +++ b/flake.lock @@ -406,11 +406,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { diff --git a/home/gui/default.nix b/home/gui/default.nix index 227de86..e81d251 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -28,7 +28,7 @@ in gnucash jellyfin-media-player libreoffice - logseq + #logseq nextcloud-client ]) ++ diff --git a/home/home.nix b/home/home.nix index 2bb02f5..3052a2d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -51,7 +51,6 @@ openssl setup-ssh tmux - transcrypt tree unzip wget diff --git a/home/xonsh.nix b/home/xonsh.nix index 12a92fa..3b948df 100644 --- a/home/xonsh.nix +++ b/home/xonsh.nix @@ -28,7 +28,7 @@ GOPATH = "${config.home.homeDirectory}/src/go"; GOBIN = "${config.home.homeDirectory}/src/bin"; - EFI_DIR = "${pkgs.OVMF}/FV/"; + EFI_DIR = "${pkgs.OVMF.fd}/FV/"; }; aliases = { diff --git a/hosts/jude/virt.nix b/hosts/jude/virt.nix index 1f456bb..29adf6b 100644 --- a/hosts/jude/virt.nix +++ b/hosts/jude/virt.nix @@ -5,6 +5,7 @@ dmidecode guestfs-tools libguestfs + OVMFFull ovftool packer virt-manager @@ -19,6 +20,7 @@ libvirtd = { enable = true; onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart + qemu.ovmf.enable = true; }; virtualbox.host = { @@ -26,6 +28,8 @@ enableExtensionPack = true; }; + vmware.host.enable = true; + waydroid.enable = false; lxd.enable = false; }; @@ -33,15 +37,4 @@ users.extraGroups.vboxusers.members = [ "greg" ]; boot.extraModprobeConfig = "options kvm_amd nested=1"; - - greg.ci-runner = { - qemu = { - labels = [ - "qemu:host" - ]; - packages = with pkgs; [ - qemu - ]; - }; - }; } diff --git a/modules/ci-runner.nix b/modules/ci-runner.nix index d067986..60921af 100644 --- a/modules/ci-runner.nix +++ b/modules/ci-runner.nix @@ -7,15 +7,32 @@ let enable = true; hostPackages = with pkgs; [ bashInteractive - podman + coreutils + curl + gawk git + gnused nodejs + nodejs_20 + podman + pup + gregpy + shellcheck + wget ] ++ value.packages; labels = lib.mkIf ( builtins.hasAttr "labels" value) value.labels; name = config.networking.hostName; tokenFile = config.age.secrets.forgejo-runner.path; url = "https://src.thehellings.com"; - settings.runner.capacity = value.parallel; + settings = { + runner.capacity = value.parallel; + container.network = "host"; + cache.enabled = true; + host = { + workdir_parent = "/var/lib/private/gitea-runner/${name}"; + }; + lxc.enabled = false; + }; }; userName = "gitea-runner"; @@ -65,6 +82,7 @@ in with lib; { config = mkIf ( runnerNames != [] ) { services.gitea-actions-runner.instances = ( mapAttrs makeRunner cfg); + #services.gitea-actions-runner.package = pkgs.forgejo-actions-runner; age.secrets.forgejo-runner = let aName = builtins.elemAt runnerNames 0; diff --git a/secrets/jude-forgejo-runner.age b/secrets/jude-forgejo-runner.age index 07f9332ad799d6024e01b3dbd316f30201a8585d..2cba722efc158e71a69cb6a60d5febcb31441534 100644 GIT binary patch literal 1182 zcmZA0I}76k0KoA{PBJ(gh%Q1<6e0GK=GBD5gEVcErb+Woo1Dny-89eU)g&N-A3){6 z^_)bw#aV6?9K_Yl#mT`zP6q`A6~}&pAN=9(#^Ee1{Ccd~q%7{0bqx1&VD-Vx*Y1U6XKY9EgE; zCnB=2G`9T`rlXT%tO3V3m^&Wb`9e&iE0Zade6fK_LB_m^iRgqrFy&73MEAPA)m$58 zjtn@R@h-O}YQD5gBTJgtrVTT3chaSVB=d4UE|Dm_5JaUmK*~|RWuFdEpjI8NcZ!NK zE!jEE0zX1gmrS}O`ixB;2kBPZXD~4`AWmrOoHEKS0Uwd+a)D8kQ`s)X$pgRH zDqiTPOD$p;N6)IOKG?OxF?5wv?tD=sb{S(OU|NA-56H0;Z3Knu>#|)sEsSyf+>P;q zZ)JtMu=r+AQq-;1$~?@g;5JJmbATX%v(2WDyR|S7GK9iKDDs^>&8thBn$ut+ECu*| zXwyh|T4mFyxdOIiiFtnxO|GSNtL#NKBmADL@oVYdYMW~6BNZG*`$#T~ZNG-G-gOok z>CmY%iT*&Omj$eLLZ4z`)Yn!6T=qSQl2kqnI?+c+)wWj)!yHxj=wxKV6~%eU#Of5x z#1tZK*8=8${;mwdy1?|i~1bQag4+l1hB?|tO055Nh)y?(l? zydZK4Ve$fI74xwWXm!O%c4zB`#?{vowJ6V8+?!}%99SN870Ym@DXWG30oVyGwc?zh zYJzyVjD|9FNexpuL=V{GH40p#3Y3f{imnmpV{$dcqv>?Gy*E{0Hk*OGm@_L?M1=7y z^DTr*>L$tN*xpMWDUzoJ^WSJAN1^2I3cU96TjoDcKe_YZyDySw-~agg;qi-KzghqG zQu5)GcOE*=zxwH6_2koEAHDv~ANI$;+Su4?{rRsKp6(uz;#^Qlhw6H4y|1+MM`V#qZaHk>vRM8wCUX3G7{Rr`F=x4+FgXKu;D~#44A`(Gt@~9 z?9jT2K#2xeWeRcxjba{$x)(WZPA4N*qNkFg!ZnA={&qPj!tGHD1B^YepkcUV0b8D2 z_I$=4GPiQ9uJQ*pu!dS>Z)fK?Yb;TjcN2iRY+b}XYMl0s&I+?~94fUOc5^G0XqB}L zntD9lFFZ~>YI+HicNSz($rnkQ^GPJ4C@d^Xw?9DLy&rXavj{N86fRnG!X9A&c2jtv z6=da1Dq}@sLPJVvy+3yt(R%6{Nz=f~z4U~q=SNM7)iZB`7+H`5W_B!bsKxd=ZxcQ* zM+?#}1!JokhSx_b7STf|4M3`}Jmcn<9L75QmMjh}(C4c+8#!Z&Q_^-j$KhyYRPEb0m(ZLZCAL0HwwbAPKaQIuJ(Vwd*%>U!*>R>a1%m>_pg z3RT1;cCuzvXLbWW_gAImE=yt*%5+&*UWjI15?LaUHRHq*Tf5R5ic4uj^sI}IEhkvd z1h^O4D`HGid5UGb_+PVD=ROIC1aM3zMk7JM6F)9fnGE6*mG#8)f(tQV&~DrZKAjtw z&Rqoia)$^XM&;BraNOG*x0?y5t$mUBt{XPw%`Z1tVFIhw3S10g$?s7(kqRklaSiEL zv=B5b%W}T5^<|^Y{yq#iXe5AdUO#>Pf-1Mq{&vgHo`0Cu@4T#sFF%ItH-CQn>h+WI zL;bw_bvcH``o?#3^y>59m@hsxk6(T8$Gd^{;*;R*N5B8_?7O#rz4znK|NINK C9d20w