Compare commits
15 Commits
20875fb03f
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
7fb8df69a4
|
|||
| 412abd5e68 | |||
|
3cb5148c40
|
|||
|
cf19ade34b
|
|||
|
02845f2138
|
|||
|
402fef8dc4
|
|||
|
a4426c50b9
|
|||
|
8abe7b1d07
|
|||
|
672143806a
|
|||
|
f16bc8b5b5
|
|||
|
f7b1a18579
|
|||
| 406134a0cb | |||
|
348f5be75f
|
|||
|
f87e004153
|
|||
|
35e62dafbc
|
@@ -326,7 +326,7 @@ Use `nix flake show` or `nix develop -c ansible-inventory --graph` to list all h
|
|||||||
- `nixpkgs-unstable` - Unstable channel (available via overlay as `pkgs.unstable.<package>`)
|
- `nixpkgs-unstable` - Unstable channel (available via overlay as `pkgs.unstable.<package>`)
|
||||||
- `nixos-exporter` - NixOS module for exposing flake revision metrics (used to verify deployments)
|
- `nixos-exporter` - NixOS module for exposing flake revision metrics (used to verify deployments)
|
||||||
- `homelab-deploy` - NATS-based remote deployment tool for test-tier hosts
|
- `homelab-deploy` - NATS-based remote deployment tool for test-tier hosts
|
||||||
- Custom packages from git.t-juice.club:
|
- Custom packages from code.t-juice.club:
|
||||||
- `alerttonotify` - Alert routing
|
- `alerttonotify` - Alert routing
|
||||||
|
|
||||||
### Network Architecture
|
### Network Architecture
|
||||||
@@ -355,7 +355,7 @@ Most hosts use OpenBao (Vault) for secrets:
|
|||||||
|
|
||||||
All hosts pull updates daily from:
|
All hosts pull updates daily from:
|
||||||
```
|
```
|
||||||
git+https://git.t-juice.club/torjus/nixos-servers.git
|
git+https://code.t-juice.club/torjus/nixos-servers.git
|
||||||
```
|
```
|
||||||
|
|
||||||
Configured in `/system/autoupgrade.nix`:
|
Configured in `/system/autoupgrade.nix`:
|
||||||
|
|||||||
@@ -1,155 +0,0 @@
|
|||||||
# Bare Metal Forgejo Actions Runner on nix-cache02
|
|
||||||
|
|
||||||
## Goal
|
|
||||||
|
|
||||||
Add a second Forgejo Actions runner instance on nix-cache02 that executes jobs directly on the host (bare metal). This allows CI builds to populate the nix binary cache automatically, reducing reliance on manually triggered builds before deployments.
|
|
||||||
|
|
||||||
## Motivation
|
|
||||||
|
|
||||||
Currently the workflow for updating a flake input (e.g. nixos-exporter) is:
|
|
||||||
|
|
||||||
1. Update flake lock
|
|
||||||
2. Push to master
|
|
||||||
3. Manually trigger a build on nix-cache02 (or wait for the scheduled builder)
|
|
||||||
4. Deploy to hosts
|
|
||||||
|
|
||||||
With a bare metal runner, repos like nixos-exporter can have CI workflows that run `nix build`, and those derivations automatically end up in the cache (served by harmonia). By the time hosts auto-upgrade, everything is already cached.
|
|
||||||
|
|
||||||
## Design
|
|
||||||
|
|
||||||
### Two Runner Instances
|
|
||||||
|
|
||||||
- **actions1** (existing) — Container-based, available to all Forgejo repos. Unchanged.
|
|
||||||
- **actions2** (new) — Host-based, restricted to trusted repos only via Forgejo runner scoping.
|
|
||||||
|
|
||||||
### Trusted Repos
|
|
||||||
|
|
||||||
Repos that should be allowed to use the bare metal runner:
|
|
||||||
|
|
||||||
- `torjus/nixos-servers`
|
|
||||||
- `torjus/nixos-exporter`
|
|
||||||
- `torjus/nixos` (gunter/magicman configs)
|
|
||||||
- Other repos with nix builds that benefit from cache population (add as needed)
|
|
||||||
|
|
||||||
Restriction is configured in the Forgejo web UI when registering the runner — scope it to specific repos or the org.
|
|
||||||
|
|
||||||
### Label Configuration
|
|
||||||
|
|
||||||
The new instance would use a host label:
|
|
||||||
|
|
||||||
```nix
|
|
||||||
labels = [ "native:host" ];
|
|
||||||
```
|
|
||||||
|
|
||||||
Workflow files in trusted repos would target this with `runs-on: native`.
|
|
||||||
|
|
||||||
### Host Packages
|
|
||||||
|
|
||||||
The runner needs nix and basic tools available:
|
|
||||||
|
|
||||||
```nix
|
|
||||||
hostPackages = with pkgs; [
|
|
||||||
bash
|
|
||||||
coreutils
|
|
||||||
curl
|
|
||||||
gawk
|
|
||||||
gitMinimal
|
|
||||||
gnused
|
|
||||||
nodejs
|
|
||||||
wget
|
|
||||||
nix
|
|
||||||
];
|
|
||||||
```
|
|
||||||
|
|
||||||
## Security Analysis
|
|
||||||
|
|
||||||
### What the runner CAN access
|
|
||||||
|
|
||||||
- **Nix store** — Can read and write derivations. This is the whole point; harmonia serves the store to all hosts.
|
|
||||||
- **Network** — Full network access during job execution.
|
|
||||||
- **World-readable files** — Standard for any process on the system.
|
|
||||||
|
|
||||||
### What the runner CANNOT access
|
|
||||||
|
|
||||||
- **Cache signing key** — `/run/secrets/cache-secret` is mode `0400` root-owned. Harmonia signs derivations on serve, not on store write.
|
|
||||||
- **Vault AppRole credentials** — `/var/lib/vault/approle/` is root-owned.
|
|
||||||
- **Other vault secrets** — All in `/run/secrets/` with restrictive permissions.
|
|
||||||
|
|
||||||
### Mitigations
|
|
||||||
|
|
||||||
- **Trusted repos only** — Forgejo runner scoping restricts which repos can submit jobs. Only repos we control should have access.
|
|
||||||
- **DynamicUser** — The runner uses systemd DynamicUser, so no persistent user account. Each invocation gets an ephemeral UID.
|
|
||||||
- **Separate instance** — Container-based jobs (untrusted repos) remain on actions1 and never get host access.
|
|
||||||
|
|
||||||
### Accepted Risks
|
|
||||||
|
|
||||||
- A compromised trusted repo could inject bad derivations into the nix store/cache. This is an accepted risk since those repos already have deploy access to production hosts.
|
|
||||||
- Jobs can consume host resources (CPU, memory, disk). The `runner.capacity` setting limits concurrent jobs.
|
|
||||||
|
|
||||||
## Implementation
|
|
||||||
|
|
||||||
### 1. NixOS Configuration
|
|
||||||
|
|
||||||
**File:** `hosts/nix-cache02/actions-runner.nix`
|
|
||||||
|
|
||||||
Add a second instance alongside the existing overrides:
|
|
||||||
|
|
||||||
```nix
|
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
# ... existing actions1 overrides ...
|
|
||||||
|
|
||||||
services.gitea-actions-runner.instances.actions2 = {
|
|
||||||
enable = true;
|
|
||||||
name = "nix-cache02-native";
|
|
||||||
url = "https://code.t-juice.club";
|
|
||||||
tokenFile = "/run/secrets/forgejo-runner-token-native";
|
|
||||||
labels = [ "native:host" ];
|
|
||||||
hostPackages = with pkgs; [
|
|
||||||
bash coreutils curl gawk gitMinimal gnused nodejs wget nix
|
|
||||||
];
|
|
||||||
settings = {
|
|
||||||
runner.capacity = 4;
|
|
||||||
cache = {
|
|
||||||
enabled = true;
|
|
||||||
dir = "/var/lib/gitea-runner/actions2/cache";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Vault Secret
|
|
||||||
|
|
||||||
The native runner needs its own registration token (separate from actions1):
|
|
||||||
|
|
||||||
- Add `hosts/nix-cache02/forgejo-runner-token-native` to `terraform/vault/secrets.tf`
|
|
||||||
- Add `forgejo_runner_token_native` variable to `terraform/vault/variables.tf`
|
|
||||||
- Add vault secret config in `actions-runner.nix` pointing to the new path
|
|
||||||
|
|
||||||
### 3. Forgejo Setup
|
|
||||||
|
|
||||||
1. Generate a new runner token in Forgejo, scoped to trusted repos only
|
|
||||||
2. Store in Vault: `bao kv put secret/hosts/nix-cache02/forgejo-runner-token-native token=<token>`
|
|
||||||
3. Set the tfvar and run `tofu apply` in `terraform/vault/`
|
|
||||||
|
|
||||||
### 4. Example Workflow
|
|
||||||
|
|
||||||
In a trusted repo (e.g. nixos-exporter):
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
name: Build
|
|
||||||
on: [push]
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: native
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- run: nix build
|
|
||||||
```
|
|
||||||
|
|
||||||
## Open Questions
|
|
||||||
|
|
||||||
- Should `hostPackages` include additional tools (e.g. `cachix`, `nix-prefetch-*`)?
|
|
||||||
- Should we set resource limits on the runner (systemd MemoryMax, CPUQuota)?
|
|
||||||
- Do we want a separate capacity for the native runner vs container runner, or is 4 fine for both?
|
|
||||||
181
docs/plans/completed/native-forgejo-runner.md
Normal file
181
docs/plans/completed/native-forgejo-runner.md
Normal file
@@ -0,0 +1,181 @@
|
|||||||
|
# Native Nix Forgejo Runner on nix-cache02
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Add a second Forgejo Actions runner instance on nix-cache02 that executes jobs directly on the host (no containers). This allows CI builds to populate the nix binary cache automatically, reducing reliance on manually triggered builds before deployments.
|
||||||
|
|
||||||
|
## Motivation
|
||||||
|
|
||||||
|
- **Nix store caching**: The container-based `nix` label runs in ephemeral Podman containers, losing all nix store paths between jobs. Native execution uses the host's persistent store, so builds reuse cached paths automatically.
|
||||||
|
- **Binary cache integration**: nix-cache02 *is* the binary cache server (Harmonia). Paths built by CI are immediately available to all hosts.
|
||||||
|
- **Faster deploy cycle**: Currently updating a flake input (e.g. nixos-exporter) requires pushing to master, then waiting for the scheduled builder or manually triggering a build. With a native runner, repos can have CI workflows that run `nix build`, and those derivations are in the cache by the time hosts auto-upgrade.
|
||||||
|
- **NixOS config builds**: Enables future workflows that build `nixosConfigurations.*` from this repo, populating the cache as a side effect of CI.
|
||||||
|
|
||||||
|
## Design
|
||||||
|
|
||||||
|
### Two Runner Instances
|
||||||
|
|
||||||
|
- **actions1** (existing) — Container-based, global runner available to all Forgejo repos. Unchanged.
|
||||||
|
- **actions-native** (new) — Host-based, registered as a user-level runner under the `torjus` Forgejo account, so only repos owned by that user can target it.
|
||||||
|
|
||||||
|
### Trusted Repos
|
||||||
|
|
||||||
|
Repos that should be allowed to use the native runner:
|
||||||
|
|
||||||
|
- `torjus/nixos-servers`
|
||||||
|
- `torjus/nixos-exporter`
|
||||||
|
- `torjus/nixos` (gunter/magicman configs)
|
||||||
|
- Other repos with nix builds that benefit from cache population (add as needed)
|
||||||
|
|
||||||
|
Restriction is configured in the Forgejo web UI when registering the runner — scope it to the user or specific repos.
|
||||||
|
|
||||||
|
### Label Configuration
|
||||||
|
|
||||||
|
```nix
|
||||||
|
labels = [ "native-nix:host" ];
|
||||||
|
```
|
||||||
|
|
||||||
|
Workflow files in trusted repos target this with `runs-on: native-nix`.
|
||||||
|
|
||||||
|
### Host Packages
|
||||||
|
|
||||||
|
The runner needs nix and basic tools available on the host:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
hostPackages = with pkgs; [
|
||||||
|
bash
|
||||||
|
coreutils
|
||||||
|
curl
|
||||||
|
gawk
|
||||||
|
git
|
||||||
|
gnused
|
||||||
|
nodejs
|
||||||
|
wget
|
||||||
|
nix
|
||||||
|
];
|
||||||
|
```
|
||||||
|
|
||||||
|
## Security Analysis
|
||||||
|
|
||||||
|
### What the runner CAN access
|
||||||
|
|
||||||
|
- **Nix store** — Can read and write derivations. This is the whole point; harmonia serves the store to all hosts.
|
||||||
|
- **Network** — Full network access during job execution.
|
||||||
|
- **World-readable files** — Standard for any process on the system.
|
||||||
|
|
||||||
|
### What the runner CANNOT access
|
||||||
|
|
||||||
|
- **Cache signing key** — `/run/secrets/cache-secret` is mode `0400` root-owned. Harmonia signs derivations on serve, not on store write.
|
||||||
|
- **Vault AppRole credentials** — `/var/lib/vault/approle/` is root-owned.
|
||||||
|
- **Other vault secrets** — All in `/run/secrets/` with restrictive permissions.
|
||||||
|
|
||||||
|
### Mitigations
|
||||||
|
|
||||||
|
- **User-level runner** — Registered to the `torjus` user on Forgejo (not global), so only repos owned by that user can submit jobs.
|
||||||
|
- **DynamicUser** — The runner uses systemd DynamicUser, so no persistent user account. Each invocation gets an ephemeral UID.
|
||||||
|
- **Nix sandbox** — Nix builds already run sandboxed by default. Non-nix `run:` steps execute as the runner's system user but have no special privileges.
|
||||||
|
- **Separate instance** — Container-based jobs (untrusted repos) remain on actions1 and never get host access.
|
||||||
|
|
||||||
|
### Accepted Risks
|
||||||
|
|
||||||
|
- A compromised trusted repo could inject bad derivations into the nix store/cache. This is an accepted risk since those repos already have deploy access to production hosts.
|
||||||
|
- Jobs can consume host resources (CPU, memory, disk). The `runner.capacity` setting limits concurrent jobs.
|
||||||
|
|
||||||
|
## Implementation
|
||||||
|
|
||||||
|
### 1. Register runner on Forgejo and store token in Vault
|
||||||
|
|
||||||
|
- In Forgejo web UI: go to user settings > Actions > Runners, create a new runner registration token.
|
||||||
|
- Store the token in Vault via Terraform.
|
||||||
|
|
||||||
|
**terraform/vault/variables.tf** — add variable:
|
||||||
|
```hcl
|
||||||
|
variable "forgejo_native_runner_token" {
|
||||||
|
description = "Forgejo Actions runner token for native nix runner on nix-cache02"
|
||||||
|
type = string
|
||||||
|
default = "PLACEHOLDER"
|
||||||
|
sensitive = true
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**terraform/vault/secrets.tf** — add secret:
|
||||||
|
```hcl
|
||||||
|
"hosts/nix-cache02/forgejo-native-runner-token" = {
|
||||||
|
auto_generate = false
|
||||||
|
data = { token = var.forgejo_native_runner_token }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Add NixOS configuration for native runner instance
|
||||||
|
|
||||||
|
Note: nix-cache02 already has an AppRole with access to `secret/data/hosts/nix-cache02/*` (defined in `terraform/vault/hosts-generated.tf`), so no approle changes are needed.
|
||||||
|
|
||||||
|
**File:** `hosts/nix-cache02/actions-runner.nix`
|
||||||
|
|
||||||
|
Add vault secret and runner instance alongside the existing overrides:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
# Fetch native runner token from Vault
|
||||||
|
vault.secrets.forgejo-native-runner-token = {
|
||||||
|
secretPath = "hosts/nix-cache02/forgejo-native-runner-token";
|
||||||
|
extractKey = "token";
|
||||||
|
mode = "0444";
|
||||||
|
services = [ "gitea-runner-actions-native" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Native nix runner instance
|
||||||
|
services.gitea-actions-runner.instances.actions-native = {
|
||||||
|
enable = true;
|
||||||
|
name = "${config.networking.hostName}-native";
|
||||||
|
url = "https://code.t-juice.club";
|
||||||
|
tokenFile = "/run/secrets/forgejo-native-runner-token";
|
||||||
|
labels = [ "native-nix:host" ];
|
||||||
|
hostPackages = with pkgs; [
|
||||||
|
bash coreutils curl gawk git gnused nodejs wget nix
|
||||||
|
];
|
||||||
|
settings = {
|
||||||
|
runner.capacity = 4;
|
||||||
|
cache = {
|
||||||
|
enabled = true;
|
||||||
|
dir = "/var/lib/gitea-runner/actions-native/cache";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Build and deploy
|
||||||
|
|
||||||
|
1. Create feature branch
|
||||||
|
2. Apply Terraform changes (variables + secrets + approle policy)
|
||||||
|
3. Set the actual token value in `terraform.tfvars`
|
||||||
|
4. Run `tofu apply` in `terraform/vault/`
|
||||||
|
5. Build the NixOS configuration: `nix build .#nixosConfigurations.nix-cache02.config.system.build.toplevel`
|
||||||
|
6. Deploy to nix-cache02
|
||||||
|
7. Verify the native runner appears as online in Forgejo UI
|
||||||
|
|
||||||
|
### 4. Test with a workflow
|
||||||
|
|
||||||
|
In a trusted repo (e.g. nixos-exporter):
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
name: Build
|
||||||
|
on: [push]
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: native-nix
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- run: nix build
|
||||||
|
```
|
||||||
|
|
||||||
|
## Future Work
|
||||||
|
|
||||||
|
- **NixOS config CI**: Workflow that builds all `nixosConfigurations` on push to master, populating the binary cache.
|
||||||
|
- **Nix store GC policy**: CI builds will accumulate store paths. Since this host is the binary cache, GC needs to be conservative — only delete paths not referenced by current system configurations. Defer to a follow-up.
|
||||||
|
- **Resource limits**: Consider systemd MemoryMax/CPUQuota on the native runner if resource contention becomes an issue.
|
||||||
|
- **Additional host packages**: Evaluate whether tools like `cachix` or `nix-prefetch-*` should be added.
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- Should `hostPackages` include additional tools beyond the basics listed above?
|
||||||
|
- Do we want a separate capacity for the native runner vs container runner, or is 4 fine for both?
|
||||||
@@ -236,6 +236,15 @@
|
|||||||
./hosts/nrec-nixos02
|
./hosts/nrec-nixos02
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
media1 = nixpkgs.lib.nixosSystem {
|
||||||
|
inherit system;
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs self;
|
||||||
|
};
|
||||||
|
modules = commonModules ++ [
|
||||||
|
./hosts/media1
|
||||||
|
];
|
||||||
|
};
|
||||||
openstack-template = nixpkgs.lib.nixosSystem {
|
openstack-template = nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
|
|||||||
84
hosts/media1/configuration.nix
Normal file
84
hosts/media1/configuration.nix
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./hardware-configuration.nix
|
||||||
|
../../system
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
networking.hostName = "media1";
|
||||||
|
networking.domain = "home.2rjus.net";
|
||||||
|
networking.useNetworkd = true;
|
||||||
|
networking.useDHCP = false;
|
||||||
|
networking.firewall.enable = false;
|
||||||
|
services.resolved.enable = true;
|
||||||
|
networking.nameservers = [
|
||||||
|
"10.69.13.5"
|
||||||
|
"10.69.13.6"
|
||||||
|
];
|
||||||
|
|
||||||
|
systemd.network.enable = true;
|
||||||
|
systemd.network.networks."10-lan" = {
|
||||||
|
matchConfig.Name = "enp*";
|
||||||
|
address = [
|
||||||
|
"10.69.31.51/24"
|
||||||
|
];
|
||||||
|
routes = [
|
||||||
|
{ Gateway = "10.69.31.1"; }
|
||||||
|
];
|
||||||
|
linkConfig.RequiredForOnline = "routable";
|
||||||
|
};
|
||||||
|
|
||||||
|
time.timeZone = "Europe/Oslo";
|
||||||
|
|
||||||
|
homelab.host = {
|
||||||
|
tier = "prod";
|
||||||
|
priority = "low";
|
||||||
|
role = "media";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Intel N100 (Alder Lake-N) graphics
|
||||||
|
hardware.graphics = {
|
||||||
|
enable = true;
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
intel-media-driver # VA-API driver for Broadwell+
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# NFS for media access
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
nfs-utils
|
||||||
|
];
|
||||||
|
services.rpcbind.enable = true;
|
||||||
|
|
||||||
|
systemd.mounts = [
|
||||||
|
{
|
||||||
|
type = "nfs";
|
||||||
|
mountConfig = {
|
||||||
|
Options = "ro,soft,noatime";
|
||||||
|
};
|
||||||
|
what = "nas.home.2rjus.net:/mnt/hdd-pool/media";
|
||||||
|
where = "/mnt/nas/media";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
systemd.automounts = [
|
||||||
|
{
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
automountConfig = {
|
||||||
|
TimeoutIdleSec = "5min";
|
||||||
|
};
|
||||||
|
where = "/mnt/nas/media";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
vault.enable = true;
|
||||||
|
|
||||||
|
system.stateVersion = "25.11";
|
||||||
|
}
|
||||||
7
hosts/media1/default.nix
Normal file
7
hosts/media1/default.nix
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./configuration.nix
|
||||||
|
./media-desktop.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
33
hosts/media1/hardware-configuration.nix
Normal file
33
hosts/media1/hardware-configuration.nix
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
# 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.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "/dev/disk/by-uuid/0e1f61fd-18c6-4114-942e-f113a1e4b347";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/03C8-7DFE";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices =
|
||||||
|
[ { device = "/dev/disk/by-uuid/0871bf99-9db6-4cd7-b307-3cebbb0a4e60"; }
|
||||||
|
];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
166
hosts/media1/media-desktop.nix
Normal file
166
hosts/media1/media-desktop.nix
Normal file
@@ -0,0 +1,166 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
kodiPkg = pkgs.kodi-wayland.withPackages (p: [
|
||||||
|
p.jellycon
|
||||||
|
p.sendtokodi
|
||||||
|
p.inputstream-adaptive
|
||||||
|
]);
|
||||||
|
|
||||||
|
hyprlandConfig = ''
|
||||||
|
# Monitor — auto-detect, native resolution
|
||||||
|
monitor = , preferred, auto, 1
|
||||||
|
|
||||||
|
# Keyboard layout
|
||||||
|
input {
|
||||||
|
kb_layout = no
|
||||||
|
}
|
||||||
|
|
||||||
|
# Launch Kodi, Firefox, and kitty on login
|
||||||
|
exec-once = ${lib.getExe' kodiPkg "kodi"}
|
||||||
|
exec-once = ${lib.getExe pkgs.firefox}
|
||||||
|
exec-once = ${lib.getExe pkgs.kitty}
|
||||||
|
|
||||||
|
# Workspace rules — Kodi on 1, Firefox on 2, kitty on 3
|
||||||
|
windowrulev2 = workspace 1 silent, class:^(kodi)$
|
||||||
|
windowrulev2 = workspace 2 silent, class:^(firefox)$
|
||||||
|
windowrulev2 = workspace 3 silent, class:^(kitty)$
|
||||||
|
windowrulev2 = fullscreen, class:^(kodi)$
|
||||||
|
windowrulev2 = fullscreen, class:^(firefox)$
|
||||||
|
windowrulev2 = fullscreen, class:^(kitty)$
|
||||||
|
|
||||||
|
# Start on workspace 1 (Kodi)
|
||||||
|
workspace = 1, default:true
|
||||||
|
|
||||||
|
# Switch workspaces with Super+1/2/3
|
||||||
|
bind = SUPER, 1, workspace, 1
|
||||||
|
bind = SUPER, 2, workspace, 2
|
||||||
|
bind = SUPER, 3, workspace, 3
|
||||||
|
|
||||||
|
# No gaps, no borders — TV setup
|
||||||
|
general {
|
||||||
|
gaps_in = 0
|
||||||
|
gaps_out = 0
|
||||||
|
border_size = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
decoration {
|
||||||
|
rounding = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Disable animations for snappy switching
|
||||||
|
animations {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
|
||||||
|
misc {
|
||||||
|
# Disable Hyprland logo/splash
|
||||||
|
disable_hyprland_logo = true
|
||||||
|
disable_splash_rendering = true
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
# Hyprland compositor with UWSM for proper dbus/systemd session management
|
||||||
|
programs.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
withUWSM = true;
|
||||||
|
portalPackage = pkgs.xdg-desktop-portal-hyprland;
|
||||||
|
};
|
||||||
|
|
||||||
|
# greetd for auto-login — UWSM starts Hyprland as a systemd session
|
||||||
|
services.greetd = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
default_session = {
|
||||||
|
command = "uwsm start hyprland-uwsm.desktop";
|
||||||
|
user = "kodi";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Deploy Hyprland config to kodi user's XDG config dir
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d /home/kodi/.config/hypr 0755 kodi kodi -"
|
||||||
|
];
|
||||||
|
environment.etc."skel/hypr/hyprland.conf".text = hyprlandConfig;
|
||||||
|
system.activationScripts.hyprlandConfig = lib.stringAfter [ "users" ] ''
|
||||||
|
install -D -o kodi -g kodi -m 0644 /dev/stdin /home/kodi/.config/hypr/hyprland.conf <<'HYPRCONF'
|
||||||
|
${hyprlandConfig}
|
||||||
|
HYPRCONF
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Kodi user
|
||||||
|
users.users.kodi = {
|
||||||
|
isNormalUser = true;
|
||||||
|
home = "/home/kodi";
|
||||||
|
homeMode = "750";
|
||||||
|
group = "kodi";
|
||||||
|
extraGroups = [
|
||||||
|
"video"
|
||||||
|
"audio"
|
||||||
|
"input"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
users.groups.kodi = { };
|
||||||
|
|
||||||
|
# Allow promtail to read kodi logs
|
||||||
|
users.users.promtail.extraGroups = [ "kodi" ];
|
||||||
|
systemd.services.promtail.serviceConfig.ProtectHome = lib.mkForce "read-only";
|
||||||
|
|
||||||
|
# Packages available on the system
|
||||||
|
environment.systemPackages = [
|
||||||
|
kodiPkg
|
||||||
|
pkgs.firefox
|
||||||
|
pkgs.kitty
|
||||||
|
pkgs.yt-dlp
|
||||||
|
];
|
||||||
|
|
||||||
|
# PipeWire for audio (HDMI passthrough support)
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
wireplumber.extraConfig."60-hdmi-default" = {
|
||||||
|
"monitor.alsa.rules" = [
|
||||||
|
{
|
||||||
|
matches = [{ "node.name" = "~alsa_output.pci-.*hdmi.*"; }];
|
||||||
|
actions.update-props = {
|
||||||
|
"priority.session" = 2000;
|
||||||
|
"priority.driver" = 2000;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Allow VA-API hardware decode in Firefox
|
||||||
|
environment.sessionVariables = {
|
||||||
|
MOZ_ENABLE_WAYLAND = "1";
|
||||||
|
LIBVA_DRIVER_NAME = "iHD";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Ship Kodi logs to Loki
|
||||||
|
services.promtail.configuration.scrape_configs = [
|
||||||
|
{
|
||||||
|
job_name = "kodi";
|
||||||
|
static_configs = [
|
||||||
|
{
|
||||||
|
targets = [ "localhost" ];
|
||||||
|
labels = {
|
||||||
|
job = "kodi";
|
||||||
|
hostname = config.networking.hostName;
|
||||||
|
tier = config.homelab.host.tier;
|
||||||
|
role = config.homelab.host.role;
|
||||||
|
__path__ = "/home/kodi/.kodi/temp/kodi.log";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
# Fetch runner token from Vault
|
# Fetch runner token from Vault
|
||||||
vault.secrets.forgejo-runner-token = {
|
vault.secrets.forgejo-runner-token = {
|
||||||
@@ -13,4 +13,39 @@
|
|||||||
tokenFile = "/run/secrets/forgejo-runner-token";
|
tokenFile = "/run/secrets/forgejo-runner-token";
|
||||||
settings.runner.capacity = 4;
|
settings.runner.capacity = 4;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Fetch native runner token from Vault
|
||||||
|
vault.secrets.forgejo-native-runner-token = {
|
||||||
|
secretPath = "hosts/nix-cache02/forgejo-native-runner-token";
|
||||||
|
extractKey = "token";
|
||||||
|
mode = "0444";
|
||||||
|
services = [ "gitea-runner-actions-native" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Native nix runner instance (user-level, no containers)
|
||||||
|
services.gitea-actions-runner.instances.actions-native = {
|
||||||
|
enable = true;
|
||||||
|
name = "${config.networking.hostName}-native";
|
||||||
|
url = "https://code.t-juice.club";
|
||||||
|
tokenFile = "/run/secrets/forgejo-native-runner-token";
|
||||||
|
labels = [ "native-nix:host" ];
|
||||||
|
hostPackages = with pkgs; [
|
||||||
|
bash
|
||||||
|
coreutils
|
||||||
|
curl
|
||||||
|
gawk
|
||||||
|
git
|
||||||
|
gnused
|
||||||
|
nodejs
|
||||||
|
wget
|
||||||
|
nix
|
||||||
|
];
|
||||||
|
settings = {
|
||||||
|
runner.capacity = 4;
|
||||||
|
cache = {
|
||||||
|
enabled = true;
|
||||||
|
dir = "/var/lib/gitea-runner/actions-native/cache";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,11 +16,11 @@
|
|||||||
|
|
||||||
settings.repos = {
|
settings.repos = {
|
||||||
nixos-servers = {
|
nixos-servers = {
|
||||||
url = "git+https://git.t-juice.club/torjus/nixos-servers.git";
|
url = "git+https://code.t-juice.club/torjus/nixos-servers.git";
|
||||||
defaultBranch = "master";
|
defaultBranch = "master";
|
||||||
};
|
};
|
||||||
nixos = {
|
nixos = {
|
||||||
url = "git+https://git.t-juice.club/torjus/nixos.git";
|
url = "git+https://code.t-juice.club/torjus/nixos.git";
|
||||||
defaultBranch = "master";
|
defaultBranch = "master";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -70,10 +70,10 @@ let
|
|||||||
echo "Waiting for network connectivity..."
|
echo "Waiting for network connectivity..."
|
||||||
|
|
||||||
# Verify we can reach the git server via HTTPS (doesn't respond to ping)
|
# Verify we can reach the git server via HTTPS (doesn't respond to ping)
|
||||||
if ! curl -s --connect-timeout 5 --max-time 10 https://git.t-juice.club >/dev/null 2>&1; then
|
if ! curl -s --connect-timeout 5 --max-time 10 https://code.t-juice.club >/dev/null 2>&1; then
|
||||||
echo "ERROR: Cannot reach git.t-juice.club via HTTPS"
|
echo "ERROR: Cannot reach code.t-juice.club via HTTPS"
|
||||||
echo "Check network configuration and DNS settings"
|
echo "Check network configuration and DNS settings"
|
||||||
log_to_loki "failed" "Network check failed - cannot reach git.t-juice.club"
|
log_to_loki "failed" "Network check failed - cannot reach code.t-juice.club"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -134,7 +134,7 @@ let
|
|||||||
log_to_loki "building" "Starting nixos-rebuild boot"
|
log_to_loki "building" "Starting nixos-rebuild boot"
|
||||||
|
|
||||||
# Build and activate the host-specific configuration
|
# Build and activate the host-specific configuration
|
||||||
FLAKE_URL="git+https://git.t-juice.club/torjus/nixos-servers.git?ref=$BRANCH#''${HOSTNAME}"
|
FLAKE_URL="git+https://code.t-juice.club/torjus/nixos-servers.git?ref=$BRANCH#''${HOSTNAME}"
|
||||||
|
|
||||||
if nixos-rebuild boot --flake "$FLAKE_URL"; then
|
if nixos-rebuild boot --flake "$FLAKE_URL"; then
|
||||||
echo "Successfully built configuration for $HOSTNAME"
|
echo "Successfully built configuration for $HOSTNAME"
|
||||||
|
|||||||
@@ -21,9 +21,6 @@
|
|||||||
# 30
|
# 30
|
||||||
"gunter" = "10.69.30.105";
|
"gunter" = "10.69.30.105";
|
||||||
|
|
||||||
# 31
|
|
||||||
"media" = "10.69.31.50";
|
|
||||||
|
|
||||||
# 99_MGMT
|
# 99_MGMT
|
||||||
"sw1" = "10.69.99.2";
|
"sw1" = "10.69.99.2";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -38,12 +38,6 @@
|
|||||||
do-udp = "yes";
|
do-udp = "yes";
|
||||||
do-tcp = "yes";
|
do-tcp = "yes";
|
||||||
extended-statistics = true;
|
extended-statistics = true;
|
||||||
|
|
||||||
# Recover faster from upstream failures (e.g. ISP outage)
|
|
||||||
# Default 900s is too long - keeps marking servers as bad
|
|
||||||
infra-host-ttl = 120;
|
|
||||||
# Clean up stale TLS connections faster (default 60s)
|
|
||||||
tcp-reuse-timeout = 15;
|
|
||||||
};
|
};
|
||||||
remote-control = {
|
remote-control = {
|
||||||
control-enable = true;
|
control-enable = true;
|
||||||
|
|||||||
@@ -4,6 +4,6 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
randomizedDelaySec = "1h";
|
randomizedDelaySec = "1h";
|
||||||
allowReboot = true;
|
allowReboot = true;
|
||||||
flake = "git+https://git.t-juice.club/torjus/nixos-servers.git";
|
flake = "git+https://code.t-juice.club/torjus/nixos-servers.git";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ in
|
|||||||
role = hostCfg.role;
|
role = hostCfg.role;
|
||||||
natsUrl = "nats://nats1.home.2rjus.net:4222";
|
natsUrl = "nats://nats1.home.2rjus.net:4222";
|
||||||
nkeyFile = "/run/secrets/homelab-deploy-nkey";
|
nkeyFile = "/run/secrets/homelab-deploy-nkey";
|
||||||
flakeUrl = "git+https://git.t-juice.club/torjus/nixos-servers.git";
|
flakeUrl = "git+https://code.t-juice.club/torjus/nixos-servers.git";
|
||||||
metrics.enable = true;
|
metrics.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
# Default port: 9971
|
# Default port: 9971
|
||||||
flake = {
|
flake = {
|
||||||
enable = true;
|
enable = true;
|
||||||
url = "git+https://git.t-juice.club/torjus/nixos-servers.git";
|
url = "git+https://code.t-juice.club/torjus/nixos-servers.git";
|
||||||
nats = {
|
nats = {
|
||||||
enable = true;
|
enable = true;
|
||||||
url = "nats://nats1.home.2rjus.net:4222";
|
url = "nats://nats1.home.2rjus.net:4222";
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
branch="$2"
|
branch="$2"
|
||||||
shift 2
|
shift 2
|
||||||
|
|
||||||
exec nixos-rebuild "$action" --flake "git+https://git.t-juice.club/torjus/nixos-servers.git?ref=$branch" "$@"
|
exec nixos-rebuild "$action" --flake "git+https://code.t-juice.club/torjus/nixos-servers.git?ref=$branch" "$@"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -63,6 +63,11 @@ locals {
|
|||||||
"secret/data/hosts/pn02/*",
|
"secret/data/hosts/pn02/*",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
"media1" = {
|
||||||
|
paths = [
|
||||||
|
"secret/data/hosts/media1/*",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -145,12 +145,17 @@ locals {
|
|||||||
password_length = 64
|
password_length = 64
|
||||||
}
|
}
|
||||||
|
|
||||||
# Forgejo runner token for nix-cache02
|
# Forgejo runner tokens for nix-cache02
|
||||||
"hosts/nix-cache02/forgejo-runner-token" = {
|
"hosts/nix-cache02/forgejo-runner-token" = {
|
||||||
auto_generate = false
|
auto_generate = false
|
||||||
data = { token = var.forgejo_runner_token }
|
data = { token = var.forgejo_runner_token }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
"hosts/nix-cache02/forgejo-native-runner-token" = {
|
||||||
|
auto_generate = false
|
||||||
|
data = { token = var.forgejo_native_runner_token }
|
||||||
|
}
|
||||||
|
|
||||||
# Loki push authentication (used by Promtail on all hosts)
|
# Loki push authentication (used by Promtail on all hosts)
|
||||||
"shared/loki/push-auth" = {
|
"shared/loki/push-auth" = {
|
||||||
auto_generate = true
|
auto_generate = true
|
||||||
|
|||||||
@@ -116,3 +116,10 @@ variable "forgejo_runner_token" {
|
|||||||
sensitive = true
|
sensitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "forgejo_native_runner_token" {
|
||||||
|
description = "Forgejo Actions runner token for native nix runner on nix-cache02"
|
||||||
|
type = string
|
||||||
|
default = "PLACEHOLDER"
|
||||||
|
sensitive = true
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user