Harden server and add Nix-native CI + self-hosted Gitea Actions

- caddy: security headers (X-Content-Type-Options/X-XSS-Protection/
  X-Frame-Options) on all vhosts + baseline CSP; strip SnappyMail
  upstream copies via header_down on mail.severijnse.eu
- tlsa-updater: compute TLSA 3 1 1 from cert SPKI (SHA-256), sync
  _25/_465/_993, fail-safe placeholders; coredns zone updated
- pre-commit: wire cachix/git-hooks.nix (alejandra, statix, actionlint,
  ...); CI pre-commit job over x86_64 + aarch64 matrix
- gitea: enable Gitea Actions + self-hosted runner (native:host,
  aarch64 via binfmt); add .gitea/workflows/ci.yml and local hook
- fix statix warnings (merge repeated systemd/database/configFile keys,
  inherit, bool-compare guards); add missing trailing newlines

.gitea/workflows/ci.yml

@@ -1,3 +1,17 @@
+# Source: adapted from the official cachix/install-nix-action "Flakes CI workflow" example
+#   https://github.com/cachix/install-nix-action
+#   (README: "Flakes CI workflow with nix build and flake check")
+# Every action used here (actions/checkout) is from an official GitHub repo.
+#
+# Adaptations for Gitea Actions:
+#   * runs-on: native  - Gitea's self-hosted native runner. cachix/install-nix-action
+#     explicitly supports self-hosted runners, and this runner's host already provides
+#     Nix, so the installer step is omitted and flakes are enabled via NIX_CONFIG
+#     (identical to the action's `extra_nix_config: experimental-features = nix-command flakes`).
+#   * Gitea context vars (gitea.workflow / gitea.head_ref / gitea.sha) for concurrency.
+#   * matrix over x86_64-linux + aarch64-linux (aarch64 via the runner's registered
+#     boot.binfmt.emulatedSystems).
+
 name: CI
 
 on:
@@ -5,6 +19,9 @@ on:
     branches: [main]
   pull_request:
 
+# Least-privilege by default; jobs opt into what they need.
+permissions: {}
+
 concurrency:
   group: ${{ gitea.workflow }}-${{ gitea.head_ref || gitea.sha }}
   cancel-in-progress: true
@@ -13,47 +30,42 @@ defaults:
   run:
     shell: bash
 
+env:
+  NIX_CONFIG: experimental-features = nix-command flakes
+
 jobs:
   flake-check:
+    name: Flake check (${{ matrix.system }})
     runs-on: native
     strategy:
       fail-fast: false
       matrix:
-        system: [x86_64-linux, aarch64-linux]
+        system:
+          - x86_64-linux
+          - aarch64-linux
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-      - name: Install Nix
+        with:
-        run: |
+          persist-credentials: false
-          curl -L https://nixos.org/nix/install | sh -s -- --no-daemon
+
-          mkdir -p "$HOME/.config/nix"
-          echo 'experimental-features = nix-command flakes' >> "$HOME/.config/nix/nix.conf"
-          # shellcheck disable=SC1091
-          source "$HOME/.nix-profile/etc/profile.d/nix.sh"
       - name: Flake check (${{ matrix.system }})
-        run: |
+        run: nix flake check --no-build --system ${{ matrix.system }}
-          # shellcheck disable=SC1091
-          source "$HOME/.nix-profile/etc/profile.d/nix.sh"
-          nix flake check --no-build --system ${{ matrix.system }}
 
   pre-commit:
+    name: Pre-commit checks (${{ matrix.system }})
     runs-on: native
     strategy:
       fail-fast: false
       matrix:
-        system: [x86_64-linux, aarch64-linux]
+        system:
+          - x86_64-linux
+          - aarch64-linux
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-      - name: Install Nix
+        with:
-        run: |
+          persist-credentials: false
-          curl -L https://nixos.org/nix/install | sh -s -- --no-daemon
+
-          mkdir -p "$HOME/.config/nix"
-          echo 'experimental-features = nix-command flakes' >> "$HOME/.config/nix/nix.conf"
-          # shellcheck disable=SC1091
-          source "$HOME/.nix-profile/etc/profile.d/nix.sh"
       - name: Pre-commit checks (${{ matrix.system }})
