feat: Gitea Actions shell runners + flake-lock workflow

- Add modules/nixos/gitea-runner.nix: NixOS module for act_runner in
  shell mode, with options for enable, instanceURL, name, labels, and
  tokenFile (agenix secret path).
- Deploy gitea-runner to jeremiah, isaiah, zeke, and linode with
  appropriate labels. Agenix secret placeholders left with TODOs.
- Add .gitea/workflows/update-flake-lock.yaml: weekly workflow (Sunday
  midnight) that runs nix flake update and opens a PR if flake.lock
  changed, using GITEA_TOKEN secret for authentication.

Closes part of #15 (NixOS shell runners + flake-lock workflow).

.gitea/workflows/update-flake-lock.yaml

@@ -1,51 +1,57 @@
 name: Update flake.lock
 
-"on":
+on:
   schedule:
-    - cron: "0 0 * * 0"  # Every Sunday at midnight UTC
+    - cron: '0 0 * * 0'  # Every Sunday at midnight UTC
   workflow_dispatch:
 
 jobs:
   update-flake-lock:
-    runs-on: nix-latest
+    runs-on: [self-hosted, bare-metal]
+    container:
+      image: nixos/nix:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Configure Nix
+        run: |
+          mkdir -p /etc/nix
+          echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
+
       - name: Update flake.lock
         run: nix flake update
 
-      - name: Create PR if changed
+      - name: Check for changes
-        env:
+        id: changes
-          GITEA_TOKEN: ${{ secrets.KLAATU_TOKEN }}
-          GITEA_URL: https://src.thehellings.com
-          REPO: greg/nixos
         run: |
           if git diff --quiet flake.lock; then
-            echo "flake.lock unchanged, nothing to do"
+            echo "changed=false" >> "$GITHUB_OUTPUT"
-            exit 0
+          else
+            echo "changed=true" >> "$GITHUB_OUTPUT"
           fi
 
-          BRANCH="auto/update-flake-lock-$(date +%Y%m%d)"
+      - name: Commit and open PR
-          git config user.email "klaatu@thehellings.com"
+        if: steps.changes.outputs.changed == 'true'
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        run: |
+          BRANCH="automated/flake-lock-$(date +%Y%m%d)"
           git config user.name "klaatu"
+          git config user.email "klaatu@thehellings.com"
           git checkout -b "$BRANCH"
           git add flake.lock
-          git commit -m "chore: update flake.lock $(date +%Y-%m-%d)"
+          git commit -m "chore: update flake.lock"
-
-          # Push branch using token auth
-          git remote set-url origin "https://klaatu:${GITEA_TOKEN}@${GITEA_URL#https://}/${REPO}.git"
           git push origin "$BRANCH"
 
-          # Create PR via Gitea API
+          # Open PR via Gitea API
           curl -s -X POST \
             -H "Authorization: token ${GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
-            "${GITEA_URL}/api/v1/repos/${REPO}/pulls" \
             -d "{
-              \"title\": \"chore: update flake.lock $(date +%Y-%m-%d)\",
+              \"title\": \"chore: update flake.lock\",
-              \"head\": \"$BRANCH\",
+              \"head\": \"${BRANCH}\",
               \"base\": \"main\",
-              \"body\": \"Automated weekly flake.lock update.\\n\\nGenerated by Gitea Actions.\",
+              \"body\": \"Automated weekly flake.lock update.\n\nGenerated by the update-flake-lock workflow.\"
-              \"assignees\": [\"greg\"]
+            }" \
-            }"
+            "${GITHUB_SERVER_URL%/}/api/v1/repos/${GITHUB_REPOSITORY}/pulls"

.gitea/workflows/update-manifests.yaml

@@ -1,58 +0,0 @@
-name: Update manifest chart versions
-
-on:
-  schedule:
-    - cron: "0 0 * * 1"  # Every Monday at midnight UTC
-  workflow_dispatch:
-
-jobs:
-  update-manifests:
-    runs-on: [bare-metal, nix-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Scan manifests for chart version updates
-        run: |
-          echo "TODO: implement manifest update scanning"
-          echo ""
-          echo "Planned implementation:"
-          echo "  1. Parse each manifests/*/chart.yaml for HelmRelease chart versions"
-          echo "  2. Query artifact hub or helm repo for latest versions"
-          echo "  3. Emit a diff of available updates"
-          echo ""
-          echo "Scanned manifests directories:"
-          ls manifests/
-
-      - name: Create PR if changes found
-        env:
-          GITEA_TOKEN: ${{ secrets.KLAATU_TOKEN }}
-          GITEA_URL: https://src.thehellings.com
-          REPO: greg/nixos
-        run: |
-          if git diff --quiet; then
-            echo "No manifest changes, nothing to do"
-            exit 0
-          fi
-
-          BRANCH="auto/update-manifests-$(date +%Y%m%d)"
-          git config user.email "klaatu@thehellings.com"
-          git config user.name "klaatu"
-          git checkout -b "$BRANCH"
-          git add manifests/
-          git commit -m "chore: update manifest chart versions $(date +%Y-%m-%d)"
-
-          git remote set-url origin "https://klaatu:${GITEA_TOKEN}@${GITEA_URL#https://}/${REPO}.git"
-          git push origin "$BRANCH"
-
-          curl -s -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: application/json" \
-            "${GITEA_URL}/api/v1/repos/${REPO}/pulls" \
-            -d "{
-              \"title\": \"chore: update manifest chart versions $(date +%Y-%m-%d)\",
-              \"head\": \"$BRANCH\",
-              \"base\": \"main\",
-              \"body\": \"Automated weekly manifest chart version update.\\n\\nGenerated by Gitea Actions.\",
-              \"assignees\": [\"greg\"]
-            }"

.gitlab-ci.yml

@@ -0,0 +1,23 @@
+stages:
+  - eval
+  - build
+  - push
+
+"Evaluate for builds":
+  stage: eval
+  tags:
+    - kubernetes
+  image: "$CI_REGISTRY/greg/ci-images/builder:latest"
+  artifacts:
+    paths:
+      - gitlab-ci-continue.yml
+  script: nix run ".#gen-build" > gitlab-ci-continue.yml
+
+"Trigger builds":
+  stage: build
+  trigger:
+    include:
+      - artifact: gitlab-ci-continue.yml
+        job: "Evaluate for builds"
+  variables:
+    PARENT_PIPELINE_ID: $CI_PIPELINE_ID

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.38.0
+    rev: v1.37.1
     hooks:
       - id: yamllint
         args:
@@ -30,9 +30,8 @@ repos:
               comments: false
               comments-indentation: false
               document-start: false
-              line-length: false
   - repo: https://github.com/NixOS/nixfmt
-    rev: v1.2.0
+    rev: v1.1.0
     hooks:
       - id: nixfmt-nix
   - repo: https://github.com/astro/deadnix

darwin/baseline.nix

@@ -1,40 +1,29 @@
 {
+  lib,
   pkgs,
-  pkgs',
   top,
   ...
 }:
 let
-  system = builtins.replaceStrings [ "darwin" ] [ "linux" ] pkgs.stdenv.hostPlatform.system;
+  builder-config = {
-  builderConfig = top.nixunstable.lib.nixosSystem {
+    darwin-aarch-builder = top.self.nixosConfigurations.builder-aarch;
-    inherit system;
+    darwin-x86-builder = top.self.nixosConfigurations.builder-x86;
-    modules = [
-      "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix"
-      {
-        virtualisation = {
-          host.pkgs = pkgs;
-          darwin-builder = {
-            workingDirectory = "/var/lib/darwin-builder";
-            hostPort = 22;
   };
-        };
+  builder = arch: let
-      }
+    b = builder-config."darwin-${arch}-builder";
-    ];
+  in {
-  };
+    command = "${b.config.system.build.macos-builder-installer}/bin/create-builder";
-  builder = {
-    command = "${builderConfig.config.system.build.macos-builder-installer}/bin/create-builder";
     serviceConfig = {
       KeepAlive = true;
       RunAtLoad = true;
-      StandardOutPath = "/var/log/builder-vm-${system}.log";
+      StandardOutPath = "/var/log/builder-vm-${arch}.log";
-      StandardErrorPath = "/var/log/builder-vm-${system}.stderr.log";
+      StandardErrorPath = "/var/log/builder-vm-${arch}.stderr.log";
     };
   };
 in
 {
   environment.systemPackages = with pkgs; [
-    agenix
+    hms
-    pkgs'.hms
   ];
 
   fonts.packages = with pkgs; [
@@ -42,13 +31,23 @@ in
     nerd-fonts.hack
   ];
 
-  #launchd.daemons.darwin-builder = builder;
+  launchd.daemons = lib.genAttrs' [ "x86" "aarch" ] (arch: lib.nameValuePair "builder-${arch}-machine" (builder arch));
 
   nix = {
-    #buildMachines = [ { systems = ["aarch64-linux"]; sshUser = "builder"; sshKey = "/etc/nix/builder_ed25519"; hostName = "localhost:31022"; protocol = "ssh-ng"; }];
     enable = true;
+    buildMachines = [
+      {
+        hostName = "ssh-ng://builder@localhost";
+        system = "aarch64-linux";
+        maxJobs = 4;
+        supportedFeatures = [
+          "kvm"
+          "benchmarch"
+          "big-parallel"
+        ];
+      }
+    ];
     gc.interval.Hour = 3;
-    #linux-builder.enable = true;
     settings.auto-optimise-store = false; # Darwin bugs?
   };
 

darwin/default.nix

@@ -19,7 +19,6 @@ let
       specialArgs = {
         inherit metadata top;
         inherit (top) self;
-        pkgs' = top.self.packages.${system};
       };
       modules = [
         {
@@ -38,4 +37,7 @@ let
       ++ lib.optionals (builtins.pathExists ./hosts/${name}) [ ./hosts/${name} ];
     };
 in
-(lib.genAttrs (builtins.attrNames (builtins.readDir ./hosts)) (name: mac { inherit name; }))
+{
+  "MacBook-Pro" = mac { name = "ivr"; };
+  "MacBook-Prolocal" = mac { name = "ivr"; };
+}

darwin/hosts/MacBook-Prolocal

@@ -1 +0,0 @@
-gregory

darwin/hosts/gregory.hellings-mbp

@@ -1 +0,0 @@
-gregory

darwin/hosts/ivr

@@ -1 +0,0 @@
-gregory/

darwin/hosts/ivr/default.nix

@@ -31,7 +31,6 @@ in
       "bitwarden"
       "bruno"
       "chromium"
-      "claude"
       "dbeaver-community"
       "ghostty"
       "firefox"

darwin/hosts/li

@@ -1 +0,0 @@
-lithic/

darwin/hosts/lithic/default.nix

@@ -1,53 +0,0 @@
-{ ... }:
-let
-  username = "greg";
-in
-{
-  greg = {
-    nix.cache = false;
-  };
-
-  homebrew = {
-    enable = true;
-    brews = [
-      "bitwarden-cli"
-      "direnv"
-      "github-mcp-server"
-      {
-        name = "libvirt";
-        restart_service = true;
-      }
-      "mcp-atlassian"
-      "notion-mcp-server"
-      "nushell"
-      "qemu"
-      "slack-mcp-server"
-      "zlib"
-    ];
-    casks = [
-      "alt-tab"
-      "audacity"
-      "bitwarden"
-      "bruno"
-      "chromium"
-      "claude-code"
-      "dbeaver-community"
-      "ghostty"
-      "firefox"
-      "notion"
-      "notunes"
-      "onlyoffice"
-      "podman-desktop"
-      "tabby"
-      "zed"
-    ];
-    user = username;
-  };
-
-  system.primaryUser = username;
-
-  users.users."${username}" = {
-    name = username;
-    home = "/Users/${username}";
-  };
-}

flake.lock

@@ -25,17 +25,19 @@
     },
     "buildbot": {
       "inputs": {
+        "flake-parts": "flake-parts",
+        "hercules-ci-effects": "hercules-ci-effects",
         "nixpkgs": [
           "nixunstable"
         ],
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1780652294,
+        "lastModified": 1772467670,
-        "narHash": "sha256-pW0RrDJvj8EcbxXPxWVwMQ+x8LdEij3S3oB+inIUeKU=",
+        "narHash": "sha256-DF/1VCg7Qmw5iaFhBeKBysOSTDCxZlKJHdbJc7Q2e1k=",
         "owner": "nix-community",
         "repo": "buildbot-nix",
-        "rev": "b16ef5c60459c94bd7f512977908c69b6e53b1e0",
+        "rev": "f927795b97474875738ac134525af560b2d4a8a5",
         "type": "github"
       },
       "original": {
@@ -44,12 +46,36 @@
         "type": "github"
       }
     },
+    "charts": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "haumea": "haumea",
+        "nix-kube-generators": "nix-kube-generators",
+        "nixpkgs": "nixpkgs",
+        "pyproject-build-systems": "pyproject-build-systems",
+        "pyproject-nix": "pyproject-nix",
+        "uv2nix": "uv2nix"
+      },
+      "locked": {
+        "lastModified": 1772676442,
+        "narHash": "sha256-bPxUBXS2mdT4BjMAmTap5TkXnUX807qo4Uho2oVb2Fg=",
+        "owner": "nix-community",
+        "repo": "nixhelm",
+        "rev": "19cdbb3a03554059165a25a18b32bd253e62c883",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixhelm",
+        "type": "github"
+      }
+    },
     "colmena": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "stable": "stable"
       },
       "locked": {
@@ -95,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779036909,
+        "lastModified": 1772379624,
-        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
+        "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "56c666e108467d87d13508936aade6d567f2a501",
+        "rev": "52d061516108769656a8bd9c6e811c677ec5b462",
         "type": "github"
       },
       "original": {
@@ -126,22 +152,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1767039857,
@@ -159,14 +169,17 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "buildbot",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1778716662,
+        "lastModified": 1769996383,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -177,17 +190,14 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib"
-          "nixvimunstable",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1778716662,
+        "lastModified": 1772408722,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -197,6 +207,27 @@
       }
     },
     "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvimunstable",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nurpkgs",
@@ -218,6 +249,24 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "locked": {
         "lastModified": 1659877975,
         "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -232,6 +281,53 @@
         "type": "github"
       }
     },
+    "haumea": {
+      "inputs": {
+        "nixpkgs": [
+          "charts",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1685133229,
+        "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=",
+        "owner": "nix-community",
+        "repo": "haumea",
+        "rev": "34dd58385092a23018748b50f9b23de6266dffc2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "v0.2.2",
+        "repo": "haumea",
+        "type": "github"
+      }
+    },
+    "hercules-ci-effects": {
+      "inputs": {
+        "flake-parts": [
+          "buildbot",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "buildbot",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771131391,
+        "narHash": "sha256-HPBNYf7HiKtBVy7/69vKpLYHX6wTcUxndxmybzDlXP8=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "rev": "0b152e0f7c5cc265a529cd63374b80e2771b207b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "type": "github"
+      }
+    },
     "hmunstable": {
       "inputs": {
         "nixpkgs": [
@@ -239,11 +335,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780679734,
+        "lastModified": 1772633327,
-        "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=",
+        "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b2b7db486e06e098711dc291bb25db82850e1d16",
+        "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
         "type": "github"
       },
       "original": {
@@ -274,45 +370,6 @@
         "type": "github"
       }
     },
-    "minecraft": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1780375694,
-        "narHash": "sha256-TznzgYVONg28KiSFB2rVdf/eLVIMtEQOxKt13Kzyrp8=",
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
-        "rev": "e6f8bec35104ca5955efe73742da58d2823684f7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
-        "type": "github"
-      }
-    },
-    "niks3": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "treefmt-nix": "treefmt-nix_2"
-      },
-      "locked": {
-        "lastModified": 1780530521,
-        "narHash": "sha256-728J4gTwpnug5C6QpnPbFyceYlfhPeX6SEP/K4PPbVs=",
-        "owner": "Mic92",
-        "repo": "niks3",
-        "rev": "c9a54708e881d51a76309168c5cda516bb2daeb0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "niks3",
-        "type": "github"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -335,15 +392,12 @@
       }
     },
     "nix-hardware": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
       "locked": {
-        "lastModified": 1780310866,
+        "lastModified": 1771969195,
-        "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
+        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
+        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
         "type": "github"
       },
       "original": {
@@ -352,7 +406,53 @@
         "type": "github"
       }
     },
