fix: remove builder2

fix: restore immich access
chore: default actions packages
2026-08-06 22:53:34 -05:00 · 2026-08-06 21:43:28 -05:00 · 2026-08-06 20:36:41 -05:00 · 2026-08-05 22:57:58 -05:00 · 2026-08-05 20:07:35 -05:00
17 changed files with 89 additions and 128 deletions
@@ -101,7 +101,7 @@
                {
                  deployment = {
                    inherit (v) tags;
-                    targetHost = if (v ? "nebulaIp") then v.nebulaIp else v.ts;
+                    targetHost = if (v ? "connectAddr") then v.connectAddr else v.nebulaIp;
                    targetUser = "greg";
                  };
                }
@@ -1,60 +0,0 @@
-{
-  config,
-  metadata,
-  modulesPath,
-  ...
-}:
-{
-  # Then build nixosConfiguration.<host>.config.system.build.images.proxmox
-  # SCP that to /var/lib/vz/dumps on the Proxmox host
-  imports = [ "${modulesPath}/virtualisation/proxmox-image.nix" ];
-  greg = {
-    home = true;
-    nebula.enable = true;
-  };
-  networking = {
-    defaultGateway = metadata.infra.gw;
-    nameservers = [ metadata.infra.dns ];
-    interfaces.ens18 = {
-      useDHCP = false;
-      ipv4.addresses = [
-        {
-          address = metadata.hosts."${config.networking.hostName}".ip;
-          prefixLength = 16;
-        }
-      ];
-    };
-  };
-  virtualisation.diskSize = 20480; # Size in mebbibytes for the base disk image
-  # Use these instead of the above to run an LXC image
-  # The main reason I wouldn't use these is because Proxmox LXC does
-  # not seem to be well supported by either Nebula VPN or Tailscale,
-  # both of which I use for my mesh networking. If there isn't a need
-  # for the service to run on those networks, then by all means go ahead
-  # and use LXC!
-  # imports = [ (modulesPath + "/virtualisation/proxmox-lxc.nix") ];
-  # proxmoxLXC = {
-  #   manageNetwork = false;
-  #   privileged = true;
-  # };
-  # systemd.suppressedSystemUnits = [
-  #   "dev-mqueue.mount"
-  #   "sys-kernel-debug.mount"
-  #   "sys-fs-fuse-connections.mount"
-  # ];
-  nix.settings = {
-    sandbox = false;
-  };
-  services = {
-    fstrim.enable = false; # Let Proxmox host handle fstrim
-    openssh = {
-      enable = true;
-      openFirewall = true;
-      settings = {
-        PermitRootLogin = "yes";
-        PasswordAuthentication = true;
-        PermitEmptyPasswords = "yes";
-      };
-    };
-  };
-}
@@ -77,7 +77,7 @@ in
      };
    };
    firewall = {
-      enable = false;
+      enable = true;
      allowedUDPPorts = [
        dhcpPort
        dnsPort
@@ -88,7 +88,7 @@ in
        80
      ];
    };
-    nftables.enable = false;
+    nftables.enable = true;
  };

  environment.etc."hosts.d/local".text = extraHosts;
@@ -47,6 +47,10 @@
      enable = true;
      extraLabels = [ "bare-metal:host" ];
    };
+    vmdev = {
+      enable = true;
+      host = "libvirt";
+    };
  };

  networking = {
@@ -1,8 +1,9 @@
 {
+  config,
+  lib,
+  metadata,
  pkgs,
  pkgs',
-  lib,
-  config,
  ...
 }:

@@ -60,9 +61,10 @@ in
    };
    gitea-runner = {
      enable = true;
-      extraLabels = [
+      labels = [
        "vps:host"
        "blog:host"
+        "nixos-linode:host"
      ];
    };
    home = false;
@@ -70,6 +72,12 @@ in
    nebula = {
      enable = true;
      isLighthouse = true;
+      unsafeRoutes = [
+        {
+          route = "10.42.0.0/16";
+          via = metadata.hosts.genesis.nebulaIp;
+        }
+      ];
    };
    tailscale.enable = true;
  };
@@ -126,7 +134,7 @@ in
            COOKIE_DOMAIN = "thehellings.com";
            SERVE_ROBOTS_TXT = true;
            SLOG_LEVEL = "DEBUG";
