From 13a3b7b2e8a183cda461cc0cd47e81fc562d253a Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 16 Jan 2025 15:20:25 -0600 Subject: [PATCH] Adapt jeremiah Remove libvirtd, because it was conflicting with vbox Some reason it's only registering 16GB of RAM now, so we will reduce its parallel limit in Gitlab CI Re-arrange the elements in the file to be in alphabetical order --- hosts/jeremiah/default.nix | 82 +++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index 8fdc661..c347095 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -21,36 +21,6 @@ efi.canTouchEfiVariables = true; }; - virtualisation.libvirtd = { - enable = true; - allowedBridges = [ "virbr0" ]; - onBoot = "ignore"; # only restart VMs labeled 'autostart' - }; - - networking = { - hostName = "jeremiah"; # Define your hostname. - useDHCP = false; - defaultGateway = { - address = " 10.42.1.2"; - interface = "enp68s0"; - }; - interfaces = { - enp68s0 = { - ipv4.addresses = [ - { - address = "10.42.1.8"; - prefixLength = 16; - } - ]; - }; - }; - nameservers = [ "10.42.1.5" ]; - }; - greg = { - home = true; - tailscale.enable = true; - remote-builder.enable = true; - }; environment.systemPackages = with pkgs; [ curl gawk @@ -72,13 +42,41 @@ }; }; + greg = { + home = true; + tailscale.enable = true; + remote-builder.enable = true; + }; + + networking = { + hostName = "jeremiah"; # Define your hostname. + useDHCP = false; + defaultGateway = { + address = " 10.42.1.2"; + interface = "enp68s0"; + }; + interfaces = { + enp68s0 = { + ipv4.addresses = [ + { + address = "10.42.1.8"; + prefixLength = 16; + } + ]; + }; + }; + nameservers = [ "10.42.1.5" ]; + }; + ##################################################################################### #################### Virtualbox Runner ############################################## ##################################################################################### + age.secrets.runner-reg.file = ../../secrets/gitlab/jeremiah-runner-reg.age; + services = { gitlab-runner = { enable = true; - settings.concurrent = 7; + settings.concurrent = 3; services = { shell = { executor = "shell"; @@ -92,14 +90,6 @@ }; }; }; - age.secrets.runner-reg.file = ../../secrets/gitlab/jeremiah-runner-reg.age; - virtualisation.virtualbox.host = { - enable = true; - enableExtensionPack = true; - enableHardening = false; - headless = true; - enableWebService = true; - }; systemd.services."gitlab-runner" = { after = [ @@ -111,16 +101,18 @@ "network-online.target" "tailscaled.service" ]; - preStart = builtins.concatStringsSep "\n" [ - "${pkgs.kmod}/bin/modprobe vboxdrv" - "${pkgs.kmod}/bin/modprobe vboxnetadp" - "${pkgs.kmod}/bin/modprobe vboxnetflt" - ]; - postStop = "${pkgs.kmod}/bin/rmmod vboxnetadp vboxnetflt vboxdrv"; serviceConfig = { DevicePolicy = lib.mkForce "auto"; User = "root"; DynamicUser = lib.mkForce false; }; }; + + virtualisation.virtualbox.host = { + enable = true; + enableExtensionPack = true; + enableHardening = false; + headless = true; + enableWebService = true; + }; }