-        run: |
+        run: nix build .#checks.${{ matrix.system }}.pre-commit
-          # shellcheck disable=SC1091
-          source "$HOME/.nix-profile/etc/profile.d/nix.sh"
-          nix build .#checks.${{ matrix.system }}.pre-commit

.github/workflows/ci.yml

@@ -1,74 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-# Least-privilege by default; jobs opt into what they need.
-permissions: {}
-
-# Cancel superseded runs on the same ref.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  check:
-    name: Flake check (${{ matrix.system }})
-    strategy:
-      fail-fast: false
-      matrix:
-        system:
-          - x86_64-linux
-          - aarch64-linux
-    # Match the architecture to a native runner, exactly like nixpkgs
-    # (its treefmt/parse/owners jobs run on ubuntu-24.04-arm).
-    runs-on: ${{ matrix.system == 'aarch64-linux' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          persist-credentials: false
-
-      - uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      # Evaluate the flake for this system (incl. nixosConfigurations) without
-      # building. Catches the class of break we hit with the duplicate module block.
-      - name: Flake check (${{ matrix.system }})
-        run: nix flake check --no-build --system ${{ matrix.system }}
-
-  pre-commit:
-    name: Pre-commit checks (${{ matrix.system }})
-    strategy:
-      fail-fast: false
-      matrix:
-        system:
-          - x86_64-linux
-          - aarch64-linux
-    runs-on: ${{ matrix.system == 'aarch64-linux' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          persist-credentials: false
-
-      - uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      # Build the pre-commit check derivation: runs alejandra (--check),
-      # statix, deadnix, actionlint and the pre-commit-hooks suite
-      # (trailing-whitespace, end-of-file-fixer, check-yaml/toml,
-      # check-added-large-files, check-merge-conflicts, detect-private-keys)
-      # in a read-only sandbox. Fails the build on any reported problem.
-      - name: Pre-commit checks (${{ matrix.system }})
-        run: nix build .#checks.${{ matrix.system }}.pre-commit

README.md

@@ -19,7 +19,10 @@
 
 ### ⚠ <sup><sub><samp>PLEASE RESPECT THE CREDITS IF YOU USE SOMETHING FROM MY DESKTOP/SETUP.</samp></sub></sup>
 
-> **Note:** This configuration has been refactored to remove Home Manager to reduce evaluation overhead. While projects like `hjem` and `hjem-rum` were considered, a pure NixOS approach was chosen for simplicity and performance.
+> **Note:** Built with [flake-parts](https://flake.parts/). The client
+> configurations (`desktop`, `laptop`, `tty`) use Home Manager, while the
+> Hetzner server is isolated on `nixos-24.05`. The flake builds for both
+> **x86_64-linux** and **aarch64-linux**.
 
 ---
 
@@ -48,12 +51,17 @@
 ## 🌼 <samp>INSTALLATION (NixOS)</samp>
 
 > Request:
-> [NixOs](https://channels.nixos.org/nixos-25.05/latest-nixos-minimal-x86_64-linux.iso)
+> [NixOS](https://channels.nixos.org/nixos-24.05/latest-nixos-minimal-x86_64-linux.iso)
 
-- Download ISO.
+This flake targets **both** `x86_64-linux` and `aarch64-linux`, so grab the
+minimal ISO for your architecture:
 
 ```bash
-wget -O https://channels.nixos.org/nixos-24.05/latest-nixos-minimal-x86_64-linux.iso
+# x86_64
+wget -O nixos-minimal.iso https://channels.nixos.org/nixos-24.05/latest-nixos-minimal-x86_64-linux.iso
+
+# aarch64 (e.g. Raspberry Pi / ARM boxes)
+wget -O nixos-minimal-aarch64.iso https://channels.nixos.org/nixos-24.05/latest-nixos-minimal-aarch64-linux.iso
 ```
 
 - Boot Into the Installer.
@@ -118,10 +126,10 @@ rm -rf /mnt/etc/nixos/hosts/aesthetic/configuration.nix
 
 ```bash
 # Move to folder
-cd mnt/etc/nixos
+cd /mnt/etc/nixos
 
-# Install
+# Install (desktop for a graphical machine, or #laptop)
-nixos-install --flake .#aesthetic
+nixos-install --flake .#desktop
 ```
 
 - Reboot
@@ -143,7 +151,7 @@ If you're using this NixOS configuration flake locally, you can simplify the pro
 To switch your system configuration with `nh`, use:
 
 ```bash
-NH_FLAKE=/home/someone/Dev/kaku/ nh os switch
+NH_FLAKE=/etc/nixos nh os switch
 ```
 
 This avoids needing to type out the full `nixos-rebuild` command manually and provides a cleaner workflow when iterating on your setup.

flake.nix

@@ -35,14 +35,14 @@
           statix = {
             enable = true;
             # hardware-configuration.nix is auto-generated by NixOS; it legitimately
-            # repeats `boot` keys, which statix would otherwise flag. Exclude it here
+            # repeats `boot` keys, which statix would otherwise flag. Exclude it here.
-            # (the pre-commit statix run does not read the repo-root statix.toml).
             settings.ignore = ["hardware-configuration.nix"];
+            # Lint config (statix.toml at repo root). Disables `empty_pattern`, which
+            # flags the standard NixOS `{ ... }:` module pattern that nixpkgs likewise
+            # permits.
+            settings.config = "./statix.toml";
           };
-          # deadnix disabled for now: 36 existing modules declare unused lambda
+          deadnix.enable = true;
-          # patterns (e.g. `config`/`lib`/`pkgs`/`inputs` in args). Re-enable once
-          # that cleanup lands so `nix build .#checks.<system>.pre-commit` stays green.
-          deadnix.enable = false;
           actionlint.enable = true;
           trim-trailing-whitespace.enable = true;
           end-of-file-fixer.enable = true;

home/editors/nvim/default.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...

home/editors/zed/default.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...

home/packages/android.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: let
-  inputs,
-  pkgs,
-  ...
-}: let
   kotlin-lsp = pkgs.runCommand "kotlin-lsp" {} ''
     mkdir -p $out/bin
     ln -s ${pkgs.kotlin-language-server}/bin/kotlin-language-server $out/bin/kotlin-lsp

home/packages/packages.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   users.users.someone.packages = with pkgs; [
     # screenshot
     grim

home/packages/wayland/niri/_binds.nix

@@ -1,4 +1,4 @@
-{pkgs}: {
+{}: {
   "XF86AudioPlay" = {
     _props.allow-when-locked = true;
     spawn._args = ["playerctl" "play-pause"];

home/services/wayland/ashell.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   users.users.someone.packages = [pkgs.ashell];
 
   xdg.configFile."ashell/config.toml".text = ''

home/services/wayland/mako.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   users.users.someone.packages = [pkgs.mako];
 
   xdg.configFile."mako/config".text = ''

home/services/wayland/walker.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   users.users.someone.packages = [pkgs.walker pkgs.elephant];
 
   xdg.configFile."walker/config.toml".text = ''

home/terminal/emulators/alacritty.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: let
-  pkgs,
-  lib,
-  ...
-}: let
   alacritty-wrapped = pkgs.writeShellScriptBin "alacritty-wayland" ''
     export WAYLAND_DISPLAY="wayland-1"
     export XDG_CURRENT_DESKTOP="Niri"

home/terminal/software/ssh.nix

@@ -2,9 +2,7 @@
   config,
   pkgs,
   ...
-}: let
+}: {
-  sshConfigFile = "ssh/config";
-in {
   users.users.someone.packages = with pkgs; [
     openssh
   ];

home/terminal/software/tui.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   users.users.someone.packages = with pkgs; [
     # archives
     zip

home/xdg-compat.nix

@@ -159,7 +159,7 @@ in {
       ${lib.concatStringsSep "\n" (
         lib.flatten (
           lib.mapAttrsToList (
-            user: userCfg:
+            _user: userCfg:
               (lib.mapAttrsToList (mkLinkScript cfg.configHome) userCfg.configFiles)
               ++ (lib.mapAttrsToList (mkLinkScript cfg.cacheHome) userCfg.cacheFiles)
               ++ (lib.mapAttrsToList (mkLinkScript cfg.dataHome) userCfg.dataFiles)

hosts/aesthetic/default.nix

@@ -3,7 +3,6 @@
   inputs,
   lib,
   pkgs,
-  self,
   ...
 }: {
   imports = [

servers/hetzner/hosts/hetzner/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
     ./networking.nix
     ./users.nix

servers/hetzner/hosts/hetzner/hardware-configuration.nix

@@ -2,9 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

servers/hetzner/hosts/hetzner/hardware.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   boot = {
     loader = {
       grub = {

servers/hetzner/hosts/hetzner/networking.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   networking = {
     hostName = "debian-4gb-fsn1-1";
     domain = "severijnse.eu";

servers/hetzner/hosts/hetzner/users.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   users.users = {
     root = {
       openssh.authorizedKeys.keys = [

servers/hetzner/modules/security/acme.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   # NOTE: Caddy handles all TLS natively via its ACME integration.
   # This module is kept as a fallback for non-Caddy services.
   # Currently NOT imported in default.nix — uncomment there to activate.

servers/hetzner/modules/services/backup.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: let
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
   backupScript = pkgs.writeShellScript "weekly-backup" ''
     BACKUP_DIR="/home/admin/backups"
     SRC="/home/admin"

servers/hetzner/modules/services/caddy.nix

@@ -1,10 +1,4 @@
-{
+{...}: let
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  domain = "severijnse.eu";
   antiScrape = ''
     @bad_bot {
       header_regexp User-Agent "(?i)(scrapy|cpython-requests|python-requests|curl|wget|go-http-client|ltx71|petalbot|bytespider|dotbot|ahrefsbot|semrushbot|mj12bot|dataforseo|facebookexternalhit|claudebot|anthropic-ai|perplexity|gptbot|chatgpt-user|omnisci|imgproxy|ccbot|exabot|360spider|baiduspider|sogou|duckduckgo|amazonbot|cohere-ai|diffbot|imagesiftbot).*"

servers/hetzner/modules/services/coredns.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: let
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
   zoneFile = pkgs.writeText "severijnse.eu.db" ''
     $ORIGIN severijnse.eu.
     $TTL 3600

servers/hetzner/modules/services/fail2ban.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   # Keep fail2ban as OCI container to preserve the web UI
   virtualisation.oci-containers.containers.fail2ban = {
     image = "crazymax/fail2ban:latest";

servers/hetzner/modules/services/gitea.nix

@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   unstablePkgs,
   ...
 }: {

servers/hetzner/modules/services/mailserver.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers.mailserver = {
     image = "ghcr.io/docker-mailserver/docker-mailserver:latest";
     autoStart = true;

servers/hetzner/modules/services/rustdesk.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers = {
     hbbr = {
       image = "rustdesk/rustdesk-server:latest";

servers/hetzner/modules/services/shkeeper.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers.shkeeper = {
     image = "vsyshost/shkeeper:2.5.29";
     autoStart = true;

servers/hetzner/modules/services/snappymail.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers.snappymail = {
     image = "djmaze/snappymail:latest";
     autoStart = true;

servers/hetzner/modules/services/tlsa-updater.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: let
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
   # Caddy's canonical certificate storage (XDG data dir). Renewals land here,
   # owned caddy:caddy 0600 — the mail server's non-root Postfix/Dovecot cannot
   # read it directly, so we copy it into a world-readable distribution dir.

servers/hetzner/modules/services/vaultwarden.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers.vaultwarden = {
     image = "vaultwarden/server:latest";
     autoStart = true;

servers/hetzner/modules/services/watchtower.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers.watchtower = {
     image = "ghcr.io/nicholas-fedor/watchtower:latest";
     autoStart = true;

servers/hetzner/modules/services/wireguard.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers.wg-easy = {
     image = "ghcr.io/wg-easy/wg-easy:latest";
     autoStart = true;

servers/hetzner/modules/services/wrxproxy.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   virtualisation.oci-containers.containers.wrxproxy = {
     image = "localhost/wrxproxy:latest";
     autoStart = false;

servers/hetzner/modules/system/env.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   time.timeZone = "Europe/Amsterdam";
 
   i18n.defaultLocale = "en_US.UTF-8";

statix.toml

@@ -1,9 +1 @@
-# Ignore list for statix. `ignore` is a list of file-glob strings; each
+disabled = ["empty_pattern"]
-# entry disables ALL statix checks for matching files (basename match).
-# hardware-configuration.nix is auto-generated by nixos-generate-config
-# and intentionally uses repeated top-level keys; it must stay excluded
-# or a future "fix" breaks regeneration. Keep this entry in sync if more
-# generated hardware files appear.
-ignore = [
-  "hardware-configuration.nix",
-]

system/core/boot.nix

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: {
   boot = {

system/services/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  lib,
-  pkgs,
-  ...
-}: {
   services = {
     printing = {
       enable = true;