-            TARGET = "http://git.k3s.nebula.thehellings.com";
+            TARGET = "http://git.k3s.thehellings.lan";
          };
        };
      };
@@ -149,9 +157,9 @@ in
          bind *:${toString sshPort}
          timeout client 1h
          mode tcp
-          server git-isaiah isaiah.nebula.thehellings.com:32222
-          server git-jeremiah jeremiah.nebula.thehellings.com:32222
-          server git-zeke zeke.nebula.thehellings.com:32222
+          server git-isaiah isaiah.thehellings.lan:32222
+          server git-jeremiah jeremiah.thehellings.lan:32222
+          server git-zeke zeke.thehellings.lan:32222

        frontend https
          bind *:80
@@ -175,6 +183,8 @@ in
          use_backend next if { req_ssl_sni -i next.thehellings.com }
          use_backend matrix if { hdr(host) -i matrix.thehellings.com }
          use_backend matrix if { req_ssl_sni -i matrix.thehellings.com }
+          use_backend immich if { hdr(host) -i immich.thehellings.com }
+          use_backend immich if { req_ssl_sni -i immich.thehellings.com }
          use_backend web if { hdr(host) -i thehellings.com }
          use_backend web if { req_ssl_sni -i thehellings.com }

@@ -184,10 +194,18 @@ in
          option accept-unsafe-violations-in-http-response
          retries 3
          option forwardfor
-          http-request set-header Host git.k3s.nebula.thehellings.com
-          server git-isaiah isaiah.nebula.thehellings.com:80
-          server git-jeremiah jeremiah.nebula.thehellings.com:80
-          server git-zeke zeke.nebula.thehellings.com:80
+          http-request set-header Host git.k3s.thehellings.lan
+          server git-isaiah isaiah.thehellings.lan:80
+          server git-jeremiah jeremiah.thehellings.lan:80
+          server git-zeke zeke.thehellings.lan:80
+
+        backend immich
+          mode http
+          balance roundrobin
+          option accept-unsafe-violations-in-http-response
+          retries 3
+          option forwardfor
+          server immich-proxy 127.0.0.1:${builtins.toString config.services.immich-public-proxy.port}

        backend matrix
          mode http
@@ -195,10 +213,10 @@ in
          option accept-unsafe-violations-in-http-response
          retries 3
          option forwardfor
-          http-request set-header Host matrix.k3s.nebula.thehellings.com
-          server git-isaiah isaiah.nebula.thehellings.com:80
-          server git-jeremiah jeremiah.nebula.thehellings.com:80
-          server git-zeke zeke.nebula.thehellings.com:80
+          http-request set-header Host matrix.k3s.thehellings.lan
+          server git-isaiah isaiah.thehellings.lan:80
+          server git-jeremiah jeremiah.thehellings.lan:80
+          server git-zeke zeke.thehellings.lan:80

        backend web
          mode http
@@ -222,7 +240,7 @@ in

    immich-public-proxy = {
      enable = true;
-      immichUrl = "https://immich.shire-zebra.ts.net";
+      immichUrl = "http://immich.k3s.thehellings.lan";
    };

    logrotate = {
@@ -32,6 +32,10 @@
      enable = true;
      tags = [ "home" ];
    };
+    vmdev = {
+      enable = true;
+      host = "vbox";
+    };
  };

  hardware = {
@@ -71,10 +75,4 @@
  users.users.greg.extraGroups = [
    "podman"
  ];
-
-  # virtualisation.virtualbox.host = {
-  #   enableExtensionPack = true;
-  #   headless = true;
-  #   enableWebService = true;
-  # };
 }
@@ -93,7 +93,7 @@ spec:
          MINIO_USE_SSL: "false"
          MINIO_INSECURE_SKIP_VERIFY: "true"
        security:
-          ALLOWED_HOST_LIST: loopback,private,*.shire-zebra.ts.net,*.nebula.thehellings.com
+          ALLOWED_HOST_LIST: loopback,private,*.shire-zebra.ts.net,*.nebula.thehellings.com,*.thehellings.lan

      metrics:
        enabled: false
@@ -19,7 +19,7 @@ metadata:
  name: gitea-direct
 spec:
  rules:
-    - host: git.k3s.nebula.thehellings.com
+    - host: git.k3s.thehellings.lan
      http:
        paths:
          - path: /
