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 07f9332..2cba722 100644 Binary files a/secrets/jude-forgejo-runner.age and b/secrets/jude-forgejo-runner.age differ