+    "nix-kube-generators": {
+      "locked": {
+        "lastModified": 1762437901,
+        "narHash": "sha256-5yuJODagAq+aMXQAT2c0gfXKLqapmA6eUHR33jKNHuU=",
+        "owner": "farcaller",
+        "repo": "nix-kube-generators",
+        "rev": "810dcf792081790648ba9ae705b9a2286115ace8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "farcaller",
+        "repo": "nix-kube-generators",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1767767207,
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1750134718,
         "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
@@ -368,43 +468,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1777168982,
+        "lastModified": 1772624091,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
-      "locked": {
-        "lastModified": 1780195591,
-        "narHash": "sha256-/LAL+E75c0ioCHxyVFGwzXorfuHzToKgqPUCRq4RTIY=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "49d924421d7c3175edc499fdc738bd70d69d97d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
         "type": "github"
       },
       "original": {
@@ -414,74 +484,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1780475387,
-        "narHash": "sha256-JsufhU/MyfEEJMNmtmW0DY6LbOVIjjPS0zGQpHvgrBY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c8560a2e8ad260841c482fe30731087b92f2223e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1767892417,
+        "lastModified": 1766025857,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1780243769,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1777207419,
-        "narHash": "sha256-V3bmPWAajDiC+1ClDOp55gianW2EyRJSJOyu1RUQibc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a7ecea3deccfbdbf22945a89984fcc5a169da8aa",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a7ecea3deccfbdbf22945a89984fcc5a169da8aa",
+        "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce",
         "type": "github"
       }
     },
     "nixunstable": {
       "locked": {
-        "lastModified": 1780243769,
+        "lastModified": 1772963539,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
         "type": "github"
       },
       "original": {
@@ -493,18 +518,18 @@
     },
     "nixvimunstable": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixunstable"
         ],
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1780646548,
+        "lastModified": 1772402258,
-        "narHash": "sha256-Ckyl/l1XBmEwnaHcHD8PvBZk1uph0NqwbJ//CAvB7iE=",
+        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "816a15282e58678dde831477964987d0262d4293",
+        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
         "type": "github"
       },
       "original": {
@@ -516,15 +541,15 @@
     },
     "nurpkgs": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1780789357,
+        "lastModified": 1772717146,
-        "narHash": "sha256-YrZPqCwHzUYb+fbH9tp8T90x3pN37D7onc4X7+bzktc=",
+        "narHash": "sha256-x2nJlzpiHWHLkGDBvaiO1ysLhaxjQCLsG3XieRueJ/c=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "55cbac785808e7e62aee241f5b789b8f5adb8e95",
+        "rev": "2e1bffbdde931c4300a59418d0150c7457022f2d",
         "type": "github"
       },
       "original": {
@@ -533,18 +558,66 @@
         "type": "github"
       }
     },
+    "pyproject-build-systems": {
+      "inputs": {
+        "nixpkgs": [
+          "charts",
+          "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "charts",
+          "pyproject-nix"
+        ],
+        "uv2nix": [
+          "charts",
+          "uv2nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763662255,
+        "narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=",
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "rev": "042904167604c681a090c07eb6967b4dd4dae88c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "type": "github"
+      }
+    },
+    "pyproject-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "charts",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764134915,
+        "narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=",
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
+        "rev": "2c8df1383b32e5443c921f61224b198a2282a657",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "buildbot": "buildbot",
+        "charts": "charts",
         "colmena": "colmena",
         "darwin": "darwin_2",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
         "hmunstable": "hmunstable",
-        "minecraft": "minecraft",
-        "niks3": "niks3",
         "nix-hardware": "nix-hardware",
-        "nixpkgs-lib": "nixpkgs-lib_2",
         "nixunstable": "nixunstable",
         "nixvimunstable": "nixvimunstable",
         "nurpkgs": "nurpkgs",
@@ -600,16 +673,15 @@
     },
     "systems_3": {
       "locked": {
-        "lastModified": 1774449309,
+        "lastModified": 1681028828,
-        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "ref": "future-26.11",
         "repo": "default",
         "type": "github"
       }
@@ -622,11 +694,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775636079,
+        "lastModified": 1770228511,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
         "type": "github"
       },
       "original": {
@@ -635,37 +707,41 @@
         "type": "github"
       }
     },
-    "treefmt-nix_2": {
+    "uv2nix": {
       "inputs": {
         "nixpkgs": [
-          "niks3",
+          "charts",
           "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "charts",
+          "pyproject-nix"
         ]
       },
       "locked": {
-        "lastModified": 1780220602,
+        "lastModified": 1767701098,
-        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
+        "narHash": "sha256-CJhKZnWb3gumR9oTRjFvCg/6lYTGbZRU7xtvcyWIRwU=",
-        "owner": "numtide",
+        "owner": "pyproject-nix",
-        "repo": "treefmt-nix",
+        "repo": "uv2nix",
-        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "rev": "9d357f0d2ce6f5f35ec7959d7e704452352eb4da",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "pyproject-nix",
-        "repo": "treefmt-nix",
+        "repo": "uv2nix",
         "type": "github"
       }
     },
     "vsext": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1780718391,
+        "lastModified": 1772678592,
-        "narHash": "sha256-hQOS9bTTzVXQNYaW4bi2EyXN8jqDe7ge07xPPbvUMuA=",
+        "narHash": "sha256-1VZ1hg1YHW+WyBXIOfrQ9Oq+qLL0w93lkdKAiRRHEuI=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "e2ccd7477aa7174e34bd32c135dc470a3f822a82",
+        "rev": "5521856f37c3d2654fe9b20b03331a6594f855c6",
         "type": "github"
       },
       "original": {
@@ -676,17 +752,17 @@
     },
     "wsl": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "nixpkgs": [
           "nixunstable"
         ]
       },
       "locked": {
-        "lastModified": 1780765279,
+        "lastModified": 1772386632,
-        "narHash": "sha256-md6QHmlIx40bQkun43M2eT8aav5GURGkXEMFwof6uZs=",
+        "narHash": "sha256-sm6OpWZuoDwR53KNlsY482YOoHFWlWYwt0wHmqLkRGE=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "3e6d8af994e2a2d31af7a91863d7c0d6e278d951",
+        "rev": "be894604b2aa2184c0b3d3b44995acd0da14dc0c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -13,6 +13,9 @@
       url = "github:nix-community/buildbot-nix";
       inputs.nixpkgs.follows = "nixunstable";
     };
+    charts = {
+      url = "github:nix-community/nixhelm";
+    };
     colmena.url = "github:zhaofengli/colmena";
     darwin = {
       url = "github:lnl7/nix-darwin/master";
@@ -23,10 +26,7 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixunstable";
     };
-    minecraft.url = "github:Infinidoge/nix-minecraft";
-    niks3.url = "github:Mic92/niks3";
     nix-hardware.url = "github:nixos/nixos-hardware";
-    nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
     nixvimunstable = {
       url = "github:nix-community/nixvim/main";
       inputs.nixpkgs.follows = "nixunstable";
@@ -50,7 +50,6 @@
         top.nixvimunstable.overlays.default
         top.nurpkgs.overlays.default
         top.vsext.overlays.default
-        top.minecraft.overlay
       ];
       metadata = builtins.fromJSON (builtins.readFile ./network.json);
       systems = [
@@ -69,7 +68,6 @@
           };
         }
       );
-      lib' = import ./lib { inherit (top.nixunstable) lib; };
     in
     top.flake-parts.lib.mkFlake { inputs = top; } {
       inherit systems;
@@ -81,12 +79,10 @@
               nixpkgs = imported_packages.x86_64-linux;
               specialArgs = {
                 inherit
-                  lib'
                   metadata
                   self
                   top
                   ;
-                pkgs' = top.self.packages.x86_64-linux;
               };
             };
           }
@@ -119,7 +115,7 @@
 
         nixosConfigurations = (
           import ./hosts {
-            inherit top metadata lib';
+            inherit top metadata;
             nixpkgs = imported_packages;
           }
         );
@@ -148,17 +144,16 @@
             pkgs = imported_packages.${system};
           };
 
-          packages = (import ./pkgs { inherit pkgs top; });
+          packages = (import ./pkgs { inherit pkgs; });
 
           checks = import ./checks.nix {
             inherit system top self';
-            inherit (top.nixpkgs-lib) lib;
+            inherit (pkgs) lib;
           };
 
           devShells = import ./shells.nix {
             inherit pkgs;
             inherit (top) colmena;
-            inherit (self') packages;
           };
         };
     };

garnix.yaml

@@ -1,23 +1,23 @@
 builds:
-  # Exclude most things, as I locally build x86_64-linux and aarch64-linux
+  exclude:
-  - exclude:
     - "homeConfigurations.*"
     - "nixosConfigurations.*"
     - "packages.*"
+    # bitwarden-cli package is broken on aarch64-darwin
+    - "packages.aarch64-darwin.img-bitwarden"
+    # kmod-31 is not a thing on Darwin
+    - "packages.aarch64-darwin.qemu-hook"
+    - "packages.aarch64-darwin.vfio_shutdown"
+    - "packages.aarch64-darwin.vfio_startup"
+    # This one is a bit of a beast and shouldn't take up Garnix time
+    - "packages.aarch64-darwin.zim"
     # These are just images which I will build when
     # I feel like it
     - "devShells.*"
   include:
     - "packages.aarch64-darwin.*"
+    - homeConfigurations.exodus
     - darwinConfigurations.MacBook-Pro
     - darwinConfigurations.MacBook-Prolocal
-      - darwinConfigurations.li
+    - nixosConfigurations.builder-x86
-  # Some specific includes which are not specific enough to override the rules
+    - nixosConfigurations.builder-aarch
-  # above, due to the intrepretation of the glob excludes, but which I still
-  # need included
-  - include:
-      # These are Mac homeConfigurations, which I do not have the infra
-      # to build at home
-      - homeConfigurations."gregory.hellings-mbp"
-      - homeConfigurations.gregs-MacBook-Pro-16-inch-Nov-2024
-      - homeConfigurations.ivr

home/baseline/nushell/functions.nu

@@ -1,5 +1,5 @@
 # vim: set filetype=nushell :
-let servers = [isaiah jeremiah zeke genesis]
+let servers = [isaiah jeremiah zeke genesis vm-gitlab]
 
 def par-map [ items: list, c: closure ] {
   let results = $items | par-each -k $c
@@ -69,14 +69,6 @@ def dc [ $cmd: string = "sh" ] {
     }
 }
 
-def claude [ ] {
-    unlock
-    $env.GITLAB_TOKEN = ^bw get item 7d3da4e9-5f9a-49d0-8e14-b39c010a4001 | from json | get fields | find claudeapi | get value
-    #$env.ANTHROPIC_API_KEY = ^bw get item e122fd08-3506-4f21-9c6a-b42b00fe5be1 | from json | get login.password
-    ^claude
-}
-
 if ("/usr/local/bin" | path exists) {
     $env.PATH = $env.PATH | append "/usr/local/bin"
 }
-$env.PATH = $env.PATH | prepend "~/.local/bin"

home/baseline/shell.nix

@@ -26,7 +26,6 @@
       nixcopy = "nix copy --to \"s3://binary-cache/?profile=default&endpoint=nas.home%3A9000&scheme=http\"";
       r = "run0";
       updateScript = "nix-shell maintainers/scripts/update.nix --argstr package";
-      p = "${lib.getExe pkgs.podman-tui}";
 
       # General
       k = "kubectl";

home/baseline/ssh.nix

@@ -5,7 +5,7 @@
   # This allows things like SSH in distrobox to read the config file just fine
   home.file.".ssh/config" = {
     target = ".ssh/config_source";
-    onChange = "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config";
+    onChange = ''cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config'';
   };
   programs.ssh = {
     enable = true;
@@ -13,23 +13,25 @@
     includes = [ "config.local" ];
     enableDefaultConfig = false;
 
-    settings =
+    matchBlocks =
       let
         nas = {
-          User = "admin";
+          user = "admin";
         };
         owned = {
-          User = "greg";
+          user = "greg";
         };
       in
       {
         inherit nas;
 
         "*" = {
-          DynamicForward = [ "10240" ];
+          dynamicForwards = [ { port = 10240; } ];
-          ServerAliveInterval = 60;
+          serverAliveInterval = 60;
+          extraOptions = {
             LogLevel = "error";
-          SetEnv = { TERM = "xterm-256color"; };
+            SetEnv = "TERM=xterm-256color";
+          };
         };
 
         "10.42.1.4" = lib.hm.dag.entryBefore [ "10.42.*" ] nas;
@@ -39,46 +41,46 @@
         "chronicles.thehellings.lan" = lib.hm.dag.entryBefore [ "*.thehellings.lan" ] nas;
 
         gh = {
-          User = "git";
+          user = "git";
-          Hostname = "github.com";
+          hostname = "github.com";
         };
         "src" = {
-          User = "git";
+          user = "git";
-          Hostname = "jeremiah.shire-zebra.ts.net";
+          hostname = "jeremiah.shire-zebra.ts.net";
-          Port = 32222;
+          port = 32222;
         };
         srcpub = {
-          User = "git";
+          user = "git";
-          Hostname = "src.thehellings.com";
+          hostname = "src.thehellings.com";
-          Port = 2222;
+          port = 2222;
         };
         ivr = {
-          User = "git";
+          user = "git";
-          Hostname = "gitlab.com";
+          hostname = "gitlab.com";
         };
 
         "ivr.thehellings.lan" = lib.hm.dag.entryBefore [ "ivr" ] {
-          User = "gregory.hellings";
+          user = "gregory.hellings";
         };
 
         "*.thehellings.lan" = owned;
         "10.42.*" = owned;
 
         "host.crosswire.org crosswire" = {
-          Hostname = "host.crosswire.org";
+          hostname = "host.crosswire.org";
-          User = "ghellings";
+          user = "ghellings";
         };
 
         fedpeople = {
-          Hostname = "fedorapeople.org";
+          hostname = "fedorapeople.org";
-          User = "greghellings";
+          user = "greghellings";
         };
 
         "src.fedoraproject.org pkgs.fedoraproject.org" = {
-          User = "greghellings";
+          user = "greghellings";
         };
 
-        "127.*" = {
+        "127.*".extraOptions = {
           PubkeyAcceptedAlgorithms = "+ssh-rsa";
           HostkeyAlgorithms = "+ssh-rsa";
         };

home/baseline/tools.nix

@@ -12,7 +12,7 @@
       dig
       jqp
       kubernetes-helm
-      #iamb
+      iamb
       lazyssh
       rainfrog
       tenere

home/baseline/xonsh_footer.xsh

@@ -38,6 +38,11 @@ def _ivr2(args):
     vpn("gregory_hellings@ra.ivrtechnology.com", "IVR Technology")
 aliases['ivr2'] = _ivr2
 
+def _glrestart(args):
+    sudo nixos-container run gitlab -- systemctl restart gitlab
+    sudo nixos-container run gitlab -- systemctl restart nginx
+aliases['glrestart'] = _glrestart
+
 def _aws_creds(args):
     $AWS_ACCESS_KEY_ID=$(bw get username "AWS Access Key")
     $AWS_SECRET_ACCESS_KEY=$(bw get password "AWS Access Key")

home/default.nix

@@ -4,15 +4,11 @@
   top,
 }:
 let
-  inherit (top.nixunstable) lib;
   user =
-    host:
+    host: username:
     let
       inherit (metadata.hosts.${host}) system;
       pkgs = nixpkgs.${system};
-      pkgs' = top.self.packages.${system};
-      username =
-        if builtins.hasAttr "user" metadata.hosts.${host} then metadata.hosts.${host}.user else "greg";
     in
     top.hmunstable.lib.homeManagerConfiguration {
       inherit pkgs;
@@ -26,12 +22,25 @@ let
           host
           username
           metadata
-          pkgs'
           ;
         nixvim = top.nixvimunstable;
         gui = false;
         gnome = false;
       };
     };
+  greg = host: (user host "greg");
 in
-(lib.genAttrs (builtins.attrNames (builtins.readDir ./hosts)) user)
+{
+  "MacBook-Pro.local" = user "ivr" "gregory.hellings";
+  "MacBook-Prolocal.local" = user "ivr" "gregory.hellings";
+  "MacBook-Pro.thehellings.lan" = user "ivr" "gregory.hellings";
+  "gregory.hellings-mbp" = user "ivr" "gregory.hellings";
+  genesis = greg "genesis";
+  exodus = greg "exodus";
+  zeke = greg "zeke";
+  isaiah = greg "isaiah";
+  jeremiah = greg "jeremiah";
+  linode = greg "linode";
+  hosea = greg "hosea";
+  gitlab = greg "gitlab";
+}

home/home.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  pkgs',
   lib,
   host ? "most",
   top,
@@ -20,14 +19,9 @@ in
   imports = [
     top.nixvimunstable.homeModules.nixvim
     top.self.modules.homeManagerModule
-    top.agenix.homeManagerModules.default
     ./baseline
   ]
-  ++ lib.optionals (builtins.pathExists ./hosts/${host}/default.nix) [ ./hosts/${host} ];
+  ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
-
-  age = {
-    identityPaths = [ "${homeDirectory}/.ssh/id_ed25519" ];
-  };
 
   home = {
     inherit homeDirectory username;
@@ -39,7 +33,7 @@ in
       gh
       git
       gnupatch
-      pkgs'.hms
+      hms
       btop
       inetutils
       jq
@@ -47,7 +41,7 @@ in
       nix-prefetch
       nmap
       openssl
-      pkgs'.setup-ssh
+      setup-ssh
       tmux
       tree
       unzip

home/hosts/exodus/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   greg = {
@@ -21,28 +21,11 @@
     kubectl
     kubectl-cnpg
     mattermost-desktop
-    minio-client
     mumble
     pre-commit
-    prismlauncher
     restic
     restic-browser
     tea
     wineWow64Packages.stable
   ];
-  programs = {
-    discord = {
-      enable = true;
-      settings.SKIP_HOST_UPDATE = true;
-    };
-  };
-  xdg.desktopEntries = {
-    prismlauncher = {
-      name = "Prism Launcher - Minecraft";
-      actions.minecraft = {
-        name = "Minecraft";
-        exec = lib.getExe pkgs.prismlauncher;
-      };
-    };
-  };
 }

home/hosts/gregs-MacBook-Pro-16-inch-Nov-2024

@@ -1 +0,0 @@
-lithic/

home/hosts/ivr

@@ -1 +0,0 @@
-gregory.hellings-mbp/

home/hosts/ivr/default.nix

@@ -1,9 +1,21 @@
 {
   pkgs,
   lib,
-  username,
   ...
 }:
+let
+  username = "gregory.hellings";
+  x = pkgs.xonsh.override {
+    extraPackages = (
+      ps: [
+        pkgs.nur.repos.xonsh-xontribs.xonsh-direnv
+        pkgs.nur.repos.xonsh-xontribs.xontrib-vox
+        ps.xonsh-apipenv
+        pkgs.pipenv-ivr
+      ]
+    );
+  };
+in
 {
   # Disables hitting local cache
   _module.args.cache = lib.mkForce false;
@@ -16,36 +28,41 @@
 
   home = {
     packages = with pkgs; [
+      aacs
       ansible
-      claude-code
       direnv
       home-manager
       python3Packages.ipython
       just
-      glab
       go
       gopls
+      k9s
+      kubectl
       mariadb
+      minikube
+      mise
+      nil
       nixVersions.stable
+      pipenv-ivr
       pre-commit
       python311
       python3Packages.flake8
+      skaffold
       twine
+      x
     ];
     file = {
       ".pip/pip.conf".text = ''
         [global]
         retries = 1
-        index-url = https://pypi.python.org/
+        index-url = https://pypi.python.org/simple
         extra-index-url =
-            https://pypidev.ivrtechnology.com/
+            https://pypidev.ivrtechnology.com/simple/
       '';
       ".config/uv/uv.toml".text = ''
-        index-strategy = "unsafe-first-match"
         [[index]]
-        url = "https://pypidev.ivrtechnology.com/"
+        url = "https://pypidev.ivrtechnology.com/simple/"
         name = "pypidev"
-        ignore-error-codes = [403]
       '';
     };
     username = username;
@@ -91,5 +108,6 @@
           "web4"
         ]
     );
+    tmux.shell = (lib.getExe x);
   };
 }