@@ -24,6 +24,8 @@ spec:
                  name: http
    - <<: *host
      host: immich.k3s.nebula.thehellings.com
+    - <<: *host
+      host: immich.k3s.thehellings.lan
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -20,7 +20,7 @@ metadata:
  name: matrix-direct
 spec:
  rules:
-    - host: matrix.k3s.nebula.thehellings.com
+    - host: matrix.k3s.thehellings.lan
      http:
        paths:
          - path: /
@@ -98,6 +98,19 @@ in
        inherit labels;
        inherit (cfg) name;
        enable = true;
+        hostPackages = with pkgs; [
+          bash
+          buildah
+          coreutils
+          curl
+          gawk
+          gitMinimal
+          gnused
+          nix
+          nodejs
+          podman
+          wget
+        ];
        url = cfg.instanceURL;
        tokenFile = config.age.secrets."gitea-runner-${host}-podman".path;
        settings = {
@@ -15,8 +15,6 @@ let
    sha256 = "sha256-Qs1qJmgZm8q9xZsORjT/N/wzpbWVVODXtzDpjnAYMuQ=";
  };
  keepaliveIp = "10.42.5.1";
-  nebulaName = "k3s.nebula.thehellings.com";
-  nebulaIp = "10.157.100.1";
 in
 {
  options.greg = {
@@ -46,13 +44,6 @@ in
  };

  config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = config.greg.nebula.enable;
-        message = "Configure Nebula for this host, first";
-      }
-    ];
-
    age.secrets = {
      bw_secret.file = ../../secrets/kubernetes/bw_secret.age;
      dendrite_key.file = ../../secrets/dendrite_key.age;
@@ -106,8 +97,6 @@ in
          "--tls-san ${config.networking.hostName}.thehellings.lan"
          "--tls-san ${config.networking.hostName}.shire-zebra.ts.net"
          "--tls-san ${keepaliveIp}"
-          "--tls-san ${nebulaName}"
-          "--tls-san ${nebulaIp}"
        ];
        manifests = {
          cert-manager.source = cert-manager;
@@ -139,21 +128,6 @@ in
              advert_int 1
            '';
          };
-          k3s-nebula = {
-            interface = "nebula0";
-            priority = 1;
-            state = if (config.networking.hostName == "isaiah") then "MASTER" else "BACKUP";
-            virtualIps = [
-              {
-                addr = "${nebulaIp}/16";
-                dev = "nebula0";
-              }
-            ];
-            virtualRouterId = 78;
-            extraConfig = ''
-              advert_int 1
-            '';
-          };
        };
      };
      openiscsi = {
@@ -23,6 +23,13 @@ with lib;
        type = types.str;
        description = "Kernel module type to install - amd, intel, etc";
      };
+      host = mkOption {
+        type = types.enum [
+          "libvirt"
+          "vbox"
+        ];
+        description = "Which VM hosting type to configure";
+      };
    };
  };

@@ -35,7 +42,6 @@ with lib;
      nixos-generators
      packer
      swtpm
-      virt-manager
      virtio-win
      xorriso
    ];
@@ -44,7 +50,7 @@ with lib;

    # Enable the virtualisation services
    virtualisation = {
-      libvirtd = {
+      libvirtd = mkIf (cfg.host == "libvirt") {
        enable = true;
        onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart
        qemu = {
@@ -54,6 +60,11 @@ with lib;
          };
        };
      };
+      virtualbox.host = mkIf (cfg.host == "vbox") {
+        enable = true;
+        enableExtensionPack = true;
+        headless = true;
+      };
    };

    boot.extraModprobeConfig = "options kvm_${cfg.system} nested=1";
