diff --git a/hosts/hosea/default.nix b/hosts/hosea/default.nix index 1ed4a13..9a37af7 100644 --- a/hosts/hosea/default.nix +++ b/hosts/hosea/default.nix @@ -57,74 +57,5 @@ in layout = "us"; variant = ""; }; - gitlab-runner = { - enable = true; - settings.concurrent = 1; - services = { - shell = { - executor = "shell"; - limit = 5; - registrationConfigFile = config.age.secrets.runner-reg.path; - environmentVariables = { - EFI_DIR = "${pkgs.OVMF.fd}/FV/"; - STORAGE_URL = "http://minio-01.thehellings.lan:9000"; - }; - }; - }; - }; }; - - ##################################################################################### - #################### Virtualbox Runner ############################################## - ##################################################################################### - age.secrets.runner-reg.file = ../../secrets/gitlab/myself-vbox-runner-reg.age; - virtualisation.virtualbox.host = { - enable = true; - enableExtensionPack = true; - enableHardening = false; - headless = true; - }; - - systemd.services."gitlab-runner" = { - after = [ - "network.target" - "network-online.target" - "systemd-resolved.service" - ]; - # Moved here from myself/Isaiah, so technically unnecessary now - conflicts = [ - "container@gitlab-runner-qemu.service" - ]; - wants = [ - "network-online.target" - "systemd-resolved.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; - }; - }; - environment.systemPackages = with pkgs; [ - curl - gawk - git - p7zip - packer - pup - gregpy - shellcheck - unzip - xorriso - vagrant - wget - ]; - - networking.firewall.allowedTCPPorts = [ 18083 ]; # Should be interface for vboxweb } diff --git a/hosts/hosea/minio.nix b/hosts/hosea/minio.nix index 65a042a..12f3c99 100644 --- a/hosts/hosea/minio.nix +++ b/hosts/hosea/minio.nix @@ -10,6 +10,7 @@ in { }; networking.firewall.allowedTCPPorts = [ + 80 minioPort minioConsolePort ]; @@ -23,6 +24,8 @@ in { browser = true; }; + greg.proxies."s3.thehellings.lan".target = "http://127.0.0.1:${toString minioPort}"; + environment.systemPackages = with pkgs; [ minio-client ]; diff --git a/modules/baseline.nix b/modules/baseline.nix index c1455c8..449602e 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -18,7 +18,7 @@ in keep-derivations = true; min-free = (toString (1024 * 1024 * 1024) ); max-free = (toString (5 * 1024 * 1024 * 1024) ); - substituters = (if notDarwin then [ "http://nixcache.home" ] else []) ++ [ + substituters = [ "https://cache.garnix.io" "https://ai.cachix.org" ];