home/hosts/lithic/default.nix

@@ -1,78 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
-let
-  python = pkgs.python312.withPackages (
-    p: with p; [
-      ipython
-    ]
-  );
-in
-{
-  # Disables hitting local cache
-  _module.args.cache = lib.mkForce false;
-
-  greg = {
-    development = true;
-    gui = true;
-    nix.cache = false;
-    zed = true;
-  };
-
-  home = {
-    packages = with pkgs; [
-      ansible
-      awscli2
-      cargo
-      clippy
-      direnv
-      go
-      home-manager
-      just
-      mcp-grafana
-      nil
-      nixVersions.stable
-      podman
-      podman-compose
-      poetry
-      pre-commit
-      (pulumi.withPackages (
-        p: with p; [
-          pulumi-aws-native
-          pulumi-command
-          pulumi-go
-          pulumi-nodejs
-          pulumi-python
-        ]
-      ))
-      python
-      rustc
-      rustfmt
-      terraform
-    ];
-  };
-
-  programs = {
-    direnv = {
-      enable = true;
-      enableNushellIntegration = true;
-    };
-    nushell = {
-      enable = true;
-    };
-    starship = {
-      enable = true;
-      enableNushellIntegration = true;
-      settings = {
-        directory = {
-          home_symbol = "~";
-          truncate_to_repo = false;
-          truncation_length = 0;
-          use_os_path_sep = true;
-        };
-      };
-    };
-  };
-}

home/hosts/work/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  greg.vscodium.enable = false;
+
+  home.packages = with pkgs; [ brew ];
+}

hosts/baseline.nix

@@ -3,24 +3,19 @@
   lib,
   metadata,
   pkgs,
-  top,
   ...
 }:
 {
   imports = [
     ../modules/nix-conf.nix
-    top.niks3.nixosModules.niks3-auto-upload
   ];
 
-  age.secrets.niks3-api-token.file = ../secrets/niks3/api_token.age;
-
   console = {
     font = "Lat2-Terminus16";
     keyMap = "us";
   };
 
   environment.systemPackages = with pkgs; [
-    top.niks3.packages.${pkgs.stdenv.hostPlatform.system}.niks3
     agenix
     bitwarden-cli
     bmon
@@ -31,9 +26,10 @@
     efibootmgr
     findutils
     file
+    gcc-tune
     git
     gnupatch
-    top.self.packages.${pkgs.stdenv.hostPlatform.system}.hms # My own home manager switcher
+    hms # My own home manager switcher
     iperf
     killall
     nano
@@ -57,25 +53,9 @@
 
   # Network Manager pulls in too many deps
   networking = {
-    extraHosts =
-      let
-        onNetwork =
-          attr: _k: v:
-          (builtins.hasAttr attr v) && v.${attr} != null;
-        getIPs =
-          attr: domain:
-          (lib.mapAttrsToList (host: v: "${builtins.getAttr attr v} ${host}.${domain}") (
-            lib.filterAttrs (onNetwork attr) metadata.hosts
-          ));
-      in
-      builtins.concatStringsSep "\n" (
-        (getIPs "ts" "shire-zebra.ts.net")
-        ++ (getIPs "nebulaIp" "nebula.thehellings.com")
-        ++ (getIPs "nebulaIp" "nebula")
-        ++ (getIPs "ip" "thehellings.lan")
-      );
     search = [
-      "nebula.thehellings.com"
+      "thehellings.lan"
+      "home"
     ];
     networkmanager.enable = false;
   };
@@ -101,12 +81,6 @@
   # Enable the OpenSSH daemon for remote control
   services = {
     locate.enable = true;
-    niks3-auto-upload = {
-      enable = config.greg.nix.cache;
-      authTokenFile = config.age.secrets.niks3-api-token.path;
-      serverUrl = "http://hosea.nebula.thehellings.com:5751";
-      verifyS3Integrity = true;
-    };
     openssh = {
       enable = true;
       settings.X11Forwarding = true;
@@ -140,10 +114,7 @@
     };
   };
 
-  security = {
+  security.sudo.extraRules = [
-    sudo-rs = {
-      enable = true;
-      extraRules = [
     {
       users = [ "greg" ];
       commands = [
@@ -154,9 +125,6 @@
       ];
     }
   ];
-    };
-    sudo.enable = false;
-  };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.greg = {

hosts/default.nix

@@ -1,6 +1,5 @@
 {
   top,
-  lib',
   metadata,
   nixpkgs,
 }:
@@ -15,17 +14,11 @@ let
     }:
     let
       inherit (metadata.hosts.${name}) system;
-      pkgs' = top.self.packages.${system};
     in
     channel.lib.nixosSystem {
       pkgs = nixpkgs.${system};
       specialArgs = {
-        inherit
+        inherit metadata top;
-          metadata
-          top
-          lib'
-          pkgs'
-          ;
       };
       modules = [
         {
@@ -51,6 +44,16 @@ in
     })
   )
 )
+// (lib.genAttrs
+  (builtins.attrNames (lib.filterAttrs (_: v: v == "directory") (builtins.readDir ./vm)))
+  (
+    name:
+    (unstable {
+      inherit name;
+      extraMods = [ ./vm/${name} ];
+    })
+  )
+)
 // {
   # nix build '.#nixosConfigurations.wsl.config.system.build.installer'
   #nixos = wsl { name = "wsl"; };
@@ -59,4 +62,26 @@ in
   #  name = "wsl";
   #  system = "aarch64-linux";
   #};
+
+  builder-aarch = lib.nixosSystem {
+    system = "aarch64-linux";
+    modules = [
+      "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix"
+      {
+        virtualisation.host.pkgs = import top.nixunstable { system = "aarch64-darwin"; };
+        boot.loader.grub.devices = [ "/dev/vda" ];
+      }
+    ];
+  };
+
+  builder-x86 = lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [
+      "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix"
+      {
+        virtualisation.host.pkgs = import top.nixunstable { system = "aarch64-darwin"; };
+        boot.loader.grub.devices = [ "/dev/vda" ];
+      }
+    ];
+  };
 }

hosts/unstable/exodus/default.nix

@@ -18,11 +18,7 @@
 
   boot = {
     loader = {
-      systemd-boot = {
+      systemd-boot.enable = true;
-        enable = true;
-        memtest86.enable = true;
-        netbootxyz.enable = true;
-      };
       efi.canTouchEfiVariables = true;
     };
     binfmt.emulatedSystems = [
@@ -43,6 +39,10 @@
       enable = true;
       tags = [ "mobile" ];
     };
+    runner = {
+      enable = true;
+      qemu = true;
+    };
   };
 
   hardware = {

hosts/unstable/genesis/default.nix

@@ -2,23 +2,48 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{
+{ lib, pkgs, ... }:
-  top,
+
-  pkgs,
+let
-  pkgs',
+  adblockUpdate = pkgs.writeShellApplication {
-  ...
+    name = "adblock-update";
-}:
+    runtimeInputs = with pkgs; [
+      curl
+      gnused
+      systemd
+    ];
+    text = ''
+      curl -s https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts | sed '1,33d' > /etc/adblock_hosts
+      curl -s https://adaway.org/hosts.txt | sed '1,24d' | sed 's/127.0.0.1/0.0.0.0/' >> /etc/adblock_hosts
+
+      # Custom domains that I need to preserve for some reason
+      for f in "segment.com" "segment.io" "branch.io" "dev.visualwebsiteoptimizer.com" "click.discord.com"; do
+       	sed -i -e "/''${f}/d" /etc/adblock_hosts  # Blocks Trelly content for house investors
+      done
+
+      systemctl restart dnsmasq
+    '';
+  };
+in
 {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ./networking.nix
-    top.minecraft.nixosModules.minecraft-servers
   ];
 
   greg = {
     home = true;
     gnome.enable = false;
+    nebula = {
+      enable = true;
+      # genesis IS the routing node for the home LAN — it does not route through itself.
+      # Override the module default (which points at genesis) to avoid a routing loop.
+      unsafeRoutes = [ ];
+      # genesis routes the home LAN (10.42.0.0/16) into the Nebula overlay.
+      # Sign genesis's cert with -subnets '10.42.0.0/16' (see secrets/nebula/README.md).
+      routesSubnet = "10.42.0.0/16";
+    };
     proxies = {
     };
   };
@@ -36,121 +61,26 @@
   };
 
   environment.systemPackages = with pkgs; [
-    pkgs'.create_ssl
+    create_ssl
     step-ca
   ];
 
   networking.hostName = "genesis"; # Define your hostname.
 
-  services = {
+  systemd = {
-    minecraft-servers = {
+    services.adblock-update = {
-      enable = true;
+      after = [ "network-online.target" ];
-      eula = true;
+      requires = [ "network-online.target" ];
-      openFirewall = true;
+      script = lib.getExe adblockUpdate;
-
+      serviceConfig.Type = "oneshot";
-      servers = {
-        maya = {
-          enable = true;
-          operators = {
-            Almec = {
-              bypassesPlayerLimit = true;
-              uuid = "7884dc5a-ae21-43d5-9506-a934d59be19a";
-            };
-          };
-          package = pkgs.fabricServers.fabric.override { jre_headless = pkgs.openjdk25_headless; };
-
-          serverProperties = {
-            allow-flight = true;
-            motd = "Maya's Minecraft World";
-            online-mode = true;
-          };
-          whitelist = { };
-
-          jvmOpts = "-Xms4092M -Xmx4092M";
-
-          symlinks = {
-            mods = pkgs.linkFarmFromDrvs "mods" (
-              builtins.attrValues {
-                # Health info
-                appleskin = pkgs.fetchurl {
-                  url = "https://cdn.modrinth.com/data/EsAfCjCV/versions/HwaLJe3v/appleskin-fabric-mc26.1-3.0.9.jar";
-                  hash = "sha256-iNCycR/oxqFpbPGfIcfgfWOm7PzPiIu5AmBWb8asTb4=";
-                };
-                # Needed by survivalfly
-                balm = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/7959/843/balm-fabric-26.1.2-26.1.2.4.jar";
-                  hash = "sha256-zDtDxkxOftpW0wUIap7l6abGCjXNczwrF2wLZDztyA0=";
-                };
-                # Adds more diverse biomes
-                # https://www.curseforge.com/minecraft/mc-mods/biomes-o-plenty
-                biomes = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/7977/180/BiomesOPlenty-fabric-26.1.2-26.1.2.0.3.jar";
-                  hash = "sha256-0aPtsRep0ftbkKqbp69PgUnNJyOBLY9vcPsB1mhOy/M=";
-                };
-                # Automation engines
-                # https://www.curseforge.com/minecraft/mc-mods/create
-                #create = pkgs.fetchurl {
-                #  url = "https://mediafilez.forgecdn.net/files/7963/363/create-1.21.1-6.0.10.jar";
-                #  hash = "sha256-74f+Vwnxuh9bi7IKKSW1r7RmnheP1ti/EMFndZ7v43o=";
-                #};
-                fabric_api = pkgs.fetchurl {
-                  url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/tnmuHGZA/fabric-api-0.146.1%2B26.1.2.jar";
-                  hash = "sha256-8Jy/xmxRtw4z4GJ+38wwbXHVn4NGYp4w/mFvW9cmvKg=";
-                };
-                # Required by biomes-o-plenty
-                # https://www.curseforge.com/minecraft/mc-mods/glitchcore
-                glitchcore = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/7975/608/GlitchCore-fabric-26.1.2-26.1.2.0.0.jar";
-                  hash = "sha256-IDz+TblWvgt4UxFg3L3DhFMEESoX7y5cTOvXhyccQm8=";
-                };
-                # Tooltips
-                # https://www.curseforge.com/minecraft/mc-mods/jade/
-                jade = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/7886/518/Jade-mc26.1-Fabric-26.0.8.jar";
-                  hash = "sha256-Pc3R5eO4Jf+94mNMPtY/vvpbomp+S+qnAUAVbQk1r2Y=";
-                };
-                # Gives info on crafting recipes
-                # https://www.curseforge.com/minecraft/mc-mods/jei
-                jei = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/7920/925/jei-26.1.2-fabric-29.5.0.26.jar";
-                  hash = "sha256-7nF7fXYPIg9the/mxi6pUYEmKtosZO6yL2b0Dgf8+fI=";
-                };
-                # Machines
-                # https://www.curseforge.com/minecraft/mc-mods/mekanism
-                #mekanism = pkgs.fetchurl {
-                #  url = "https://mediafilez.forgecdn.net/files/7904/58/Mekanism-1.21.1-10.7.19.85.jar";
-                #  hash = "sha256-AE28nzEG9NGSrqoe4RkN0W7JyoBZ7T0JO4ADT0xXT0M=";
-                #};
-                # Shows installed mods
-                modmenu = pkgs.fetchurl {
-                  url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/jvjwXH6l/modmenu-18.0.0-alpha.8.jar";
-                  hash = "sha256-u0gtCOVAnNxyHcslo+y9l/jCGsFb+U/Y8soiUilhZDA=";
-                };
-                # Better storage engines
-                # https://www.curseforge.com/minecraft/mc-mods/refined-storage
-                refined-storage = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/8086/588/refinedstorage-fabric-3.0.0.jar";
-                  hash = "sha256-LuOF0aYQon78AQeD5fQ8OXHCnekfa+PNKpH7cqimFNs=";
-                };
-                # https://www.curseforge.com/minecraft/mc-mods/storage-drawers
-                #storagedrawers = pkgs.fetchurl {
-                #url = "https://mediafilez.forgecdn.net/files/7352/799/StorageDrawers-fabric-1.21.11-20.0.0.jar";
-                #hash = "sha256-eBKCmAtjAhdAjOyLMRneu/NZnNt+orIezxPy6V8g/S8=";
-                #};
-                survivalfly = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/7870/312/survivalfly-1.3_fabric-mc26.1.1.jar";
-                  hash = "sha256-Kai4wSxckpXbs1yLp8wJ4BmmjNkdDbeqerqWGIz3+Zk=";
-                };
-                # Also needed by biomes
-                # https://www.curseforge.com/minecraft/mc-mods/terrablender-fabric
-                terrablender = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/7933/873/TerraBlender-fabric-26.1.2-26.1.2.0.1.jar";
-                  hash = "sha256-lUrkmMIod54Qj78H0rzT4EYoEeiBG7w6sVOJlRvsnQ4=";
-                };
-              }
-            );
-          };
     };
+    timers.adblock-update = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-online.target" ];
+      requires = [ "network-online.target" ];
+      timerConfig = {
+        OnCalendar = "daily";
+        Unit = "adblock-update.service";
       };
     };
   };

hosts/unstable/genesis/net/hosts

@@ -22,6 +22,8 @@
 
 # VMs
 10.42.4.1 matrix matrix.thehellings.lan
+#10.42.4.2 vm-jellyfin vm-jellyfin.thehellings.lan
+10.42.4.3 git gitlab git.thehellings.lan gitlab.thehellings.lan
 
 # VIP
 10.42.5.1 longhorn.cluster matrix.cluster pgadmin.cluter postgres.cluster immich.cluster
@@ -35,6 +37,7 @@
 100.88.91.27 dns.home
 100.70.99.91 exodus.home exodus.shire-zebra.ts.net
 100.96.198.104 genesis.home genesis.shire-zebra.ts.net smart.home zwave.home nixcache.home gitcache.home dashy.home uptime.home speed.home
+100.117.28.111 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan
 100.68.203.1 hosea.home hosea.shire-zebra.ts.net grafana.home
 100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net pgadmin.kubernetes longhorn.kubernetes
 100.102.186.39 jeremiah.home jeremiah.shire-zebra.ts.net matrix.kubernetes immich.kubernetes postgres.kubernetes buildbot.home

