diff --git a/flake.nix b/flake.nix index 3d598b6..2c6269c 100644 --- a/flake.nix +++ b/flake.nix @@ -91,14 +91,17 @@ inherit system specialArgs; modules = [ ./hosts/monolith.nix - ./system/gitlab-runner.nix + ./system/monolith-gitlab-runner.nix # ./system/nix-serve.nix ./system/amdgpu-kernel-patches.nix ] ++ common_modules; }; rainbow = lib.nixosSystem { inherit system specialArgs; - modules = [ ./hosts/rainbow.nix ] ++ common_modules; + modules = [ + ./hosts/rainbow.nix + ./system/rainbow-gitlab-runner.nix + ] ++ common_modules; }; pixie = lib.nixosSystem { inherit system specialArgs; diff --git a/hosts/rainbow.nix b/hosts/rainbow.nix index be458c0..c056ec9 100644 --- a/hosts/rainbow.nix +++ b/hosts/rainbow.nix @@ -10,7 +10,7 @@ in { boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; diff --git a/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age b/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age new file mode 100644 index 0000000..a1015ad Binary files /dev/null and b/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 7febb1b..32b16c7 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,6 +1,7 @@ let main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"; in { + "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; "lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ]; } diff --git a/system/gitlab-runner.nix b/system/monolith-gitlab-runner.nix similarity index 100% rename from system/gitlab-runner.nix rename to system/monolith-gitlab-runner.nix diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix new file mode 100644 index 0000000..f3de7bd --- /dev/null +++ b/system/rainbow-gitlab-runner.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: { + boot.kernel.sysctl."net.ipv4.ip_forward" = true; + virtualisation.docker.enable = true; + services.gitlab-runner = { + enable = true; + settings.concurrent = 1; + services = { + # ci_test = { + # registrationConfigFile = "/srv/gitlab-runner/env/ci_test"; + # dockerImage = "debian"; + # dockerPrivileged = true; + # }; + thoreb_builder = { + registrationConfigFile = config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; + dockerImage = "debian"; + dockerPrivileged = true; + }; + }; + }; + systemd.services.gitlab-runner.serviceConfig.Nice = 10; +} diff --git a/system/secrets.nix b/system/secrets.nix index f984710..4725e85 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -4,5 +4,7 @@ secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age; secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; + secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = + ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; }; }