@@ -86,6 +86,7 @@
      "system": "aarch64-darwin"
    },
    "linode": {
+      "connectAddr": "thehellings.com",
      "ip": null,
      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q",
      "ts": "100.109.86.8",
@@ -1,6 +1,6 @@
 -----BEGIN NEBULA CERTIFICATE V2-----
-MIGsoEaABmlzYWlhaKEOBAUKnQAEEAQFCp1kARCFBGplFeuGBGuuvKWHIIOJTGBg
-dlWpERTumyvbx0i842abqoQVUOzEXjsFB0CsgiDoVBJV1aKswyKPq1E4ZH9H21tx
-2IB0pKfEqNVdOLVedYNAjZSaY/IreMGnplY6txmSNuqSpFe1UTEDu4MOGSeZTKsO
-71y33z4AWsexnDD2ItFLT2rA5EgbApacaYF0AxtSCQ==
+MIGloD+ABmlzYWlhaKEHBAUKnQAEEIUEanOBO4YEa668pYcgg4lMYGB2VakRFO6b
+K9vHSLzjZpuqhBVQ7MReOwUHQKyCIOhUElXVoqzDIo+rUThkf0fbW3HYgHSkp8So
+1V04tV51g0AXR6vPKFhC1rfiDtslbhxwBNYgiUrRDxcNiAYAQFCyjTijj2+tqxyD
+pwL29i7NlcW+QgBxmtiSf8UW06MbzOkF
 -----END NEBULA CERTIFICATE V2-----
@@ -1,6 +1,6 @@
 -----BEGIN NEBULA CERTIFICATE V2-----
-MIGuoEiACGplcmVtaWFooQ4EBQqdAAUQBAUKnWQBEIUEamUYxYYEa668pYcgg4lM
-YGB2VakRFO6bK9vHSLzjZpuqhBVQ7MReOwUHQKyCIBHK000U9B0TVjuoTaMhQZFi
-8cKytw8is2cqUW4XAENBg0CLM+fuJcMVMbk6VHmRhko4KUTaQzWG2dggEwskTWCf
-IPXiTY2L/hInHSGFynIIe+Ux9hSRJ1W1KF4J8jq5LBwN
+MIGnoEGACGplcmVtaWFooQcEBQqdAAUQhQRqc4EPhgRrrrylhyCDiUxgYHZVqREU
+7psr28dIvONmm6qEFVDsxF47BQdArIIgEcrTTRT0HRNWO6hNoyFBkWLxwrK3DyKz
+ZypRbhcAQ0GDQNX6euu+o8qczoXIHt7hfpbVc57YvtYQZ1v350iiyNhM0I0oZsV9
+oVEBR9rg39/lsXjFX6UtC/H3RKo+arlhDQ4=
 -----END NEBULA CERTIFICATE V2-----
@@ -1,6 +1,6 @@
 -----BEGIN NEBULA CERTIFICATE V2-----
-MIGqoESABHpla2WhDgQFCp0ABhAEBQqdZAEQhQRqZRi1hgRrrrylhyCDiUxgYHZV
-qREU7psr28dIvONmm6qEFVDsxF47BQdArIIg+FmKGTcvIvUcFdcguETRybn3jh58
-jJL6X5BHcmrxOWODQCfB4+92Zs/315a6I60PXsUaw3Jk0MQPLUuHykTO19imWsYa
-DyKFlk26ePhczGlhO2svq9J8p0zce0w+TPveOw8=
+MIGjoD2ABHpla2WhBwQFCp0ABhCFBGpzgSyGBGuuvKWHIIOJTGBgdlWpERTumyvb
+x0i842abqoQVUOzEXjsFB0CsgiD4WYoZNy8i9RwV1yC4RNHJufeOHnyMkvpfkEdy
+avE5Y4NAVS1PQZIausgi1JekcdvwJ/+G64bLjzjznKD72u4XJfl7WKaO1O+RYOf7
+/2YdsUCODDzoGjdEtrQVftiz8RxRBg==
 -----END NEBULA CERTIFICATE V2-----
Author	SHA1	Message	Date
Greg Hellings	a00773c97a	fix: remove builder2 buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-08-06 22:53:34 -05:00
Greg Hellings	6bf0bcc0ef	fix: restore immich access buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-builder2 Build done. Details buildbot/nix-build Build done. Details	2026-08-06 21:43:28 -05:00
Greg Hellings	7619bf6258	chore: default actions packages	2026-08-06 20:36:41 -05:00
Greg Hellings	029b71d0d4	Pass traffic through genesis * keepalived does not work with Nebula VPN * update Genesis firewall to allow passing through local traffic * target all traffic directly to the LAN IP using genesis's routing	2026-08-05 22:57:58 -05:00
Greg Hellings	d779d275f2	Expose kubernetes on LAN	2026-08-05 20:07:35 -05:00