hosts/unstable/genesis/networking.nix

@@ -1,9 +1,7 @@
 {
   config,
-  lib,
-  lib',
-  metadata,
   pkgs,
+  metadata,
   ...
 }:
 let
@@ -11,6 +9,7 @@ let
   lanIP = metadata.hosts.${config.networking.hostName}.ip;
   iot = "enp2s0";
   iotIP = "192.168.66.250";
+  #routerIP = metadata.infra.gw;
   extraHosts = builtins.readFile ./net/hosts;
 
   proxyPort = 3128;
@@ -22,25 +21,13 @@ let
     #"1.0.0.1" # Cloudflare
     #"149.112.112.112" # Quad 9
     metadata.infra.gw # Currently using our UniFi router for DNS as well
-    "100.100.100.100"
   ];
 in
 {
-  greg = {
+  greg.tailscale = {
-    nebula = {
-      enable = true;
-      # genesis IS the routing node for the home LAN — it does not route through itself.
-      # Override the module default (which points at genesis) to avoid a routing loop.
-      unsafeRoutes = [ ];
-      # genesis routes the home LAN (10.42.0.0/16) into the Nebula overlay.
-      # Sign genesis's cert with -subnets '10.42.0.0/16' (see secrets/nebula/README.md).
-      routesSubnet = "10.42.0.0/16";
-    };
-    tailscale = {
     enable = true;
     tags = [ "home" ];
   };
-  };
 
   # Really, why do I still have to force-disable this crap?
   boot.kernel.sysctl = {
@@ -97,47 +84,32 @@ in
     #########
     # dnsmasq config
     ########
-    bind = {
+    dnsmasq = {
       enable = true;
-      cacheNetworks = [
+      settings = {
-        metadata.infra.lan
+        domain = "thehellings.lan";
-        metadata.infra.tailscale
+        expand-hosts = true;
-        metadata.infra.nebula
+        log-queries = true;
-        "127.0.0.0/8"
+        no-hosts = true; # Do not read /etc/hosts, which makes genesis resolve to 127.0.0.2
-      ];
+        addn-hosts = "/etc/adblock_hosts";
-      zones =
+        hostsdir = "/etc/hosts.d/";
-        let
+        server = dnsServers;
-          makeZoneFile =
+      };
-            hosts: domain:
+    };
-            let
+
-              preamble = [
+    prometheus.exporters = {
-                "$ORIGIN\t${domain}."
+      dnsmasq.enable = true;
-                "$TTL\t1h"
+      blackbox = {
-                "@\tIN\tSOA\t${config.networking.hostName}\tgreg@thehellings.com (1 1m 1m 1m 1m)"
+        enable = true;
-                "\tIN\tNS\t${config.networking.hostName}"
+        openFirewall = true;
-              ];
+        configFile = pkgs.writeText "blackbox.yml" ''
-              makeHost =
+          modules:
-                host:
+            icmp:
-                [ "${host.name}\tIN\tA\t${host.address}" ]
+              prober: icmp
-                ++ lib.map (a: "${a}\tIN\tA\t${host.address}") (
+              timeout: 5s
-                  if builtins.hasAttr "aliases" host then host.aliases else [ ]
+              icmp:
-                );
+                preferred_ip_protocol: ip4
-            in
+        '';
-            pkgs.writeText "${domain}" (
-              builtins.concatStringsSep "\n" (preamble ++ (lib.flatten (lib.map makeHost hosts)) ++ [ "" ])
-            );
-        in
-        lib.mapAttrs
-          (domain: net: {
-            master = true;
-            file = makeZoneFile (lib'.hostsByNet net metadata.hosts) domain;
-          })
-          {
-            #"shire-zebra.ts.net" = "tailscale";
-            "nebula.thehellings.com" = "nebula";
-            nebula = "nebula";
-            "thehellings.lan" = "lan";
-            lan = "lan";
       };
     };
   }; # End of services configuration

hosts/unstable/hosea/arr.nix

@@ -0,0 +1,70 @@
+{
+  lib,
+  metadata,
+  pkgs,
+  ...
+}:
+let
+  ips = lib.filterAttrs (_k: v: v ? "ip" && v.ip != null) metadata.hosts;
+  tps = lib.filterAttrs (_k: v: v ? "ts" && v.ts != null) metadata.hosts;
+  get = field: set: lib.mapAttrsToList (_k: v: v.${field}) set;
+  getTS = get "ts" tps;
+  getIP = get "ip" ips;
+  whitelists = builtins.concatStringsSep "," (
+    [
+      "localhost"
+      "127.0.0.1"
+    ]
+    ++ getTS
+    ++ getIP
+  );
+in
+{
+  services = {
+    prowlarr = {
+      enable = true;
+      dataDir = "/arr/prowlarr";
+      openFirewall = true;
+    };
+    radarr = {
+      enable = true;
+      openFirewall = true;
+    };
+    transmission = {
+      enable = true;
+      openPeerPorts = true;
+      openRPCPort = true;
+      package = pkgs.transmission_4;
+      settings = {
+        download-dir = "/arr/transmission/downloads";
+        rpc-bind-address = "0.0.0.0";
+        rpc-host-whitelist = whitelists;
+        rpc-host-whitelist-enabled = false;
+        rpc-whitelist = whitelists;
+        rpc-whitelist-enabled = false;
+        watch-dir-enabled = true;
+        watch-dir = "/arr/transmission/incoming";
+      };
+    };
+  };
+
+  systemd.mounts =
+    let
+      nfs = name: {
+        what = "nas1.shire-zebra.ts.net:/mnt/all/${name}";
+        type = "nfs";
+        name = "${name}.mount";
+        where = "/${name}";
+        requires = [ "tailscaled-autoconnect.service" ];
+        after = [ "tailscaled-autoconnect.service" ];
+        wantedBy = [ "multi-user.target" ];
+        mountConfig.Options = "_netdev,noexec,timeo=50,retrans=5,soft";
+      };
+    in
+    [
+      (nfs "arr")
+      (nfs "music")
+      (nfs "photos")
+      (nfs "video")
+    ];
+}

hosts/unstable/hosea/default.nix

@@ -6,7 +6,6 @@
   config,
   metadata,
   pkgs,
-  top,
   ...
 }:
 let
@@ -18,32 +17,14 @@ in
 {
   imports = [
     # Include the results of the hardware scan.
+    ./arr.nix
     ./hardware-configuration.nix
-    top.niks3.nixosModules.niks3
   ];
 
-  age.secrets = {
+  age.secrets.grafana-secret-key = {
-    cache-private-key = {
-      file = ../../../secrets/cache-private-key.age;
-      owner = "niks3";
-    };
-    grafana-secret-key = {
     file = ../../../secrets/grafana-secret-key.age;
     owner = "grafana";
   };
-    niks3-access-key-id = {
-      file = ../../../secrets/niks3/access_key_id.age;
-      owner = "niks3";
-    };
-    niks3-api-token = {
-      file = ../../../secrets/niks3/api_token.age;
-      owner = "niks3";
-    };
-    niks3-secret-access-key = {
-      file = ../../../secrets/niks3/secret_access_key.age;
-      owner = "niks3";
-    };
-  };
 
   # Bootloader
   boot = {
@@ -117,7 +98,6 @@ in
         ];
       };
     };
-    firewall.interfaces.nebula0.allowedTCPPorts = [ 5751 ];
     nameservers = [ metadata.infra.dns ];
   };
 
@@ -170,27 +150,6 @@ in
         analytics.reporting_enabled = false;
       };
     };
-    niks3 = {
-      enable = true;
-
-      apiTokenFile = config.age.secrets.niks3-api-token.path;
-      gc.enable = false;
-      httpAddr = "${metadata.hosts.hosea.nebulaIp}:5751";
-      nginx = {
-        enable = true;
-        domain = "hosea.nebula";
-        enableACME = false;
-        forceSSL = false;
-      };
-      s3 = {
-        accessKeyFile = config.age.secrets.niks3-access-key-id.path;
-        bucket = "niks3";
-        endpoint = "nas1.shire-zebra.ts.net:9000";
-        secretKeyFile = config.age.secrets.niks3-secret-access-key.path;
-        useSSL = false;
-      };
-      signKeyFiles = [ config.age.secrets.cache-private-key.path ];
-    };
     prometheus.exporters.graphite.enable = true;
     # Configure keymap
     xserver.xkb = {
@@ -199,25 +158,6 @@ in
     };
   };
 
-  systemd.mounts =
-    let
-      nfs = name: {
-        what = "nas1.shire-zebra.ts.net:/mnt/all/${name}";
-        type = "nfs";
-        name = "${name}.mount";
-        where = "/${name}";
-        requires = [ "tailscaled-autoconnect.service" ];
-        after = [ "tailscaled-autoconnect.service" ];
-        wantedBy = [ "multi-user.target" ];
-        mountConfig.Options = "_netdev,noexec,timeo=50,retrans=5,soft";
-      };
-    in
-    [
-      (nfs "music")
-      (nfs "photos")
-      (nfs "video")
-    ];
-
   # After first deploy: create a Grafana service account + API token for Klaatu
   # via the Grafana UI, then encrypt it: agenix -e secrets/grafana-api-token.age
   age.secrets.grafana-api-token = {

hosts/unstable/isaiah/default.nix

@@ -9,6 +9,14 @@
     ./hardware-configuration.nix
   ];
 
+  age.secrets = {
+    gitea-runner-isaiah-podman.file = ../../../secrets/gitea/runner-isaiah-podman.age;
+    gitea-workerPassword.file = ../../../secrets/gitea/workerPassword.age;
+    runner-reg.file = ../../../secrets/gitlab/kubernetes-k3s-local.age;
+    # TODO: Greg add agenix secret at secrets/gitea-runner-isaiah.age
+    # gitea-runner-isaiah.file = ../../../secrets/gitea-runner-isaiah.age;
+  };
+
   boot = {
     binfmt.emulatedSystems = [ "aarch64-linux" ];
     extraModprobeConfig = "options kvm_amd nested=1";
@@ -43,9 +51,15 @@
       tags = [ "home" ];
     };
     remote-builder.enable = true;
+    runner = {
+      enable = true;
+      qemu = true;
+    };
     gitea-runner = {
       enable = true;
-      extraLabels = [ "bare-metal:host" ];
+      labels = [ "self-hosted" "bare-metal" "host:isaiah" ];
+      # TODO: Greg add agenix secret at secrets/gitea-runner-isaiah.age
+      # tokenFile = config.age.secrets.gitea-runner-isaiah.path;
     };
   };
 
@@ -61,6 +75,41 @@
   };
 
   services = {
+    gitea-actions-runner.instances.podman = {
+      enable = true;
+      labels = [
+        "debian-latest:docker://node:25-trixie"
+
+        "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest"
+        "ubuntu-24.04:docker://docker.gitea.com/runner-images:ubuntu-24.04"
+        "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04"
+
+        "ubuntu-full-latest:docker://ghcr.io/catthehacker/ubuntu:full-latest"
+        "ubuntu-full-24.04:docker://ghcr.io/catthehacker/ubuntu:full-24.04"
+        "ubuntu-full-22.04:docker://ghcr.io/catthehacker/ubuntu:full-22.04"
+
+        "ubuntu-act-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"
+        "ubuntu-act-24.04:docker://ghcr.io/catthehacker/ubuntu:act-24.04"
+        "ubuntu-act-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04"
+
+        "ubuntu-runner-latest:docker://ghcr.io/catthehacker/ubuntu:runner-latest"
+        "ubuntu-runner-24.04:docker://ghcr.io/catthehacker/ubuntu:runner-24.04"
+        "ubuntu-runner-22.04:docker://ghcr.io/catthehacker/ubuntu:runner-22.04"
+
+        "ubuntu-rust-latest:docker://ghcr.io/catthehacker/ubuntu:rust-latest"
+        "ubuntu-rust-24.04:docker://ghcr.io/catthehacker/ubuntu:rust-24.04"
+        "ubuntu-rust-22.04:docker://ghcr.io/catthehacker/ubuntu:rust-22.04"
+
+        "nix-latest:docker://src.thehellings.com/greg/builder:latest"
+      ];
+      name = "isaiah-podman";
+      settings = {
+        container.force_pull = true;
+        runner.capacity = 7;
+      };
+      tokenFile = config.age.secrets.gitea-runner-isaiah-podman.path;
+      url = "https://gitea.shire-zebra.ts.net";
+    };
     k3s.clusterInit = true; # This is the first node in the cluster
     openssh = {
       enable = true;

hosts/unstable/jeremiah/default.nix

@@ -22,11 +22,15 @@ in
   ];
 
   age.secrets = {
+    runner-reg.file = ../../../secrets/gitlab/nixos-qemu-shell.age;
+
     gitea-buildbotWorkersFile = mk ../../../secrets/gitea/buildbotWorkersFile.age;
     gitea-oauthToken = mk ../../../secrets/gitea/oauthToken.age;
     gitea-oauthSecret = mk ../../../secrets/gitea/oauthSecret.age;
     gitea-webhookSecret = mk ../../../secrets/gitea/webhookSecret.age;
     gitea-workerPassword = mk ../../../secrets/gitea/workerPassword.age;
+    # TODO: Greg add agenix secret at secrets/gitea-runner-jeremiah.age
+    # gitea-runner-jeremiah.file = ../../../secrets/gitea-runner-jeremiah.age;
   };
 
   # Bootloader.
@@ -76,10 +80,6 @@ in
   };
 
   greg = {
-    gitea-runner = {
-      enable = true;
-      extraLabels = [ "bare-metal:host" ];
-    };
     home = true;
     kubernetes = {
       enable = true;
@@ -93,6 +93,17 @@ in
       tags = [ "home" ];
     };
     remote-builder.enable = true;
+    runner = {
+      enable = true;
+      threads = 3;
+      qemu = true;
+    };
+    gitea-runner = {
+      enable = true;
+      labels = [ "self-hosted" "bare-metal" "host:jeremiah" ];
+      # TODO: Greg add agenix secret at secrets/gitea-runner-jeremiah.age
+      # tokenFile = config.age.secrets.gitea-runner-jeremiah.path;
+    };
   };
 
   hardware = {
@@ -142,12 +153,12 @@ in
             updateOutputs = false;
           };
         };
-        domain = "${config.networking.hostName}.shire-zebra.ts.net:8010";
+        domain = "${config.networking.hostName}.shire-zebra.ts.net";
         evalMaxMemorySize = 8192;
         evalWorkerCount = 4;
         gitea = {
           enable = true;
-          instanceUrl = "https://gitea.shire-zebra.ts.net";
+          instanceUrl = "https://src.thehellings.com";
           oauthId = "7ec9107d-379b-47c8-870f-1191956d0500";
           oauthSecretFile = config.age.secrets.gitea-oauthSecret.path;
           tokenFile = config.age.secrets.gitea-oauthToken.path;

hosts/unstable/linode/default.nix

@@ -23,14 +23,12 @@
     pgloader
   ];
 
-  greg = {
+  age.secrets = {
-    gitea-runner = {
+    # TODO: Greg add agenix secret at secrets/gitea-runner-linode.age
-      enable = true;
+    # gitea-runner-linode.file = ../../../secrets/gitea-runner-linode.age;
-      extraLabels = [
-        "vps:host"
-        "blog:host"
-      ];
   };
+
+  greg = {
     home = false;
     linode.enable = true;
     nebula = {
@@ -43,6 +41,12 @@
       ssl = true;
     };
     tailscale.enable = true;
+    gitea-runner = {
+      enable = true;
+      labels = [ "self-hosted" "host:linode" ];
+      # TODO: Greg add agenix secret at secrets/gitea-runner-linode.age
+      # tokenFile = config.age.secrets.gitea-runner-linode.path;
+    };
   };
 
   networking = {
@@ -66,4 +70,20 @@
       immichUrl = "https://immich.shire-zebra.ts.net";
     };
   };
+
+  security.sudo.extraRules = [
+    {
+      users = [ "gitlab-runner" ];
+      commands = [
+        {
+          command = "/run/current-system/sw/bin/systemctl";
+          options = [ "NOPASSWD" ];
+        }
+        {
+          command = "/run/current-system/sw/bin/podman";
+          options = [ "NOPASSWD" ];
+        }
+      ];
+    }
+  ];
 }

hosts/unstable/linode/git.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 
 let
   srcDomain = "src.thehellings.com";
@@ -6,23 +6,15 @@ let
 in
 {
   greg.proxies."${srcDomain}" = {
-    target = "http://unix:${config.services.anubis.instances.git.settings.BIND}";
+    target = "https://gitea.shire-zebra.ts.net";
     ssl = true;
     genAliases = false;
     extraConfig = ''
-      #proxy_ssl_verify off;
+      proxy_ssl_verify off;
-      #proxy_ssl_server_name on;
+      proxy_ssl_server_name on;
-
+      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-Ssl on;
-      proxy_set_header X-Http-Version $server_protocol;
-      proxy_set_header User-Agent $http_user_agent;
       client_max_body_size 100000m;
-
-      #proxy_set_header Host $host;
-      #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      #proxy_set_header X-Forwarded-Proto $scheme;
-      #proxy_set_header X-Forwarded-Ssl on;
-
       # Ultimate AI Block List v1.7 20250924
       # https://perishablepress.com/ultimate-ai-block-list/
 
@@ -95,22 +87,18 @@ in
 
   networking.firewall.allowedTCPPorts = [ sshPort ];
 
-  services = {
+  systemd.services = {
-    anubis = {
+    haproxy = {
-      instances = {
+      after = [
-        git = {
+        "network-online.target"
-          enable = true;
+      ];
-          settings = {
+      wants = [
-            BIND = "/run/anubis/anubis-git/anubis.sock";
+        "network-online.target"
-            COOKIE_DOMAIN = "thehellings.com";
+      ];
-            SERVE_ROBOTS_TXT = true;
-            TARGET = "https://gitea.shire-zebra.ts.net/";
-          };
-        };
     };
   };
 
-    haproxy = {
+  services.haproxy = {
     enable = true;
     config = ''
       global
@@ -131,18 +119,4 @@ in
         server git-zeke zeke.shire-zebra.ts.net:32222
     '';
   };
-  };
-
-  systemd.services = {
-    haproxy = {
-      after = [
-        "network-online.target"
-      ];
-      wants = [
-        "network-online.target"
-      ];
-    };
-  };
-
-  users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
 }

hosts/unstable/linode/matrix.nix

@@ -2,24 +2,12 @@
 # them by the following commands:
 # nix run nixpkgs.matrix-synapse
 # register_new_matrix_user -k "B9EoPr2WV9hzwc7uL2Sx1JmvCeKDEOGCpB0uginQcQtEH4wzRtkSIdo7lltrjSQa" http://localhost:8448
-{ config, ... }:
+{ config, lib, ... }:
 let
   domain = "${config.networking.domain}";
   fqdn = "matrix.${domain}";
 in
 {
-  greg.proxies."${fqdn}" = {
-    extraConfig = ''
-      error_log /var/log/nginx/debug.log debug;
-      proxy_ssl_verify off;
-      proxy_ssl_server_name on;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Ssl on;
-    '';
-    genAliases = false;
-    ssl = true;
-    target = "https://matrix.shire-zebra.ts.net";
-  };
   services.nginx = {
     virtualHosts = {
       # Server the '.well-known' files to find the Matrix API server
@@ -56,6 +44,36 @@ in
             return 200 '${builtins.toJSON client}';
           '';
       };
+
+      # Reverse proxy in front of the actual Matrix server
+      "${fqdn}" = {
+        enableACME = true;
+        forceSSL = true;
+
+        extraConfig = ''
+          error_log /var/log/nginx/debug.log debug;
+        '';
+
+        # Not the appropriate place for the chat client
+        locations =
+          (builtins.listToAttrs (
+            builtins.map
+              (
+                val:
+                lib.nameValuePair "/_${val}" {
+                  proxyPass = "http://matrix.kubernetes";
+                }
+              )
+              [
+                "matrix"
+                "synapse"
+                "dendrite"
+              ]
+          ))
+          // {
+            "/".extraConfig = "return 404;";
+          };
+      };
     };
   };
 

hosts/unstable/linode/nextcloud.nix

@@ -13,7 +13,7 @@
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud33;
+    package = pkgs.nextcloud32;
     appstoreEnable = true;
     hostName = "next.${config.networking.domain}";
     https = true;

hosts/unstable/linode/nginx.nix

@@ -24,6 +24,7 @@ in
   virtualisation.oci-containers = {
     backend = "podman";
     containers."homepage" = {
+      # needs explicit port to match what gitlab-runner sees when pulling
       image = "registry.thehellings.com:443/greg/homepage/gregs-homepage:latest";
       ports = [ "${homepage}:80" ];
     };
@@ -34,5 +35,10 @@ in
       ssl = true;
       genAliases = false;
     };
+    "doubles.thehellings.com" = {
+      target = "http://localhost:8081";
+      ssl = true;
+      genAliases = false;
+    };
   };
 }

hosts/unstable/linode/postgres.nix

@@ -1,12 +1,7 @@
-{
+{ config, pkgs, ... }:
-  config,
-  pkgs,
-  pkgs',
-  ...
-}:
 
 {
-  environment.systemPackages = [ pkgs'.upgrade-pg-cluster ];
+  environment.systemPackages = [ pkgs.upgrade-pg-cluster ];
 
   services.postgresql = {
     enable = true;

hosts/unstable/zeke/default.nix

@@ -14,13 +14,15 @@
     top.nix-hardware.nixosModules.system76
   ];
 
+  age.secrets = {
+    gitea-workerPassword.file = ../../../secrets/gitea/workerPassword.age;
+    # TODO: Greg add agenix secret at secrets/gitea-runner-zeke.age
+    # gitea-runner-zeke.file = ../../../secrets/gitea-runner-zeke.age;
+  };
+
   boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
 
   greg = {
-    gitea-runner = {
-      enable = true;
-      extraLabels = [ "bare-metal:host" ];
-    };
     kubernetes = {
       enable = true;
       vipInterface = "enp12s0";
@@ -28,6 +30,16 @@
     };
     nebula.enable = true;
     remote-builder.enable = true;
+    runner = {
+      enable = true;
+      vbox = false;
+    };
+    gitea-runner = {
+      enable = true;
+      labels = [ "self-hosted" "bare-metal" "host:zeke" ];
+      # TODO: Greg add agenix secret at secrets/gitea-runner-zeke.age
+      # tokenFile = config.age.secrets.gitea-runner-zeke.path;
+    };
     tailscale = {
       enable = true;
       tags = [ "home" ];

hosts/unstable/zeke/hardware-configuration.nix

@@ -35,11 +35,10 @@
       device = "/dev/nvme0n1p1";
       fsType = "auto";
     };
-    "/mnt/disk1" = {
+    #"/mnt/disk1" = {
-      device = "/dev/disk/by-uuid/bd04e868-034e-46e8-84ae-cd7347448bbd";
+    #device = "/dev/disk/by-uuid/0bb64e76-8811-499a-b60e-cc97808f2b0e";
-      fsType = "xfs";
+    #fsType = "btrfs";
-      options = [ "nofail" ];
+    #};
-    };
   };
 
   swapDevices = [ ];

hosts/vm/gitlab/default.nix

@@ -0,0 +1,273 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  registryPort = 5000;
+  vpnIp = "100.117.28.111";
+in
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  age.secrets =
+    let
+      cfg = n: {
+        file = ../../../secrets/gitlab/${n}.age;
+        owner = "gitlab";
+        group = "gitlab";
+        mode = "0444";
+      };
+    in
+    {
+      gitlab-secret = cfg "secret";
+      gitlab-otp = cfg "otp";
+      gitlab-db = cfg "db";
+      gitlab-db-password = cfg "db-password";
+      gitlab-jws = cfg "jws";
+      gitlab-key = cfg "key";
+      gitlab-cert = cfg "cert";
+      gitlab-salt = cfg "salt";
+      gitlab-primary-key = cfg "primary-key";
+      gitlab-deterministic-key = cfg "deterministic-key";
+
+      minio_access_key_id = {
+        file = ../../../secrets/minio_access_key_id.age;
+        owner = "gitlab";
+        group = "gitlab";
+        mode = "0444";
+      };
+      minio_secret_access_key = {
+        file = ../../../secrets/minio_secret_access_key.age;
+        owner = "gitlab";
+        group = "gitlab";
+        mode = "0444";
+      };
+    };
+
+  greg = {
+    backup.jobs.nas-backup = {
+      src = "/var/gitlab/state/backup/";
+      dest = "gitlab";
+    };
+    home = true;
+    tailscale = {
+      enable = true;
+      tags = [ "home" ];
+    };
+  };
+
+  networking = {
+    hostName = "gitlab"; # Define your hostname.
+    firewall.allowedTCPPorts = [
+      80
+      registryPort
+    ];
+  };
+
+  services = {
+    gitlab = {
+      enable = true;
+      backup = {
+        keepTime = 288;
+        startAt = [ "03:00" ];
+      };
+      databaseHost = "postgres.kubernetes";
+      databaseName = "gitlab";
+      databaseUsername = "gitlab";
+      databasePasswordFile = config.age.secrets.gitlab-db-password.path;
+      databaseCreateLocally = false;
+      extraConfig = {
+        registry.port = null;
+        gitlab = {
+          trustedProxies = [
+            "${vpnIp}/32" # The system itself
+            "100.109.86.8/32" # Public server's IP
+          ];
+        };
+        object_store = {
+          enabled = true;
+          proxy_download = true; # Tell them to reach out to object storage themselves!
+          connection = {
+            provider = "AWS";
+            endpoint = "http://s3.thehellings.lan:9000";
+            region = "us-east-1";
+            aws_access_key_id = {
+              _secret = config.age.secrets.minio_access_key_id.path;
+            };
+            aws_secret_access_key = {
+              _secret = config.age.secrets.minio_secret_access_key.path;
+            };
+            path_style = true; # True for MinIO
+            aws_signature_version = 2;
+          };
+          #storage_options = ...;
+          objects = builtins.listToAttrs (
+            builtins.map
+              (
+                x: lib.attrsets.nameValuePair x { bucket = "gitlab-${builtins.replaceStrings [ "_" ] [ "-" ] x}"; }
+              )
+              [
+                "artifacts"
+                "ci_secure_files"
+                "dependency_proxy"
+                "external_diffs"
+                "lfs"
+                "packages"
+                "pages"
+                "terraform_state"
+                "uploads"
+              ]
+          );
+        };
+      };
+      host = "src.thehellings.com";
+      https = true;
+      initialRootEmail = "greg@thehellings.com";
+      initialRootPasswordFile = pkgs.writeText "initialRootPassword" "root_password";
+      pages = {
+        enable = true;
+        settings.pages-domain = "pages.thehellings.com";
+      };
+      port = 443;
+      puma = {
+        threadsMax = 6;
+        threadsMin = 2;
+        workers = 6;
+      };
+      redisUrl = "unix:${config.services.redis.servers.gitlab.unixSocket}";
+      registry = {
+        enable = true;
+        certFile = config.age.secrets.gitlab-cert.path;
+        keyFile = config.age.secrets.gitlab-key.path;
+        externalAddress = "registry.thehellings.com";
+        externalPort = 443;
+      };
+      secrets = {
+        activeRecordDeterministicKeyFile = config.age.secrets.gitlab-deterministic-key.path;
+        activeRecordPrimaryKeyFile = config.age.secrets.gitlab-primary-key.path;
+        activeRecordSaltFile = config.age.secrets.gitlab-salt.path;
+        dbFile = config.age.secrets.gitlab-db.path;
+        jwsFile = config.age.secrets.gitlab-jws.path;
+        otpFile = config.age.secrets.gitlab-otp.path;
+        secretFile = config.age.secrets.gitlab-secret.path;
+      };
+    };
+
+    nginx = {
+      enable = true;
+      clientMaxBodySize = "25000m";
+      virtualHosts = {
+        "vm-gitlab.shire-zebra.ts.net" = {
+          listen = [
+            {
+              addr = "0.0.0.0";
+              port = 443;
+              ssl = true;
+            }
+          ];
+          locations."/" = {
+            proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+            recommendedProxySettings = true;
+          };
+          extraConfig = ''
+            ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ;
+            ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ;
+            client_max_body_size 10000m ;
+          '';
+        };
+        "registry" = {
+          listen = [
+            {
+              addr = "0.0.0.0";
+              port = registryPort;
+              ssl = true;
+            }
+          ];
+          locations."/" = {
+            proxyPass = "http://127.0.0.1:4567/";
+            recommendedProxySettings = true;
+          };
+          extraConfig = ''
+            ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ;
+            ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ;
+            client_max_body_size 25000m ;
+          '';
+          serverAliases = [
+            "vm-gitlab.shire-zebra.ts.net"
+          ];
+        };
+      };
+    };
+
+    openssh.enable = true;
+
+    postgresql.enable = true;
+
+    qemuGuest.enable = true;
+
+    redis.servers.gitlab = {
+      enable = true;
+    };
+
+    #resolved.enable = true;
+  };
+
+  # Do not start nginx until we have tailscaled up and running, so it can bind
+  # to the 100.* addresses
+  systemd = {
+    services = {
+      certRefresh =
+        let
+          script = pkgs.writeShellApplication {
+            name = "cert-refresh";
+            runtimeInputs = [ pkgs.tailscale ];
+
+            text = ''
+              cd /etc/certs
+              tailscale cert vm-gitlab.shire-zebra.ts.net
+              chown nginx ./*
+              systemctl reload nginx
+            '';
+          };
+        in
+        {
+          script = lib.getExe script;
+          serviceConfig = {
+            Type = "oneshot";
+            User = "root";
+          };
+        };
+
+      nginx = rec {
+        after = [ "network-online.target" ];
+        requires = [ "network-online.target" ];
+        wants = after;
+        serviceConfig = {
+          RestartMaxDelaySec = "30s";
+          RestartSteps = "5";
+        };
+      };
+      tailscaled.partOf = [ "network-online.target" ];
+    };
+
+    timers = {
+      "cert-refresh" = {
+        wantedBy = [ "cert-refresh.service" ];
+        timerConfig = {
+          OnCalendar = "monthly";
+          Persistent = true;
+        };
+      };
+    };
+  };
+  system.stateVersion = lib.mkForce "24.11";
+}

hosts/vm/gitlab/hardware-configuration.nix

@@ -0,0 +1,58 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  lib,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  # Bootloader.
+  boot = {
+    extraModulePackages = [ ];
+    initrd = {
+      availableKernelModules = [
+        "uhci_hcd"
+        "ehci_pci"
+        "ahci"
+        "virtio_pci"
+        "virtio_scsi"
+        "sd_mod"
+        "sr_mod"
+      ];
+      kernelModules = [ ];
+    };
+    loader = {
+      efi.canTouchEfiVariables = true;
+      systemd-boot.enable = true;
+    };
+  };
+
+  fileSystems."/" = {
+    device = lib.mkDefault "/dev/disk/by-uuid/1fdbe86e-ce6f-4af3-a876-aec35731adab";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/1E6A-C3BB";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
+}

lib/default.nix

@@ -1,25 +0,0 @@
-{ lib, ... }:
-{
-  hostsByNet =
-    net: hosts:
-    let
-      netAttr =
-        {
-          lan = "ip";
-          nebula = "nebulaIp";
-          tailscale = "ts";
-        }
-        .${net};
-    in
-    lib.mapAttrsToList
-      (name: value: {
-        inherit name;
-        address = builtins.getAttr netAttr value;
-        aliases = lib.optionals (builtins.hasAttr "aliases" value) (builtins.getAttr "aliases" value);
-      })
-      (
-        lib.filterAttrs (
-          _host: settings: (builtins.hasAttr netAttr settings) && (builtins.getAttr netAttr settings) != null
-        ) hosts
-      );
-}

manifests/auto/nodes.yaml

@@ -40,7 +40,7 @@ metadata:
         },
         {
           "path": "/mnt/disk1",
-          "allowScheduling": true,
+          "allowScheduling": false,
           "tags": ["hdd", "large"]
         }
       ]

manifests/auto/operator-oauth.yaml

@@ -1,36 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: tailscale
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: tailscale
-  namespace: tailscale
-spec:
-  interval: "24h"
-  url: "https://pkgs.tailscale.com/helmcharts"
----
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: tailscale
-  namespace: tailscale
-spec:
-  interval: 10m
-  dependsOn:
-    - name: external-secrets
-      namespace: external-secrets
-  chart:
-    spec:
-      chart: tailscale-operator
-      version: "1.96.5"
-      sourceRef:
-        kind: HelmRepository
-        name: tailscale
-      interval: "1h"
----
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:

manifests/bitwarden/deployment.yaml

@@ -21,6 +21,9 @@ spec:
     spec:
       containers:
         - name: bitwarden-cli
+          # Since my gitlab instance depends on the database hosted in k3s, and
+          # the database depends on this image, I need a way to bootstrap the
+          # system if # I am doing disaster recovery. And this is it.
           image: "ghcr.io/greg-hellings/nixos-config/img-bitwarden:latest"
           #image: >-
           #  registry.thehellings.com/greg/nixos-config/img-bitwarden:latest

manifests/dashboard/chart.yaml

@@ -1,21 +1,32 @@
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
-  name: headlamp
+  name: kubernetes-dashboard
 spec:
-  url: "https://kubernetes-sigs.github.io/headlamp/"
+  url: https://kubernetes.github.io/dashboard/
   interval: "24h"
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
-  name: headlamp
+  name: kubernetes-dashboard
 spec:
   interval: "24h"
   chart:
     spec:
-      chart: headlamp
+      chart: kubernetes-dashboard
       sourceRef:
         kind: HelmRepository
-        name: headlamp
+        name: kubernetes-dashboard
       interval: "24h"
+  values:
+    app:
+      settings:
+        global:
+          clusterName: Hellings Home
+          itemsPerPage: 25
+      ingress:
+        enabled: true
+        hosts:
+          - dashboard.shire-zebra.ts.net
+        ingressClassName: tailscale

manifests/dashboard/ingress.yaml

@@ -1,14 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: dashboard-tailscale
-spec:
-  ingressClassName: tailscale
-  defaultBackend:
-    service:
-      name: headlamp
-      port:
-        number: 3001
-  tls:
-    - hosts:
-        - headlamp

manifests/dashboard/kustomization.yaml

@@ -4,4 +4,3 @@ resources:
   - namespace.yaml
   - chart.yaml
   - user.yaml
-  - ingress.yaml

manifests/databases/immich.yaml

@@ -0,0 +1,89 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Cluster
+metadata:
+  name: immich
+spec:
+  imageName: "ghcr.io/corentingiraud/cnpg-pgvector-vectorchord:16-migration"
+  #imageName: "ghcr.io/tensorchord/cloudnative-pgvecto.rs:16-v0.3.0"
+  #postgresUID: 1
+  instances: 1
+  storage:
+    size: 60Gi
+  primaryUpdateStrategy: unsupervised
+  postgresql:
+    shared_preload_libraries:
+      - vectors.so
+      - vchord.so
+
+  bootstrap:
+    recovery:
+      source: origin
+    # initdb:
+    #   database: immich
+    #   owner: immich
+    #   secret:
+    #     name: postgres-user-immich
+    #   dataChecksums: true
+    #   postInitApplicationSQL:
+    #     - ALTER SYSTEM SET search_path TO "$user", public, vectors;
+    #     - SET search_path TO "$user", public, vectors;
+    #     - CREATE EXTENSION IF NOT EXISTS "cube";
+    #     - CREATE EXTENSION IF NOT EXISTS "earthdistance";
+    #     - GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "immich";
+
+  externalClusters:
+    - name: origin
+      plugin:
+        name: barman-cloud.cloudnative-pg.io
+        parameters:
+          barmanObjectName: k3sbackup-objectstore
+          serverName: pgvector
+
+  managed:
+    roles:
+      - name: immich
+        ensure: present
+        comment: Immich DB user
+        login: true
+        superuser: true
+        passwordSecret:
+          name: postgres-user-immich
+
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: k3sbackup-objectstore
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: database-immich
+spec:
+  name: immich
+  owner: immich
+  cluster:
+    name: immich
+  extensions:
+    - name: vectors
+      ensure: present
+    - name: vectorchord
+      ensure: present
+    - name: cube
+      ensure: present
+    - name: earthdistance
+      ensure: present
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: ScheduledBackup
+metadata:
+  name: immich-backup
+spec:
+  immediate: true # Create one when this is added to the cluster
+  schedule: "0 2 0 * * *" # 1AM, nightly
+  backupOwnerReference: self
+  cluster:
+    name: immich
+  method: plugin
+  pluginConfiguration:
+    name: barman-cloud.cloudnative-pg.io

manifests/databases/ingress.yaml

@@ -14,12 +14,14 @@ spec:
       - 100.88.91.27 # dns?
       - 100.80.99.48 # exodus
       - 100.88.91.27 # genesis
+      - 100.117.28.111 # gitlab
       - 100.68.203.1 # hosea
       - 100.84.183.79 # isaiah
       - 100.102.186.39 # jeremiah
       - 100.90.74.19 # zeke
       - 100.115.57.8 # linode
       - 100.65.5.38 # matrix
+      #- 100.127.55.22 # jellyfin
 ---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRouteTCP

manifests/databases/kustomization.yaml

@@ -4,6 +4,8 @@ resources:
   - namespace.yaml
   - secrets.yaml
   - postgres-cluster.yaml
+  - postgres-gitlab.yaml
   - postgres-pgadmin.yaml
   - postgres-matrix.yaml
+  - immich.yaml
   - ingress.yaml

manifests/databases/postgres-cluster.yaml

@@ -11,6 +11,13 @@ spec:
 
   managed:
     roles:
+      - name: gitlab
+        ensure: present
+        comment: Gitlab user
+        login: true
+        superuser: false
+        passwordSecret:
+          name: postgres-user-gitlab
       - name: pgadmin
         ensure: present
         comment: PG Admin user

manifests/databases/postgres-gitlab.yaml

@@ -0,0 +1,9 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: database-gitlab
+spec:
+  name: gitlab
+  owner: gitlab
+  cluster:
+    name: postgres

manifests/databases/secrets.yaml

@@ -1,5 +1,39 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
+metadata:
+  name: postgres-user-gitlab
+  namespace: db
+spec:
+  target:
+    name: postgres-user-gitlab
+    deletionPolicy: Delete
+    template:
+      type: Opaque
+      data:
+        username: |-
+          {{ .username }}
+        password: |-
+          {{ .password }}
+  data:
+    - secretKey: username
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 5282ad16-c2dc-49d3-8fb3-b2e9012bab57
+        property: username
+    - secretKey: password
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 5282ad16-c2dc-49d3-8fb3-b2e9012bab57
+        property: password
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
 metadata:
   name: postgres-user-matrix
   namespace: db
@@ -99,3 +133,37 @@ spec:
       remoteRef:
         key: 685b29c6-9264-4e60-ba4a-b2ea005a5d7b
         property: password
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: postgres-user-immich
+  namespace: db
+spec:
+  target:
+    name: postgres-user-immich
+    deletionPolicy: Delete
+    template:
+      type: Opaque
+      data:
+        username: |-
+          {{ .username }}
+        password: |-
+          {{ .password }}
+  data:
+    - secretKey: username
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 5ce63e26-dd7f-46d4-b7ed-b310002ef93f
+        property: username
+    - secretKey: password
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 5ce63e26-dd7f-46d4-b7ed-b310002ef93f
+        property: password

manifests/gitea-runner/chart.yaml

@@ -1,56 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: gitea
-spec:
-  interval: "24h"
-  url: https://dl.gitea.com/charts/
----
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: gitea-runner
-  namespace: gitea-runner
-spec:
-  interval: 10m
-  chart:
-    spec:
-      chart: actions
-      version: "0.0.4"
-      sourceRef:
-        kind: HelmRepository
-        name: gitea
-      interval: "1h"
-  values:
-    rbac:
-      create: true
-    serviceAccount:
-      create: true
-    gitea:
-      instanceURL: https://src.thehellings.com
-      runnerToken:
-        existingSecret: gitea-runner
-        existingSecretKey: token
-    imagePullSecrets:
-      - name: image-pull-secrets
-    config:
-      runner:
-        labels:
-          # Ubuntu
-          - "ubuntu-22.04:docker://ubuntu:22.04"
-          - "ubuntu-24.04:docker://ubuntu:24.04"
-          - "ubuntu-24.10:docker://ubuntu:24.10"
-          # Fedora
-          - "fedora-41:docker://fedora:41"
-          - "fedora-42:docker://fedora:42"
-          # CentOS Stream
-          - "centos-stream-9:docker://quay.io/centos/centos:stream9"
-          - "centos-stream-10:docker://quay.io/centos/centos:stream10"
-          # Nix
-          - "nix:docker://nixos/nix:latest"
-          # ci-images (internal registry: src.thehellings.com/greg)
-          - "ci-builder:docker://src.thehellings.com/greg/builder:latest"
-          - "ci-vm-test:docker://src.thehellings.com/greg/vm-test:latest"
-          - "ci-sword:docker://src.thehellings.com/greg/sword-container-builder:latest"
-          - "ci-bitwarden:docker://src.thehellings.com/greg/bitwarden:latest"
-          - "ci-immich:docker://src.thehellings.com/greg/immich:latest"

manifests/gitea-runner/secrets.yaml

@@ -1,18 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: gitea-runner
-  namespace: gitea-runner
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: bitwarden-login
-    kind: ClusterSecretStore
-  target:
-    name: gitea-runner
-    creationPolicy: Owner
-  data:
-    - secretKey: token
-      remoteRef:
-        key: 11419680-5338-4f19-bdd9-b422007046af
-        property: password

manifests/gitea/chart.yaml

@@ -15,7 +15,7 @@ spec:
   chart:
     spec:
       chart: gitea
-      version: "12.6.0"
+      version: "12.5.0"
       sourceRef:
         kind: HelmRepository
         name: gitea-repository
@@ -35,7 +35,7 @@ spec:
       storageClass: longhorn-default
 
     image:
-      tag: "1.26.2"
+      tag: "1.25.4"
 
     replicaCount: 1
 
@@ -66,8 +66,8 @@ spec:
           APP_NAME: "Gitea: Greg's Cup of Git"
           RUN_MODE: dev
         server:
-          DOMAIN: "shire-zebra.ts.net"
+          DOMAIN: "thehellings.com"
-          ROOT_URL: "https://gitea.shire-zebra.ts.net"
+          ROOT_URL: "https://src.thehellings.com"
           SSH_PORT: "2222"
         database:
           DB_TYPE: postgres

manifests/gitea/dump-cronjob.yaml

@@ -64,8 +64,6 @@ spec:
                   mountPath: /dump-staging
                   readOnly: true
               env:
-                - name: MC_CONFIG_DIR
-                  value: /tmp/.mc
                 - name: MINIO_ACCESS_KEY
                   valueFrom:
                     secretKeyRef:

manifests/gitea/secrets.yaml

@@ -13,10 +13,10 @@ spec:
           USER={{ .dbuser }}
           PASSWD="""{{ .dbpass }}"""
         storage: |-
-          MINIO_ACCESS_KEY_ID={{ .minio_nas1_key }}
+          MINIO_ACCESS_KEY_ID={{ .minio_key }}
-          MINIO_SECRET_ACCESS_KEY={{ .minio_nas1_secret }}
+          MINIO_SECRET_ACCESS_KEY={{ .minio_secret }}
-        #minio_key: "{{ .minio_nas1_key }}"
+        minio_key: "{{ .minio_key }}"
-        #minio_secret: "{{ .minio_nas1_secret }}"
+        minio_secret: "{{ .minio_secret }}"
   secretStoreRef:
     name: bitwarden-login
     kind: ClusterSecretStore
@@ -30,15 +30,6 @@ spec:
       remoteRef:
         key: dcbcf704-7dce-48d7-bbd1-b3a801875b3d
         property: password
-    # MinIO credentials for NAS1
-    - secretKey: minio_nas1_key
-      remoteRef:
-        key: c4c66ab3-2ade-4086-9c0d-b3a80172b1ba
-        property: username
-    - secretKey: minio_nas1_secret
-      remoteRef:
-        key: c4c66ab3-2ade-4086-9c0d-b3a80172b1ba
-        property: password
     # Postgres credentials
     - secretKey: dbuser
       remoteRef:

manifests/gitlab-runner/chart.yaml

@@ -0,0 +1,64 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: gitlab-runner
+spec:
+  interval: "24h"
+  url: https://charts.gitlab.io
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: gitlab-runner
+spec:
+  interval: 10m
+  chart:
+    spec:
+      chart: gitlab-runner
+      version: "0.83.1"
+      sourceRef:
+        kind: HelmRepository
+        name: gitlab-runner
+      interval: "1h"
+  dependsOn:
+    - name: external-secrets
+      namespace: external-secrets
+    - name: tailscae
+      namespace: tailscale
+  values:
+    crds:
+      create: true
+    includeCRDs: true
+    gitlabUrl: https://src.thehellings.com
+    runners:
+      secret: gitlab-runner
+    imagePullSecrets:
+      - name: image-pull-secrets
+    rbac:
+      create: true
+    serviceAccount:
+      create: true
+    metrics:
+      enabled: true
+    extraEnv:
+      CACHE_TYPE: s3
+      CACHE_SHARED: "true"
+      CACHE_S3_BUCKET_NAME: gitlab-runner-cache
+      CACHE_S3_INSECURE: "true"
+    extraEnvFrom:
+      PACKER_GITHUB_API_TOKEN:
+        secretKeyRef:
+          name: gitlab-runner
+          key: PACKER_GITHUB_API_TOKEN
+      CACHE_S3_SERVER_ADDRESS:
+        secretKeyRef:
+          name: gitlab-runner
+          key: CACHE_S3_SERVER_ADDRESS
+      CACHE_S3_ACCESS_KEY:
+        secretKeyRef:
+          name: s3-access
+          key: username
+      CACHE_S3_SECRET_KEY:
+        secretKeyRef:
+          name: s3-access
+          key: password

manifests/gitlab-runner/kustomization.yaml

@@ -1,4 +1,4 @@
-namespace: gitea-runner
+namespace: gitlab-runner
 
 resources:
   - namespace.yaml

manifests/gitlab-runner/namespace.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: gitea-runner
+  name: gitlab-runner

manifests/gitlab-runner/secrets.yaml

@@ -0,0 +1,101 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: gitlab-runner
+  namespace: gitlab-runner
+spec:
+  secretStoreRef:
+    name: bitwarden-fields
+    kind: ClusterSecretStore
+  target:
+    name: gitlab-runner
+    deletionPolicy: Delete
+    template:
+      type: Opaque
+      data:
+        runner-registration-token: ""
+        runner-token: "{{ .runnerToken }}"
+        PACKER_GITHUB_API_TOKEN: "{{ .PACKER_GITHUB_API_TOKEN }}"
+        CACHE_S3_SERVER_ADDRESS: "{{ .CACHE_S3_SERVER_ADDRESS }}"
+  data:
+    - secretKey: runnerToken
+      remoteRef:
+        key: &key 53719920-b100-4355-8c80-b2f9002fad22
+        property: CI_SERVER_TOKEN
+    - secretKey: PACKER_GITHUB_API_TOKEN
+      remoteRef:
+        key: *key
+        property: PACKER_GITHUB_API_TOKEN
+    - secretKey: CACHE_S3_SERVER_ADDRESS
+      remoteRef:
+        key: *key
+        property: CACHE_S3_SERVER_ADDRESS
+        # Includes
+        # CI_SERVER_TOKEN
+        # PACKER_GITHUB_API_TOKEN
+        # CACHE_S3_SERVER_ADDRESS
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: s3-access
+  namespace: gitlab-runner
+spec:
+  secretStoreRef:
+    name: bitwarden-login
+    kind: ClusterSecretStore
+  target:
+    name: s3-access
+    deletionPolicy: Delete
+  data:
+    - secretKey: username
+      remoteRef:
+        key: &key 04dd39c2-268d-4a33-aa4c-b1550166139f
+        property: username
+    - secretKey: password
+      remoteRef:
+        key: *key
+        property: password
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: image-pull-secrets
+  namespace: gitlab-runner
+spec:
+  secretStoreRef:
+    name: bitwarden-login
+    kind: ClusterSecretStore
+  target:
+    deletionPolicy: Delete
+    template:
+      type: kubernetes.io/dockerconfigjson
+      data:
+        .dockerconfigjson: >-
+          {
+            "auths": {
+              "https://index.docker.io/v1/": {
+                "username": "{{ .user }}",
+                "password": "{{ .password }}",
+                "email": "greg.hellings@gmail.com",
+                "auth": "{{ .auth }}"
+              }
+            }
+          }
+  data:
+    - secretKey: user
+      remoteRef:
+        key: &key f560ae38-368c-4e58-898c-aeb90012d597
+        property: username
+    - secretKey: password
+      remoteRef:
+        key: *key
+        property: password
+    - secretKey: auth
+      sourceRef:
+        storeRef:
+          name: bitwarden-fields
+          kind: ClusterSecretStore
+      remoteRef:
+        key: *key
+        property: auth

manifests/helm/external-secrets.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: external-secrets
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: external-secrets
-  namespace: external-secrets
-spec:
-  interval: "24h"
-  url: "https://charts.external-secrets.io/"
----
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: external-secrets
-  namespace: external-secrets
-spec:
-  interval: 10m
-  chart:
-    spec:
-      chart: external-secrets
-      version: "2.3.0"
-      sourceRef:
-        kind: HelmRepository
-        name: external-secrets
-      interval: "1h"
-  values:
-    crds:
-      create: true
-    includeCRDs: true
-    webhook:
-      certManager:
-        enable: true

manifests/helm/kustomization.yaml

@@ -1,6 +1,3 @@
 resources:
-  - kyverno.yaml
-  - external-secrets.yaml
-  - tailscale.yaml
   - longhorn.yaml # Needed for storage
   - traefik.yaml

manifests/helm/kyverno.yaml

@@ -1,40 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kyverno-system
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: kyverno
-  namespace: kyverno-system
-spec:
-  interval: "24h"
-  url: "https://kyverno.github.io/kyverno/"
----
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: kyverno
-  namespace: kyverno-system
-spec:
-  interval: 10m
-  chart:
-    spec:
-      chart: kyverno
-      version: "3.7.1"
-      sourceRef:
-        kind: HelmRepository
-        name: kyverno
-      interval: "1h"
-  values:
-    admissionController:
-      replicas: 3
-    backgroundController:
-      replicas: 3
-    cleanupController:
-      replicas: 2
-    reportsController:
-      replicas: 2
-    crds:
-      install: true

manifests/helm/longhorn.yaml

@@ -19,15 +19,10 @@ metadata:
   namespace: longhorn-system
 spec:
   interval: 10m
-  dependsOn:
-    - name: tailscale
-      namespace: tailscale
-    - name: kyverno
-      namespace: kyverno-system
   chart:
     spec:
       chart: longhorn
-      version: "1.11.2"
+      version: "1.10.2"
       sourceRef:
         kind: HelmRepository
         name: longhorn

manifests/immich/backup.yaml

@@ -46,11 +46,11 @@ spec:
   data:
     - secretKey: minio_key
       remoteRef:
-        key: c4c66ab3-2ade-4086-9c0d-b3a80172b1ba
+        key: dcbcf704-7dce-48d7-bbd1-b3a801875b3d
         property: username
     - secretKey: minio_secret
       remoteRef:
-        key: c4c66ab3-2ade-4086-9c0d-b3a80172b1ba
+        key: dcbcf704-7dce-48d7-bbd1-b3a801875b3d
         property: password
 ---
 apiVersion: v1
@@ -96,7 +96,6 @@ spec:
                 - /bin/sh
                 - "-c"
                 - >-
-                  rm -r /staging/*;
                   immich-go
                   archive
                   "--write-to-folder"

manifests/immich/chart.yaml

@@ -32,9 +32,9 @@ spec:
         containers:
           main:
             image:
-              tag: v2.7.5
+              tag: v2.4.1
             env:
-              DB_HOSTNAME: immich-rw
+              DB_HOSTNAME: immich-rw.db.svc.cluster.local
               DB_DATABASE_NAME: immich
               DB_USERNAME:
                 valueFrom:

manifests/immich/database.yaml

@@ -1,161 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: immich
-spec:
-  imageName: "ghcr.io/tensorchord/cloudnative-vectorchord:18"
-  #postgresUID: 1
-  instances: 1
-  storage:
-    size: 60Gi
-  primaryUpdateStrategy: unsupervised
-  postgresql:
-    shared_preload_libraries:
-      - vchord.so
-
-  bootstrap:
-    # Use these with the name "immich-1" to restore from the backups
-    recovery:
-      source: origin
-    # Use these two lines in order to restore from the other database,
-    # once it has restored from the WALs
-    #pg_basebackup:
-    #  source: restore
-    # Use this block to bootstrap the cluster, if you don't have backups.
-    # What are you doing without backups, you chump?!
-    # initdb:
-    #   database: immich
-    #   owner: immich
-    #   secret:
-    #     name: postgres-user-immich
-    #   dataChecksums: true
-    #   postInitApplicationSQL:
-    #     - ALTER SYSTEM SET search_path TO "$user", public, vectors;
-    #     - SET search_path TO "$user", public, vectors;
-    #     - CREATE EXTENSION IF NOT EXISTS "cube";
-    #     - CREATE EXTENSION IF NOT EXISTS "earthdistance";
-    #     - GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "immich";
-
-  externalClusters:
-    - name: origin
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: k3sbackup-objectstore
-          serverName: immich
-    - name: restore
-      connectionParameters:
-        host: immich-1-rw
-        user: streaming_replica
-        sslmode: verify-full
-      sslCert:
-        name: immich-1-replication
-        key: tls.crt
-      sslKey:
-        name: immich-1-replication
-        key: tls.key
-      sslRootCert:
-        name: immich-1-ca
-        key: ca.crt
-
-  managed:
-    roles:
-      - name: immich
-        ensure: present
-        comment: Immich DB user
-        login: true
-        superuser: true
-        passwordSecret:
-          name: postgres-user-immich
-
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: k3sbackup-objectstore
----
-apiVersion: postgresql.cnpg.io/v1
-kind: Database
-metadata:
-  name: database-immich
-spec:
-  name: immich
-  owner: immich
-  cluster:
-    name: immich
-  extensions:
-    - name: vectors
-      ensure: present
-    - name: vectorchord
-      ensure: present
-    - name: cube
-      ensure: present
-    - name: earthdistance
-      ensure: present
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: k3sbackup-externalsecret
-spec:
-  target:
-    name: k3sbackup-secret
-    deletionPolicy: Delete
-    template:
-      type: Opaque
-      data:
-        username: |-
-          {{ .username }}
-        password: |-
-          {{ .password }}
-  data:
-    - secretKey: username
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 685b29c6-9264-4e60-ba4a-b2ea005a5d7b
-        property: username
-    - secretKey: password
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 685b29c6-9264-4e60-ba4a-b2ea005a5d7b
-        property: password
-
----
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: k3sbackup-objectstore
-spec:
-  configuration:
-    destinationPath: "s3://k3sbackup/postgres"
-    endpointURL: "http://chronicles.thehellings.lan:9000/"
-    s3Credentials:
-      accessKeyId:
-        name: k3sbackup-secret
-        key: username
-      secretAccessKey:
-        name: k3sbackup-secret
-        key: password
-    wal:
-      compression: gzip
-  retentionPolicy: "30d"
----
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: immich-backup
-spec:
-  immediate: false # Create one when this is added to the cluster
-  schedule: "0 2 0 * * *" # 1AM, nightly
-  backupOwnerReference: self
-  cluster:
-    name: immich
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io

manifests/immich/kustomization.yaml

@@ -2,9 +2,8 @@ namespace: immich
 
 resources:
   - namespace.yaml
-  - postgres-user-secret.yaml
-  - database.yaml
   - chart.yaml
+  - postgres-user-secret.yaml
   - pvc.yaml
   - ingress.yaml
   - backup.yaml

manifests/kustomization.yaml

@@ -7,6 +7,7 @@ resources:
   - mariadb-operator
   - databases
   - matrix
+  #- gitlab-runner
   - immich
   - monitoring
   - pinchflat

manifests/mariadb-operator/chart.yaml

@@ -19,7 +19,6 @@ spec:
         kind: HelmRepository
         name: mariadb-operator
       interval: "1h"
-      version: "26.3.0"
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -34,7 +33,6 @@ spec:
         kind: HelmRepository
         name: mariadb-operator
       interval: "1h"
-      version: "26.3.0"
   dependsOn:
     - name: mariadb-operator-crds
     - name: longhorn

manifests/mariadb-operator/databases.yaml

@@ -11,7 +11,6 @@ spec:
         kind: HelmRepository
         name: mariadb-operator
       interval: "1h"
-      version: "26.3.0"
   dependsOn:
     - name: mariadb-operator-crds
     - name: mariadb-operator

modules/hm/gui.nix

@@ -158,8 +158,6 @@ in
                   "https://thehellings.com"
                 else
                   "https://kuma.shire-zebra.ts.net/";
-              "devtools.debugger.remote-enabled" = true;
-              "devtools.debugger.remote-port" = 9222;
               "doh-rollout.doorhanger-decision" = "UIDisabled";
               "doh-rollout.doneFirstRun" = true;
               "signon.rememberSignons" = false;

modules/hm/gui/bookmarks.nix

@@ -35,23 +35,6 @@
           }
         ];
       }
-      {
-        name = "Lithic";
-        bookmarks = [
-          {
-            name = "Okta";
-            url = "https://privacy.okta.com";
-          }
-          {
-            name = "Jira";
-            url = "https://lithichq.atlassian.net";
-          }
-          {
-            name = "Notion";
-            url = "https://www.notion.so/lithichq/";
-          }
-        ];
-      }
       {
         name = "IVR";
         bookmarks = [
@@ -368,15 +351,6 @@
               }
             ];
           }
-          {
-            name = "Jurisdictions";
-            bookmarks = [
-              {
-                name = "Weatherford";
-                url = "https://weatherfordtx.gov/3062/Development-Services";
-              }
-            ];
-          }
           {
             name = "Door Loop";
             url = "https://btrgpm.app.doorloop.com/home";
@@ -385,47 +359,22 @@
             name = "HELOC payoff calculator";
             url = "https://acceleratedstrategies.com/free-calculator/";
           }
-          {
-            name = "Odoo";
-            url = "http://10.42.2.57:8069/odoo/crm";
-          }
-          {
-            name = "Mattermost";
-            url = "http://10.42.2.89:8065/login";
-          }
         ];
       }
       {
         name = "Media";
         bookmarks = [
-          {
-            name = "Flaresolverr";
-            url = "http://nas1.shire-zebra.ts.net:30098";
-          }
           {
             name = "Prowlarr";
-            url = "http://nas1.shire-zebra.ts.net:30050/";
+            url = "https://hosea.shire-zebra.ts.net:9696/";
-          }
-          {
-            name = "Sonarr (TV)";
-            url = "http://nas1.shire-zebra.ts.net:30113/";
-          }
-          {
-            name = "Radarr (Movies)";
-            url = "http://nas1.shire-zebra.ts.net:30025/";
           }
           {
             name = "Transmission";
-            url = "http://nas1.shire-zebra.ts.net:30096/";
+            url = "https://hosea.shire-zebra.ts.net:9091/";
-          }
-        ];
           }
           {
-        name = "Home";
+            name = "Radarr (Movies)";
-        bookmarks = [
+            url = "https://hosea.shire-zebra.ts.net:7878/";
-          {
-            name = "Home Assistant";
-            url = "http://10.42.2.155:8123/config/dashboard";
           }
         ];
       }

modules/nix-conf.nix

@@ -9,7 +9,6 @@
 let
   builderHosts = lib.filterAttrs (_n: v: (builtins.hasAttr "builder" v) && v.builder) metadata.hosts;
   cfg = config.greg.nix;
-  hostname = x: if cfg.cache then "${x}.shire-zebra.ts.net" else "${x}.thehellings.lan";
 in
 {
   options.greg.nix = {
@@ -23,7 +22,7 @@ in
     programs.ssh.extraConfig = builtins.concatStringsSep "\n" (
       lib.map (x: ''
         Host ${x}-builder
-          Hostname ${hostname x}
+          Hostname ${x}.shire-zebra.ts.net
           User remote-builder-user
       '') (lib.attrNames builderHosts)
     );
@@ -58,18 +57,12 @@ in
           "gregory.hellings"
         ]; # For home and for work machines
         substituters =
-          (
+          (if cfg.cache then [
-            if cfg.cache then
-              [
             #"http://chronicles.shire-zebra.ts.net:9000/binary-cache/"
-                "http://nas1.shire-zebra.ts.net:9000/niks3"
+            "http://nas1.shire-zebra.ts.net:8080/default"
-                #"http://nas1.shire-zebra.ts.net:8080/default"
+          ] else [
-              ]
-            else
-              [
             "http://nas1.thehellings.lan:8080/default"
-              ]
+          ])
-          )
           ++ [
             "https://ai.cachix.org"
             "https://nixpkgs-python.cachix.org"
@@ -79,7 +72,6 @@ in
             "https://nixhelm.cachix.org"
           ];
         trusted-public-keys = [
-          "niks3:8iztr/NACwYEK5O7JJtGFGuv+ho/cmwql8NeoCiXNto="
           #"chronicles.shire-zebra.ts.net:0qWYHn3gGllXChhAaaxKlNZtRy6yG/XJs1RFSqV3nW8="
           "default:DTGxNijw2D8FrZJPT1pFTWcLqbt60tovL+9Z+VW0HRY="
           "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="

modules/nixos/adblock-update.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.greg.adblockUpdate;
-in
-{
-
-  options.greg.adblockUpdate = {
-    enable = lib.mkEnableOption "Enable auto-update of block list";
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd = {
-      services.adblock-update = {
-        after = [ "network-online.target" ];
-        requires = [ "network-online.target" ];
-        script = lib.getExe pkgs.adblockUpdate;
-        serviceConfig.Type = "oneshot";
-      };
-      timers.adblock-update = {
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network-online.target" ];
-        requires = [ "network-online.target" ];
-        timerConfig = {
-          OnCalendar = "daily";
-          Unit = "adblock-update.service";
-        };
-      };
-    };
-  };
-}

modules/nixos/default.nix

@@ -4,12 +4,12 @@
 
 {
   imports = [
-    ./adblock-update.nix
     ./albyhub.nix
     ./backup.nix
     ./ceph.nix
     ./db.nix
     ./gitea-runner.nix
+    ./gitlab-runner.nix
     ./gnome.nix
     ./home.nix
     ./kde.nix

modules/nixos/gitea-runner.nix

@@ -6,8 +6,6 @@
 }:
 let
   cfg = config.greg.gitea-runner;
-  host = config.networking.hostName;
-  labels = cfg.labels ++ cfg.extraLabels;
 in
 {
   options.greg.gitea-runner = {
@@ -25,86 +23,66 @@ in
       description = "Name of the runner (defaults to hostname)";
     };
 
-    capacity = lib.mkOption {
-      type = lib.types.int;
-      default = 5;
-      description = "Number of concurrent jobs the runner can handle";
-    };
-
-    extraLabels = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-    };
-
     labels = lib.mkOption {
       type = lib.types.listOf lib.types.str;
-      default = [
+      default = [ "self-hosted" ];
-        "self-hosted:host"
-        "nixos-${host}:host"
-
-        "debian-latest:docker://node:25-trixie"
-
-        "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest"
-        "ubuntu-26.04:docker://docker.gitea.com/runner-images:ubuntu-26.04"
-        "ubuntu-24.04:docker://docker.gitea.com/runner-images:ubuntu-24.04"
-        "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04"
-
-        "ubuntu-full-latest:docker://ghcr.io/catthehacker/ubuntu:full-latest"
-        "ubuntu-full-26.04:docker://ghcr.io/catthehacker/ubuntu:full-26.04"
-        "ubuntu-full-24.04:docker://ghcr.io/catthehacker/ubuntu:full-24.04"
-        "ubuntu-full-22.04:docker://ghcr.io/catthehacker/ubuntu:full-22.04"
-
-        "ubuntu-act-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"
-        "ubuntu-act-26.04:docker://ghcr.io/catthehacker/ubuntu:act-26.04"
-        "ubuntu-act-24.04:docker://ghcr.io/catthehacker/ubuntu:act-24.04"
-        "ubuntu-act-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04"
-
-        "ubuntu-runner-latest:docker://ghcr.io/catthehacker/ubuntu:runner-latest"
-        "ubuntu-runner-26.04:docker://ghcr.io/catthehacker/ubuntu:runner-26.04"
-        "ubuntu-runner-24.04:docker://ghcr.io/catthehacker/ubuntu:runner-24.04"
-        "ubuntu-runner-22.04:docker://ghcr.io/catthehacker/ubuntu:runner-22.04"
-
-        "ubuntu-rust-latest:docker://ghcr.io/catthehacker/ubuntu:rust-latest"
-        "ubuntu-rust-26.04:docker://ghcr.io/catthehacker/ubuntu:rust-26.04"
-        "ubuntu-rust-24.04:docker://ghcr.io/catthehacker/ubuntu:rust-24.04"
-        "ubuntu-rust-22.04:docker://ghcr.io/catthehacker/ubuntu:rust-22.04"
-
-        "nix-latest:docker://src.thehellings.com/greg/builder:latest"
-      ];
       description = "Labels to assign to this runner";
     };
 
     tokenFile = lib.mkOption {
       type = lib.types.path;
       description = "Path to a file containing the runner registration token (from agenix)";
-      default = ../../secrets/gitea/runner-isaiah-podman.age;
     };
   };
 
   config = lib.mkIf cfg.enable {
-    age.secrets."gitea-runner-${host}-podman".file = cfg.tokenFile;
+    environment.systemPackages = [ pkgs.gitea-actions-runner ];
 
-    environment.systemPackages = with pkgs; [
+    systemd.services.gitea-runner = {
-      bash
+      description = "Gitea Actions Runner";
-      git
+      wantedBy = [ "multi-user.target" ];
-      nodejs
+      after = [ "network.target" ];
-    ];
 
-    greg.podman.enable = true;
+      environment = {
+        GITEA_INSTANCE_URL = cfg.instanceURL;
+        GITEA_RUNNER_NAME = cfg.name;
+        GITEA_RUNNER_LABELS = lib.concatStringsSep "," cfg.labels;
+        HOME = "/var/lib/gitea-runner";
+      };
 
-    services.gitea-actions-runner = {
+      serviceConfig = {
-      package = pkgs.gitea-actions-runner;
+        Type = "simple";
-      instances.${cfg.name} = {
+        User = "gitea-runner";
-        inherit labels;
+        Group = "gitea-runner";
-        inherit (cfg) name;
+        StateDirectory = "gitea-runner";
-        enable = true;
+        WorkingDirectory = "/var/lib/gitea-runner";
-        url = cfg.instanceURL;
+        ExecStartPre = pkgs.writeShellScript "gitea-runner-register" ''
-        tokenFile = config.age.secrets."gitea-runner-${host}-podman".path;
+          set -euo pipefail
-        settings = {
+          CONFIG_FILE="/var/lib/gitea-runner/.runner"
-          container.force_pull = true;
+          if [ ! -f "$CONFIG_FILE" ]; then
-          runner.capacity = cfg.capacity;
+            TOKEN="$(cat ${cfg.tokenFile})"
+            ${pkgs.gitea-actions-runner}/bin/act_runner register \
+              --no-interactive \
+              --instance "$GITEA_INSTANCE_URL" \
+              --token "$TOKEN" \
+              --name "$GITEA_RUNNER_NAME" \
+              --labels "$GITEA_RUNNER_LABELS"
+          fi
+        '';
+        ExecStart = "${pkgs.gitea-actions-runner}/bin/act_runner daemon";
+        Restart = "on-failure";
+        RestartSec = "5s";
       };
     };
+
+    users.users.gitea-runner = {
+      isSystemUser = true;
+      group = "gitea-runner";
+      home = "/var/lib/gitea-runner";
+      createHome = true;
+      description = "Gitea Actions Runner service user";
     };
+
+    users.groups.gitea-runner = { };
   };
 }

modules/nixos/gitlab-runner.nix

@@ -0,0 +1,82 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.greg.runner;
+  environmentVariables = {
+    EFI_DIR = "${pkgs.OVMF.fd}/FV/";
+    STORAGE_URL = "s3.thehellings.lan:9000";
+  };
+  runnerCfg = file: {
+    inherit environmentVariables;
+    authenticationTokenConfigFile = file;
+    executor = "shell";
+    limit = cfg.threads;
+  };
+in
+# We want exactly one of these to be true, but not both. Neither can both be false
+{
+  options.greg.runner = {
+    enable = lib.mkEnableOption "Enable as a gitlab-runner with both libvirt and virtualbox";
+
+    threads = lib.mkOption {
+      default = 5;
+      type = lib.types.int;
+      description = "The maximum number of concurrent jobs";
+    };
+
+    qemu = lib.mkEnableOption "Enable the qemu host (mutually exclusive with vbox)";
+    vbox = lib.mkEnableOption "Enable the vbox host (mutually exclusive with qemu)";
+  };
+
+  config = lib.mkIf cfg.enable ({
+    # assertions = [
+    #   {
+    #     assertion = cfg.qemu || cfg.vbox && (cfg.qemu != cfg.vbox);
+    #     message = "You must enable exactly one of qemu or vbox";
+    #   }
+    # ];
+    # Shared configurations
+    age.secrets = {
+      qemu.file = ../../secrets/gitlab/nixos-qemu-shell.age;
+      vbox.file = ../../secrets/gitlab/nixos-vbox-shell.age;
+    };
+
+    services.gitlab-runner = {
+      enable = false;
+      settings.concurrent = cfg.threads;
+      services = {
+        qemu = lib.mkIf cfg.qemu (runnerCfg config.age.secrets.qemu.path);
+        vbox = lib.mkIf cfg.vbox (runnerCfg config.age.secrets.vbox.path);
+      };
+    };
+
+    systemd.services.gitlab-runner = {
+      serviceConfig = {
+        DevicePolicy = lib.mkForce "auto";
+        User = "root";
+        DynamicUser = lib.mkForce false;
+      };
+    };
+
+    users.extraGroups.vboxusers.members = lib.optional cfg.vbox "greg";
+
+    virtualisation = {
+      libvirtd = lib.mkIf cfg.qemu {
+        enable = true;
+        allowedBridges = [
+          "br0"
+          "virbr0"
+        ];
+        onBoot = "ignore"; # only restart VMs labeled 'autostart'
+      };
+      virtualbox.host = lib.mkIf cfg.vbox {
+        enable = true;
+        enableExtensionPack = true;
+      };
+    };
+  });
+}

modules/nixos/kubernetes.nix

@@ -2,13 +2,14 @@
   config,
   lib,
   pkgs,
+  top,
   ...
 }:
 let
   cfg = config.greg.kubernetes;
   cert-manager = pkgs.fetchurl {
-    url = "https://github.com/cert-manager/cert-manager/releases/download/v1.20.2/cert-manager.yaml";
+    url = "https://github.com/cert-manager/cert-manager/releases/download/v1.18.2/cert-manager.yaml";
-    sha256 = "sha256-HOEcrpEq3sxp5rtiNDX6/J7SFQX57/+YvXHXuA8B2x8=";
+    sha256 = "0vx1nfyhl0rzb6psfxplq8pfp18mrrdk83n8rj2ph8q6r15vcih5";
   };
   flux = pkgs.fetchurl {
     url = "https://github.com/fluxcd/flux2/releases/download/v2.7.2/install.yaml";
@@ -85,6 +86,43 @@ in
     services = {
       k3s = {
         enable = true;
+        autoDeployCharts = {
+          external-secrets = {
+            inherit (top.charts.chartsMetadata.external-secrets.external-secrets) repo version;
+            enable = true;
+            name = top.charts.chartsMetadata.external-secrets.external-secrets.chart;
+            hash = "sha256-dPuUWthwN6L0jdAKRpkDtDedGyDUxUlJrwkvUNwLsrU=";
+            createNamespace = true;
+            targetNamespace = "external-secrets";
+            values = {
+              crds.create = true;
+              includeCRDs = true;
+            };
+          };
+          kyverno = {
+            inherit (top.charts.chartsMetadata.kyverno.kyverno) repo version;
+            enable = true;
+            name = top.charts.chartsMetadata.kyverno.kyverno.chart;
+            hash = "sha256-sNdFEupwfnYSo2iGqKwTadPtXfcbyM1kuisavpiGUyU=";
+            createNamespace = true;
+            targetNamespace = "kyverno-system";
+            values = {
+              admissionController.replicas = 3;
+              backgroundController.replicas = 3;
+              cleanupController.replicas = 2;
+              reportsController.replicas = 2;
+              crds.install = true;
+            };
+          };
+          tailscale = {
+            inherit (top.charts.chartsMetadata.tailscale.tailscale-operator) repo version;
+            enable = true;
+            name = top.charts.chartsMetadata.tailscale.tailscale-operator.chart;
+            hash = "sha256-BtZ24mCT2GMHE9iR+2xuIkB+4m1r2OC3WLkY3jC3i3I=";
+            createNamespace = true;
+            targetNamespace = "tailscale";
+          };
+        };
         extraFlags = [
           "--cluster-cidr=10.211.0.0/16"
           "--service-cidr=10.221.0.0/16"
@@ -100,6 +138,7 @@ in
           cert-manager.source = cert-manager;
           flux.source = flux;
           node-annotations.source = ../../manifests/auto/nodes.yaml;
+          operator-oauth.source = ../../manifests/auto/operator-oauth.yaml;
         };
         role = if cfg.agentOnly then "agent" else "server";
         serverAddr = lib.mkIf (

modules/nixos/nebula.nix

@@ -27,7 +27,7 @@ let
   nebulaDomain = "nebula.thehellings.com";
   # Linode's public address — used by all non-lighthouse hosts to reach it.
   # Override with greg.nebula.lighthouseAddr if the public IP ever changes.
-  defaultLighthouseAddr = "thehellings.com";
+  defaultLighthouseAddr = "linode.${nebulaDomain}";
 in
 {
   options.greg.nebula = {

modules/nixos/proxy.nix

@@ -54,7 +54,7 @@ with lib;
 
                 target = mkOption {
                   type = types.str;
-                  description = "The destination that is being proxied.";
+                  description = ''The destination that is being proxied.'';
                   example = "http://localhost:8080";
                 };
 

modules/nixos/remote-builder.nix

@@ -57,7 +57,6 @@ with lib;
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLOqwbp4hFYkiJpokh9i2RToa/6tQcwthDNQH69tyBF root@vm-matrix.thehellings.lan"
         # Mac
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBT5BFHQz1I5k/zkLQNLjL77EaqfdpRiF2Ci4eS9LMDK gregory.hellings@jude.thehellings.lan"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPVlMoN2pkKRRwKNuMbMczki5ybR34wvjdgDNlgR74Wh greg@gregs-MacBook-Pro-16-inch-Nov-2024"
       ];
       homeMode = "500";
       isNormalUser = true;

modules/nixos/syncthing.nix

@@ -18,6 +18,7 @@ with lib;
         devices = {
           chronicles.id = "7FI6Y3M-C7YQEDI-IB345L6-RKLXMB6-AEIV57Y-3J2RCXQ-MK6QRNK-EINPXAE";
           genesis.id = "YDTH4SD-GUAC5AA-SSYWYPZ-YMJW5LK-LE7PZKJ-GV2UJFZ-CU7LZAD-GTYWCQK";
+          gitlab.id = "GKNOZWI-CNC2Q2F-R5GGGDX-RYFGHK4-CCC37LC-GVOEMJI-46QPC6G-AWFEOQE";
           linode.id = "IJMMXPR-WNALZBD-FMJH5W5-WV7XGJY-HLJTKGT-5TKHJIH-75LT56D-UUZCYQE";
         };
         options = {

network.json

@@ -2,19 +2,15 @@
   "infra": {
     "dns": "10.42.1.5",
     "gw": "10.42.1.1",
-    "lan": "10.42.0.0/16",
     "netmask": "255.255.0.0",
-    "nebula": "10.157.0.0/16",
+    "prefix": "16"
-    "prefix": "16",
-    "tailscale": "100.64.0.0/10"
   },
   "hosts": {
     "chronicles": {
       "ip": "10.42.1.4",
       "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS",
       "external": true,
-      "ts": "100.119.228.115",
+      "ts": "100.119.228.115"
-      "aliases": ["s3"]
     },
     "exodus": {
       "ip": null,
@@ -28,7 +24,10 @@
       "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO/CGE2rqlL2Qr0TJkwQMsHFSDkhGWlrUlvfcvcylO1n",
       "ts": "100.96.198.104",
       "system": "x86_64-linux",
-      "tags": ["router", "server"],
+      "tags": [
+        "router",
+        "server"
+      ],
       "nebulaIp": "10.157.0.2"
     },
     "hosea": {
@@ -36,7 +35,9 @@
       "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz",
       "ts": "100.68.203.1",
       "system": "x86_64-linux",
-      "tags": ["server"],
+      "tags": [
+        "server"
+      ],
       "nebulaIp": "10.157.0.3"
     },
     "icdm-root": {
@@ -49,18 +50,24 @@
       "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf",
       "ts": "100.84.183.79",
       "system": "x86_64-linux",
-      "systems": ["x86_64-linux", "aarch64-linux"],
+      "systems": [
-      "tags": ["builder", "kube", "server"],
+        "x86_64-linux",
+        "aarch64-linux"
+      ],
+      "tags": [
+        "builder",
+        "kube",
+        "server"
+      ],
       "nebulaIp": "10.157.0.4"
     },
     "iso": {
       "external": true,
       "system": "x86_64-linux"
     },
-    "gregory.hellings-mbp": {
+    "ivr": {
       "external": true,
-      "system": "aarch64-darwin",
+      "system": "aarch64-darwin"
-      "user": "gregory.hellings"
     },
     "jeremiah": {
       "builder": true,
@@ -68,8 +75,15 @@
       "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0",
       "ts": "100.102.186.39",
       "system": "x86_64-linux",
-      "systems": ["x86_64-linux", "aarch64-linux"],
+      "systems": [
-      "tags": ["builder", "kube", "server"],
+        "x86_64-linux",
+        "aarch64-linux"
+      ],
+      "tags": [
+        "builder",
+        "kube",
+        "server"
+      ],
       "nebulaIp": "10.157.0.5"
     },
     "joel": {
@@ -77,33 +91,24 @@
       "ip": "10.42.0.4",
       "ts": null
     },
-    "gregs-MacBook-Pro-16-inch-Nov-2024": {
-      "external": true,
-      "system": "aarch64-darwin"
-    },
-    "lithic": {
-      "external": true,
-      "system": "aarch64-darwin"
-    },
     "linode": {
       "ip": null,
       "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q",
       "ts": "100.109.86.8",
       "system": "x86_64-linux",
-      "tags": ["public", "server"],
+      "tags": [
+        "public",
+        "server"
+      ],
       "nebulaIp": "10.157.0.1"
     },
-    "ivr": {
-      "external": true,
-      "system": "aarch64-darwin"
-    },
     "MacBook-Pro.local": {
       "external": true,
-      "system": "aarch64-darwin"
+      "system": "aarc64-darwin"
     },
     "MacBook-Prolocal.local": {
       "external": true,
-      "system": "aarch64-darwin"
+      "system": "aarc64-darwin"
     },
     "nas1": {
       "external": true,
@@ -114,14 +119,13 @@
       "external": true,
       "system": "x86_64-linux"
     },
-    "printer": {
-      "external": true,
-      "ip": "10.42.1.3"
-    },
     "proxmoxtemplate": {
       "external": true,
       "system": "x86_64-linux"
     },
+    "gitlab": {
+      "system": "x86_64-linux"
+    },
     "wsl": {
       "external": true,
       "system": "aarch64-linux"
@@ -132,8 +136,15 @@
       "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOos0zQePsa+T6Z2dsKbPOvEdrBQ8a6mx3s7pN6ysCI0",
       "ts": "100.90.74.19",
       "system": "x86_64-linux",
-      "systems": ["x86_64-linux", "aarch64-linux"],
+      "systems": [
-      "tags": ["builder", "kube", "server"],
+        "x86_64-linux",
+        "aarch64-linux"
+      ],
+      "tags": [
+        "builder",
+        "kube",
+        "server"
+      ],
       "nebulaIp": "10.157.0.6"
     }
   }

overlays/default.nix

@@ -10,6 +10,7 @@ final: prev:
       in
       {
         daikinone = cp ./daikinone.nix { };
+        xonsh-apipenv = cp ./xonsh-apipenv.nix { };
       }
     )
   ];
@@ -24,9 +25,11 @@ final: prev:
     withBDplus = true;
   };
   handbrake = prev.handbrake.override { libbluray = final.libbluray-custom; };
+  pipenv-ivr = prev.callPackage ./pipenv.nix { };
   OVMFFull = prev.OVMFFull.override {
     secureBoot = true;
     msVarsTemplate = true;
     tpmSupport = true;
   };
 }
+// (import ../pkgs { pkgs = prev; })

overlays/pipenv.nix

@@ -0,0 +1,92 @@
+{
+  lib,
+  stdenv,
+  python3,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+
+let
+
+  runtimeDeps =
+    ps:
+    with ps;
+    [
+      certifi
+      pysocks
+      setuptools
+      (pip.overridePythonAttrs {
+        dependencies = [ ps.pysocks ];
+      })
+      virtualenv
+      virtualenv-clone
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isAndroid [ pyjnius ];
+
+  pythonEnv = python3.withPackages runtimeDeps;
+
+in
+python3.pkgs.buildPythonApplication rec {
+  pname = "pipenv";
+  version = "2023.11.15";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "pypa";
+    repo = "pipenv";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-kxwyws22xJkqBy/hXXcAPHZR2NgZHbmwZr9vYqce434=";
+  };
+
+  env.LC_ALL = "en_US.UTF-8";
+
+  nativeBuildInputs = with python3.pkgs; [
+    installShellFiles
+    setuptools
+    wheel
+  ];
+
+  postPatch = ''
+    # pipenv invokes python in a subprocess to create a virtualenv
+    # and to call setup.py.
+    # It would use sys.executable, which in our case points to a python that
+    # does not have the required dependencies.
+    substituteInPlace pipenv/utils/virtualenv.py \
+      --replace "sys.executable" "'${pythonEnv.interpreter}'"
+  '';
+
+  propagatedBuildInputs = runtimeDeps python3.pkgs;
+
+  preCheck = ''
+    export HOME="$TMPDIR"
+  '';
+
+  nativeCheckInputs = with python3.pkgs; [
+    mock
+    pytestCheckHook
+    pytest-xdist
+    pytz
+    requests
+  ];
+
+  disabledTests = [
+    "test_convert_deps_to_pip"
+    "test_download_file"
+  ];
+
+  disabledTestPaths = [ "tests/integration" ];
+
+  postInstall = ''
+    installShellCompletion --cmd pipenv \
+      --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \
+      --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \
+      --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv)
+  '';
+
+  meta = with lib; {
+    description = "Python Development Workflow for Humans";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ berdario ];
+  };
+}

overlays/xonsh-apipenv.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  toPythonModule,
+  pipenv,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "xonsh-apipenv";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "greg-hellings";
+    repo = "xontrib-apipenv";
+    rev = version;
+    hash = "sha256-Wa8iev0ow1oh95tPCv5tAJUMBYiStWms8I31WbVcOok=";
+  };
+
+  dependencies = [ (toPythonModule pipenv) ];
+  build-system = [ setuptools ];
+
+  meta = with lib; {
+    description = "Auto pipenv support for Xonsh";
+    homepage = "https://github.com/greg-hellings/xontrib-apipenv";
+    license = licenses.mit;
+    maintainers = [ ];
+  };
+}

pkgs/adblock_update.nix

@@ -1,21 +0,0 @@
-{
-  writeShellApplication,
-  curl,
-  gnused,
-}:
-writeShellApplication {
-  name = "adblock-update";
-  runtimeInputs = [
-    curl
-    gnused
-  ];
-  text = ''
-    curl -s https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts | sed '1,33d' > /etc/adblock_hosts
-    curl -s https://adaway.org/hosts.txt | sed '1,24d' | sed 's/127.0.0.1/0.0.0.0/' >> /etc/adblock_hosts
-
-    # Custom domains that I need to preserve for some reason
-    for f in "segment.com" "segment.io" "branch.io" "dev.visualwebsiteoptimizer.com" "click.discord.com"; do
-     	sed -i -e "/''${f}/d" /etc/adblock_hosts  # Blocks Trelly content for house investors
-    done
-  '';
-}

pkgs/default.nix

@@ -1,19 +1,17 @@
 {
   pkgs,
   system ? pkgs.stdenv.hostPlatform.system,
-  top,
   ...
 }:
 
 let
-  c = pkgs.newScope packages;
+  c = pkgs.callPackage;
-  packages = if system == "x86_64-linux" then (allSys // x86Linux) else allSys;
+in
-  allSys = {
+{
   #default = iso;
   #iso = top.self.nixosConfigurations.iso.config.system.build.isoImage;
   #iso-beta = self.nixosConfigurations.iso-beta.config.system.build.isoImage;
   aacs = c ./aacs.nix { };
-    adblock_update = c ./adblock_update.nix { };
   brew = c ./homebrew.nix { };
   create_ssl = c ./create_ssl.nix { };
   gcc-tune = c ./gcc-tune.nix { };
@@ -23,15 +21,15 @@ let
   inject = c ./inject.nix { };
   setup-ssh = c ./setup-ssh { };
   upgrade-pg-cluster = c ./upgrade-pg-cluster.nix { };
-  };
+}
-  x86Linux = {
+// (
+  if system == "x86_64-linux" then
+    {
       qemu-hook = c ./qemu-hook.nix { };
       vfio_startup = c ./vfio_startup.nix { };
       vfio_shutdown = c ./vfio_shutdown.nix { };
+      zim = c ./zim.nix { };
     }
-  // (import ./zim {
+  else
-    inherit (top.nixpkgs-lib) lib;
+    { }
-    inherit pkgs;
+)
-  });
-in
-packages