flake update

.githooks/pre-commit

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+nix fmt .
+git diff --exit-code || {
+  echo "Formatter changed files — review with 'git diff', then re-stage and commit."
+  exit 1
+}

CLAUDE.md

@@ -0,0 +1,108 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## What This Repo Is
+
+A NixOS flake configuration managing multiple hosts (desktops, laptops, servers). All hosts share common settings via `hosts/configuration_common.nix` and are assembled in `hosts/default.nix`.
+
+## Common Commands
+
+```bash
+# Format all nix files
+nix fmt
+
+# Build a host configuration (no activation)
+nixos-rebuild build --flake .#<host>
+
+# Switch the current host
+sudo nixos-rebuild switch --flake .#<host>
+
+# Build a custom package
+nix build .#<package>
+
+# Edit an age-encrypted secret
+agenix -e secrets/<path>.age
+
+# Re-key all secrets after adding a new host key to secrets/secrets.nix
+agenix -r
+```
+
+## Architecture
+
+### Entry Points
+
+- `flake.nix` — defines inputs (nixpkgs stable=25.11, unstable, home-manager, agenix, lanzaboote, jovian-nixos, microvm, impermanence, noctalia) and calls `hosts/default.nix` for `nixosConfigurations`
+- `hosts/default.nix` — instantiates every host via `lib.nixosSystem`; contains the `mkHM` helper that wires home-manager into a host's modules list
+
+### Host Structure
+
+Each host lives in `hosts/<name>/`:
+- `default.nix` — imports either `../../modules/desktop` or `../../modules/server`, sets the module options (`myDesktop.*` / `myServer.*`), and adds host-specific settings
+- `home.nix` — host-specific home-manager config (merged with `hosts/home.nix` for desktops or `hosts/home_server.nix` for servers)
+- `hardware-configuration.nix` — generated hardware config
+
+Shared host-level files:
+- `hosts/configuration_common.nix` — applied to every host: SSH (key-only, no root), locale, nix GC/settings, zsh, fonts, auto-upgrade flake URL
+- `hosts/home.nix` — desktop home-manager base
+- `hosts/home_server.nix` — server home-manager base
+
+### Module System
+
+Two top-level NixOS modules expose all major knobs as typed options:
+
+**`modules/desktop/default.nix`** — `myDesktop.*`
+- `windowManager`: `"niri"` (default) | `"sway"` | `"kde"`
+- `cpu`: `"amd"` | `"intel"` | `"none"` — selects KVM kernel params
+- `virtualisation.enable` — podman (docker-compat) + qemu/libvirt + virt-manager
+- `syncthing.{enable,devices,folders}`
+- `openrgb.{enable,motherboard}`
+- `laptop.{enable,lidSwitch,hibernateDelaySec}`
+- `nitrokey.enable`
+- `niri.hotkeyVariant`: `"default"` | `"lifebook"`
+- `git.signingKey` — SSH key for commit signing
+- `extraSystemPackages`
+
+**`modules/server/default.nix`** — `myServer.*`
+- `sshPort` (default 2220)
+- `virtualisation.{enable,cpu}` — podman only (no libvirt)
+- `fail2ban.enable`
+- `autoUpgrade.enable` (default true)
+- `uid`, `sudoRequiresPassword`, `extraGroups`, `extraSystemPackages`
+
+Service bundles are imported as lists in host `default.nix`:
+- `modules/services/server/` — kabtop services (gitea, nextcloud, matrix, coturn, hydra, mealie, etc.)
+- `modules/services/nas/` — jupiter services (nfs, vaultwarden, syncthing, paperless)
+- `modules/services/dmz/` — dmz services (gitea runner microVM)
+- `modules/services/kabtopci/` — kabtopci services (hydra, gitea runner)
+- `modules/services/nasbackup/` — nasbak backup jobs
+
+### Secrets (agenix)
+
+`secrets/secrets.nix` declares which age public keys (users + host SSH keys) can decrypt each `.age` file. Add a new host: add its `ssh-ed25519` host key to `secrets/secrets.nix` in the relevant groups, then run `agenix -r` to re-key.
+
+### Custom Packages & Overlays
+
+- `packages/` — custom packages (e.g. `corosync-qdevice`), imported at `flake.nix` level
+- `overlays/` — nixpkgs overlays applied globally
+- Per-host overlays: set `nixpkgs.overlays` inside the host's `default.nix` so only that host is affected
+
+### Disk Layouts
+
+`disko/` contains reusable disko modules: `btrfs.nix`, `btrfs_luks.nix`, `nas_luks.nix` — referenced during initial install.
+
+## Active Hosts
+
+| Host | Role | WM / Notes |
+|---|---|---|
+| hades | Desktop | niri, AMD, Secure Boot (lanzaboote) |
+| lifebook | Laptop | niri, Intel, Secure Boot |
+| steamdeck | Gaming | KDE/Jovian-NixOS, Secure Boot |
+| kabtop | Main server | gitea, nextcloud, matrix+bridges, coturn, hydra, mealie |
+| kabtopci | CI server | hydra, nix-serve |
+| jupiter | NAS | nfs, vaultwarden, syncthing, paperless |
+| dmz | DMZ | gitea Actions homerunner microVM |
+| nasbak | NAS backup | — |
+| kubemaster-1 | K8s master | — |
+
+See `SERVICES.md` for port-level service details per host.

disko/btrfs.nix

@@ -13,7 +13,7 @@
               content = {
                 type = "filesystem";
                 format = "vfat";
-                extraArgs = [ "-n" "NIXBOOT" ];
+                extraArgs = ["-n" "NIXBOOT"];
                 mountpoint = "/boot";
                 mountOptions = [
                   "defaults"
@@ -24,31 +24,31 @@
               size = "100%";
               content = {
                 type = "btrfs";
-                extraArgs = [ "-f" "-L" "NIXROOT" ];
+                extraArgs = ["-f" "-L" "NIXROOT"];
                 subvolumes = {
                   "@" = {
                     mountpoint = "/";
-                    mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                    mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                   };
                   "@home" = {
                     mountpoint = "/home";
-                    mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                    mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                   };
                   "@nix" = {
                     mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                    mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                   };
                   "@snapshots" = {
                     mountpoint = "/mnt";
-                    mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                    mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                   };
                   "@srv" = {
                     mountpoint = "/srv";
-                    mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                    mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                   };
                   "@var" = {
                     mountpoint = "/var";
-                    mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                    mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                   };
                   "@swap" = {
                     mountpoint = "/swap";

disko/btrfs_luks.nix

@@ -13,7 +13,7 @@
               content = {
                 type = "filesystem";
                 format = "vfat";
-                extraArgs = [ "-n NIXBOOT" ];
+                extraArgs = ["-n NIXBOOT"];
                 mountpoint = "/boot";
                 mountOptions = [
                   "defaults"
@@ -33,35 +33,35 @@
                 };
                 content = {
                   type = "btrfs";
-                  extraArgs = [ "-f -L NIXROOT" ];
+                  extraArgs = ["-f -L NIXROOT"];
                   subvolumes = {
                     "@" = {
                       mountpoint = "/";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                     "@home" = {
                       mountpoint = "/home";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                     "@nix" = {
                       mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                     "@opt" = {
                       mountpoint = "/opt";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                     "@snapshots" = {
                       mountpoint = "/mnt";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                     "@srv" = {
                       mountpoint = "/srv";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                     "@var" = {
                       mountpoint = "/var";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                     "@swap" = {
                       mountpoint = "/swap";

disko/nas_luks.nix

@@ -20,20 +20,20 @@
                 };
                 content = {
                   type = "btrfs";
-                  extraArgs = [ "-f -L NAS-RAID" ];
+                  extraArgs = ["-f -L NAS-RAID"];
                   subvolumes = {
                     "@" = {
                       mountpoint = "/mnt/Pluto";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
-                    "@/Backups";
+                    "@/Backups" = {};
-                    "@/Media";
+                    "@/Media" = {};
-                    "@/Games";
+                    "@/Games" = {};
-                    "@/IT";
+                    "@/IT" = {};
-                    "@/Rest";
+                    "@/Rest" = {};
                     "@snapshots" = {
                       mountpoint = "/mnt";
-                      mountOptions = [ "compress=zstd" "noatime" "ssd" "discard=async" ];
+                      mountOptions = ["compress=zstd" "noatime" "ssd" "discard=async"];
                     };
                   };
                 };

flake.lock

@@ -25,11 +25,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1773189535,
+        "lastModified": 1777242778,
-        "narHash": "sha256-E1G/Or6MWeP+L6mpQ0iTFLpzSzlpGrITfU2220Gq47g=",
+        "narHash": "sha256-VWTeqWeb8Sel/QiWyaPvCa9luAbcGawR+Rw09FJoHz0=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "6fa2fb4cf4a89ba49fc9dd5a3eb6cde99d388269",
+        "rev": "ad8b31ad0ba8448bd958d7a5d50d811dc5d271c0",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776373306,
+        "lastModified": 1777679572,
-        "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=",
+        "narHash": "sha256-egYNbRrkn+6SwTHinhdb6WUfzzdC3nXfCRqS321VylY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36",
+        "rev": "9cb587ade2aa1b4a7257f0238d41072690b0ca4f",
         "type": "github"
       },
       "original": {
@@ -208,11 +208,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776335039,
+        "lastModified": 1777614199,
-        "narHash": "sha256-2lkQhrv6YUCeMlC/lclzq9vkTALv/ptv7d0jIhZnrPQ=",
+        "narHash": "sha256-k8fgidVoDNQTZWGLdhe6kLgpsLcydhPzal5YKVwxD2U=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "cbdf76c063b48d5d755fb26540367b8c2457c2ca",
+        "rev": "79f3e3cc5c643138b7b3405c42681451be85d838",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1776248416,
+        "lastModified": 1777299656,
-        "narHash": "sha256-TC6yzbCAex1pDfqUZv9u8fVm8e17ft5fNrcZ0JRDOIQ=",
+        "narHash": "sha256-c0r3xXp2+xFJwkryS+nhyQwoACbFzSt4C1TVs3QMh8E=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "18e9e64bae15b828c092658335599122a6db939b",
+        "rev": "079c608988c2747db3902c9de033572cd50e8656",
         "type": "github"
       },
       "original": {
@@ -290,11 +290,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1775490113,
+        "lastModified": 1776983936,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
         "type": "github"
       },
       "original": {
@@ -322,11 +322,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1776169885,
+        "lastModified": 1777578337,
-        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
+        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
+        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1776221942,
+        "lastModified": 1777428379,
-        "narHash": "sha256-FbQAeVNi7G4v3QCSThrSAAvzQTmrmyDLiHNPvTF2qFM=",
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1766437c5509f444c1b15331e82b8b6a9b967000",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
         "type": "github"
       },
       "original": {
@@ -360,11 +360,11 @@
         "noctalia-qs": "noctalia-qs"
       },
       "locked": {
-        "lastModified": 1776302695,
+        "lastModified": 1777427472,
-        "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=",
+        "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2",
+        "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186",
         "type": "github"
       },
       "original": {
@@ -383,11 +383,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1775957204,
+        "lastModified": 1777380063,
-        "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=",
+        "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=",
         "owner": "noctalia-dev",
         "repo": "noctalia-qs",
-        "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86",
+        "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d",
         "type": "github"
       },
       "original": {
@@ -406,11 +406,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772893680,
+        "lastModified": 1776796298,
-        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773544328,
+        "lastModified": 1777173302,
-        "narHash": "sha256-Iv+qez54LAz+isij4APBk31VWA//Go81hwFOXr5iWTw=",
+        "narHash": "sha256-ERiu3cbxvnTDxiDcimRA7af7xp6x1y0sRyLGm28Qzz8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4f977d776793c8bfbfdd7eca7835847ccc48874e",
+        "rev": "aaec8c50baeaf2f2ba653e8aae71778a2bbbac94",
         "type": "github"
       },
       "original": {

flake.nix

@@ -5,52 +5,52 @@
 #  flake.nix *
 #   ├─ ./hosts
 #   │   └─ default.nix
-
 {
-  description = "Kabbone's peronal NixOS Flake config";
+  description = "Kabbone's personal NixOS Flake config";
 
   inputs = {
-      nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";                  # Nix Packages
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages
-      nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
-      nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-      microvm = {
+    microvm = {
-        url = "github:microvm-nix/microvm.nix";
+      url = "github:microvm-nix/microvm.nix";
-        inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-      };
+    };
 
-      impermanence.url = "github:nix-community/impermanence";
+    impermanence.url = "github:nix-community/impermanence";
 
-      home-manager = {                                                      # User Package Management
+    home-manager = {
-        url = "github:nix-community/home-manager/release-25.11";
+      # User Package Management
-        inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager/release-25.11";
-      };
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-      home-manager-unstable = {                                                      # User Package Management
+    home-manager-unstable = {
-        url = "github:nix-community/home-manager";
+      # User Package Management
-        inputs.nixpkgs.follows = "nixpkgs-unstable";
+      url = "github:nix-community/home-manager";
-      };
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
 
-      agenix = {
+    agenix = {
-        url = "github:ryantm/agenix";
+      url = "github:ryantm/agenix";
-        inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-      };
+    };
 
-      jovian-nixos = {
+    jovian-nixos = {
-        url = "github:Jovian-Experiments/Jovian-NixOS";
+      url = "github:Jovian-Experiments/Jovian-NixOS";
-        inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
-      };
+    };
 
-      lanzaboote = {
+    lanzaboote = {
-        url = "github:nix-community/lanzaboote/master";
+      url = "github:nix-community/lanzaboote/master";
-        inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-      };
+    };
-
-      noctalia = {
-        url = "github:noctalia-dev/noctalia-shell";
-	inputs.nixpkgs.follows = "nixpkgs";
-      };
 
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -65,19 +65,18 @@
     microvm,
     impermanence,
     lanzaboote,
+    noctalia,
     ...
-  } @ inputs: rec {
+  } @ inputs: let
-    inherit (self) outputs;
     systems = [
-#      "aarch64-linux"
+      #      "aarch64-linux"
       "x86_64-linux"
     ];
-
     forAllSystems = nixpkgs.lib.genAttrs systems;
-  #in {
+  in {
     # Your custom packages
     # Accessible through 'nix build', 'nix shell', etc
-    packages = forAllSystems (system: import ./packages nixpkgs.legacyPackages.${system});
+    packages = forAllSystems (system: import ./packages {pkgs = nixpkgs.legacyPackages.${system};});
     # Formatter for your nix files, available through 'nix fmt'
     # Other options beside 'alejandra' include 'nixpkgs-fmt'
     formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
@@ -91,24 +90,22 @@
     # These are usually stuff you would upstream into home-manager
     #homeManagerModules = import ./modules/home-manager;
 
-
+    nixosConfigurations = ( # NixOS configurations
-    nixosConfigurations = (                                               # NixOS configurations
+      import ./hosts {
-      import ./hosts {                                                    # Imports ./hosts/default.nix
+        # Imports ./hosts/default.nix
         inherit (nixpkgs) lib;
-        inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote;   # Also inherit home-manager so it does not need to be defined here.
+        inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote; # Also inherit home-manager so it does not need to be defined here.
-        nix.allowedUsers = [ "@wheel" ];
-        security.sudo.execWheelOnly = true;
       }
     );
 
     hydraJobs = {
-      "steamdeck" = nixosConfigurations.steamdeck.config.system.build.toplevel;
+      "steamdeck" = self.nixosConfigurations.steamdeck.config.system.build.toplevel;
-      "hades" = nixosConfigurations.hades.config.system.build.toplevel;
+      "hades" = self.nixosConfigurations.hades.config.system.build.toplevel;
-      "nasbak" = nixosConfigurations.nasbak.config.system.build.toplevel;
+      "nasbak" = self.nixosConfigurations.nasbak.config.system.build.toplevel;
-      "jupiter" = nixosConfigurations.jupiter.config.system.build.toplevel;
+      "jupiter" = self.nixosConfigurations.jupiter.config.system.build.toplevel;
-      "lifebook" = nixosConfigurations.lifebook.config.system.build.toplevel;
+      "lifebook" = self.nixosConfigurations.lifebook.config.system.build.toplevel;
-      "kabtop" = nixosConfigurations.kabtop.config.system.build.toplevel;
+      "kabtop" = self.nixosConfigurations.kabtop.config.system.build.toplevel;
-      "dmz" = nixosConfigurations.dmz.config.system.build.toplevel;
+      "dmz" = self.nixosConfigurations.dmz.config.system.build.toplevel;
     };
   };
 }

hosts/configuration_common.nix

@@ -0,0 +1,132 @@
+#
+#  Common configuration shared by all hosts (desktop and server).
+#  Imported by configuration_desktop.nix and configuration_server.nix.
+#
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  user,
+  location,
+  agenix,
+  ...
+}: {
+  imports = [
+    ../modules/hardware/hydraCache.nix
+  ];
+
+  users.users.${user} = {
+    shell = pkgs.zsh;
+    openssh.authorizedKeys.keys = [
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIANmaraVJ/o20c4dqVnGLp/wGck9QNHFPvO9jcEbKS29AAAABHNzaDo= kabbone@kabc"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIgo4IP8ISUohyAMiDc3zEe6ESUE3un7eN5FhVtxZHmcAAAABHNzaDo= kabbone@kabc"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKVDApb3vZ+i97V4xLJh8rUF6z5OVYfORlXYbLhdQO15AAAABHNzaDo= kabbone@hades.home.opel-online.de"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB0q++epdX7feQxvmC2m/CJEoJbkqtAJy6Ml6WKHxryZAAAABHNzaDo= kabbone@hades.home.opel-online.de"
+    ];
+  };
+
+  time.timeZone = "Europe/Berlin";
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_TIME = "de_DE.UTF-8";
+      LC_MONETARY = "de_DE.UTF-8";
+    };
+  };
+
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  fonts.packages = with pkgs; [
+    carlito
+    vegur
+    source-code-pro
+    font-awesome
+    hack-font
+    corefonts
+    intel-one-mono
+    cascadia-code
+  ];
+
+  environment = {
+    variables = {
+      TERMINAL = "alacritty";
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+      BROWSER = "firefox";
+    };
+    systemPackages = with pkgs; [
+      vim
+      git
+      killall
+      pciutils
+      usbutils
+      wget
+      bind
+      dig
+      agenix.packages.${pkgs.system}.default
+      cryptsetup
+      powerline
+      powerline-fonts
+      powerline-symbols
+      tree
+      direnv
+      linuxPackages_latest.cpupower
+      btop
+    ];
+  };
+
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      PermitRootLogin = "no";
+    };
+  };
+
+  programs.zsh.enable = true;
+
+  nix = {
+    settings = {
+      auto-optimise-store = true;
+      allowed-users = ["@wheel"];
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    package = pkgs.nixVersions.stable;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+
+  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
+
+  security = {
+    sudo.execWheelOnly = true;
+    pki.certificateFiles = [
+      ./rootCA.pem
+    ];
+  };
+
+  system = {
+    stateVersion = "23.05";
+    autoUpgrade = {
+      flake = "git+https://git.kabtop.de/Kabbone/nixos-config";
+      randomizedDelaySec = "5m";
+      allowReboot = true;
+      rebootWindow = {
+        lower = "02:00";
+        upper = "05:00";
+      };
+    };
+  };
+}

hosts/configuration_desktop.nix

@@ -1,201 +0,0 @@
-#
-#  Main system configuration. More information available in configuration.nix(5) man page.
-#
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ configuration.nix *
-#   └─ ./modules
-#       └─ ./editors
-#           └─ ./nvim
-#               └─ default.nix
-#
-
-{ config, lib, pkgs, pkgs-stable, inputs, user, location, agenix, ... }:
-
-{
-  imports =                                 # Import window or display manager.
-    [
-      #../modules/editors/nvim              # ! Comment this out on first install !
-    ];
-
-  users.users.${user} = {                   # System User
-    isNormalUser = true;
-    extraGroups = [ "wheel" "video" "audio" "camera" "networkmanager" "lp" "kvm" "libvirtd" "adb" "dialout" "tss" ];
-    shell = pkgs.zsh;                       # Default shell
-    uid = 2000;
-#    initialPassword = "password95";
-    openssh.authorizedKeys.keys = [
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIANmaraVJ/o20c4dqVnGLp/wGck9QNHFPvO9jcEbKS29AAAABHNzaDo= kabbone@kabc"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIgo4IP8ISUohyAMiDc3zEe6ESUE3un7eN5FhVtxZHmcAAAABHNzaDo= kabbone@kabc"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKVDApb3vZ+i97V4xLJh8rUF6z5OVYfORlXYbLhdQO15AAAABHNzaDo= kabbone@hades.home.opel-online.de"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB0q++epdX7feQxvmC2m/CJEoJbkqtAJy6Ml6WKHxryZAAAABHNzaDo= kabbone@hades.home.opel-online.de"
-    ];
-  };
-
-  time.timeZone = "Europe/Berlin";        # Time zone and internationalisation
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {                 # Extra locale settings that need to be overwritten
-      LC_TIME = "de_DE.UTF-8";
-      LC_MONETARY = "de_DE.UTF-8";
-    };
-  };
-
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";	                    # or us/azerty/etc
-  };
-
-  security = {
-    pam.services.login.enableGnomeKeyring = true;
-    rtkit.enable = true;
-    pki.certificateFiles = [
-      ./rootCA.pem
-    ];
-    #tpm2 = {
-    #    enable = true;
-    #    pkcs11.enable = true;
-    #    tctiEnvironment.enable = true;
-    #  };
-  };
-
-  #sound = {                                 # ALSA sound enable
-  ##  #enable = true;
-  #  mediaKeys = {                           # Keyboard Media Keys (for minimal desktop) enable = true;
-  #    enable = true;
-  #  };
-  #};
-
-  fonts.packages = with pkgs; [                # Fonts
-    carlito                                 # NixOS
-    vegur                                   # NixOS
-    source-code-pro
-    font-awesome                            # Icons
-    hack-font
-    corefonts                               # MS
-    intel-one-mono
-    cascadia-code
-  ];
-
-  environment = {
-    variables = {
-      TERMINAL = "alacritty";
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-      BROWSER = "firefox";
-    };
-    systemPackages = (with pkgs; [           # Default packages install system-wide
-      vim
-      git
-      killall
-      pciutils
-      usbutils
-      wget
-      file
-      powertop
-      cpufrequtils
-      lm_sensors
-      libva-utils
-      at-spi2-core
-      bind
-      dig
-      qmk-udev-rules
-      gptfdisk
-      agenix.packages.x86_64-linux.default
-      age-plugin-yubikey
-      pwgen
-      cryptsetup
-      powerline
-      powerline-fonts
-      powerline-symbols
-      tree
-      direnv
-      linuxPackages_latest.cpupower
-      linuxPackages_latest.turbostat
-      btop
-      sbctl
-      ausweisapp
-      e2fsprogs
-    ])
-
-    ++
-
-    (with pkgs-stable; [
-      orca-slicer
-    ]);
-  };
-
-  services = {
-    pipewire = {                            # Sound
-      enable = true;
-      alsa = {
-        enable = true;
-      #  support32Bit = true;
-      };
-      pulse.enable = true;
-      wireplumber.enable = true;
-    };
-    openssh = {                             # SSH: secure shell (remote connection to shell of server)
-      enable = true;                        # local: $ ssh <user>@<ip>
-      settings = {
-        PasswordAuthentication = false;
-        PermitRootLogin = "no";
-      };
-#      extraConfig = ''
-#        HostKeyAlgorithms +ssh-rsa
-#      '';                                   # Temporary extra config so ssh will work in guacamole
-    };
-    pcscd.enable = true;
-    yubikey-agent.enable = true;
-    udev.packages = [ pkgs.yubikey-personalization pkgs.nitrokey-udev-rules ];
-    flatpak.enable = true;                  # download flatpak file from website - sudo flatpak install <path> - reboot if not showing up
-                                            # sudo flatpak uninstall --delete-data <app-id> (> flatpak list --app) - flatpak uninstall --unused
-                                            # List:
-                                            # com.obsproject.Studio
-                                            # com.parsecgaming.parsec
-                                            # com.usebottles.bottles
-    gvfs.enable = true;
-    fwupd.enable = true;
-  };
-
-  programs = {                              # No xbacklight, this is the alterantive
-    zsh.enable = true;
-    dconf.enable = true;
-  };
-  
-
-  nix = {                                   # Nix Package Manager settings
-    settings ={
-      auto-optimise-store = true;           # Optimise syslinks
-    };
-    gc = {                                  # Automatic garbage collection
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-    package = pkgs.nixVersions.stable;               # Enable nixFlakes on system
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-  nixpkgs.config.allowUnfree = true;        # Allow proprietary software.
-  nixpkgs.config.permittedInsecurePackages = [
-    "olm-3.2.16"
-    "mbedtls-2.28.10"
-  ];
-
-  system = {                                # NixOS settings
-    autoUpgrade = {                         # Allow auto update
-      enable = false;
-      flake = "git+https://git.kabtop.de/Kabbone/nixos-config";
-      randomizedDelaySec = "5m";
-      allowReboot = true;
-      rebootWindow = {
-          lower = "02:00";
-          upper = "05:00";
-      };
-      #channel = "https://nixos.org/channels/nixos-unstable";
-    };
-    stateVersion = "23.05";
-  };
-}

hosts/configuration_server.nix

@@ -1,155 +1,44 @@
 #
-#  Main system configuration. More information available in configuration.nix(5) man page.
+#  Server configuration. Imports configuration_common.nix for shared settings.
+#  Service modules are imported per-host.
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ configuration.nix *
-#   └─ ./modules
-#       └─ ./editors
-#           └─ ./nvim
-#               └─ default.nix
-#
-
-{ config, lib, pkgs, inputs, user, location, agenix, ... }:
-
 {
-  imports =                                 # Import window or display manager.
+  config,
-    [
+  lib,
-     #../modules/editors/nvim              # ! Comment this out on first install !
+  pkgs,
-    ];
+  inputs,
+  user,
+  location,
+  agenix,
+  ...
+}: {
+  imports = [
+    ./configuration_common.nix
+  ];
 
-  users.users.${user} = {                   # System User
+  users.users.${user} = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "kvm" "libvirtd" ];
-    shell = pkgs.zsh;                       # Default shell
     uid = 3000;
-#    initialPassword = "password95";
+    extraGroups = ["wheel" "networkmanager" "kvm" "libvirtd"];
-    openssh.authorizedKeys.keys = [
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIANmaraVJ/o20c4dqVnGLp/wGck9QNHFPvO9jcEbKS29AAAABHNzaDo= kabbone@kabc"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIgo4IP8ISUohyAMiDc3zEe6ESUE3un7eN5FhVtxZHmcAAAABHNzaDo= kabbone@kabc"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKVDApb3vZ+i97V4xLJh8rUF6z5OVYfORlXYbLhdQO15AAAABHNzaDo= kabbone@hades.home.opel-online.de"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB0q++epdX7feQxvmC2m/CJEoJbkqtAJy6Ml6WKHxryZAAAABHNzaDo= kabbone@hades.home.opel-online.de"
-    ];
-  };
-  security.sudo.wheelNeedsPassword = true; # User does not need to give password when using sudo.
-
-  time.timeZone = "Europe/Berlin";        # Time zone and internationalisation
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {                 # Extra locale settings that need to be overwritten
-      LC_TIME = "de_DE.UTF-8";
-      LC_MONETARY = "de_DE.UTF-8";
-    };
   };
 
-  console = {
+  security.sudo.wheelNeedsPassword = true;
-    font = "Lat2-Terminus16";
-    keyMap = "us";	                    # or us/azerty/etc
-  };
 
-  security = {
+  environment.systemPackages = with pkgs; [
-    rtkit.enable = true;
+    ffmpeg
-    pki.certificateFiles = [
+    smartmontools
-      ./rootCA.pem
+    htop
-    ];
-  };
-
-  fonts.packages = with pkgs; [                # Fonts
-    carlito                                 # NixOS
-    vegur                                   # NixOS
-    source-code-pro
-    font-awesome                            # Icons
-    hack-font
-    corefonts                               # MS
-    intel-one-mono
-    cascadia-code
   ];
 
-  environment = {
+  services.openssh = {
-    variables = {
+    ports = [2220];
-      TERMINAL = "alacritty";
+    openFirewall = true;
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-      BROWSER = "firefox";
-    };
-    systemPackages = with pkgs; [           # Default packages install system-wide
-      vim
-      git
-      killall
-      pciutils
-      usbutils
-      wget
-      powertop
-      cpufrequtils
-      lm_sensors
-      bind
-      dig
-      agenix.packages.x86_64-linux.default
-      ffmpeg
-      smartmontools
-      cryptsetup
-      powerline
-      powerline-fonts
-      powerline-symbols
-      tree
-      direnv
-      linuxPackages_latest.cpupower
-      btop
-      htop
-    ];
   };
 
-  services = {
+  nix.extraOptions = ''
-    openssh = {                             # SSH: secure shell (remote connection to shell of server)
+    keep-outputs          = true
-      enable = true;                        # local: $ ssh <user>@<ip>
+    keep-derivations      = true
-      settings = {
+  '';
-        PasswordAuthentication = false;
-        PermitRootLogin = "no";
-      };
-      ports = [ 2220 ];
-      openFirewall = true;
-    };
 
-    #flatpak.enable = true;                  # download flatpak file from website - sudo flatpak install <path> - reboot if not showing up
+  system.autoUpgrade.enable = true;
-                                            # sudo flatpak uninstall --delete-data <app-id> (> flatpak list --app) - flatpak uninstall --unused
-  };
-
-  programs = {
-    zsh.enable = true;
-  };
-
-  nix = {                                   # Nix Package Manager settings
-    settings ={
-      auto-optimise-store = true;           # Optimise syslinks
-    };
-    gc = {                                  # Automatic garbage collection
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-    package = pkgs.nixVersions.stable;               # Enable nixFlakes on system
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      keep-outputs          = true
-      keep-derivations      = true
-    '';
-  };
-  nixpkgs.config.allowUnfree = true;        # Allow proprietary software.
-  nixpkgs.config.permittedInsecurePackages = [
-    "olm-3.2.16"
-  ];
-
-  system = {                                # NixOS settings
-    autoUpgrade = {                         # Allow auto update
-      enable = true;
-      flake = "git+https://git.kabtop.de/Kabbone/nixos-config";
-      randomizedDelaySec = "5m";
-      allowReboot = true;
-      rebootWindow = {
-          lower = "02:00";
-          upper = "05:00";
-      };
-    };
-    stateVersion = "23.05";
-  };
 }

hosts/default.nix

@@ -4,269 +4,249 @@
 #  flake.nix
 #   └─ ./hosts
 #       ├─ default.nix *
-#       ├─ configuration.nix
+#       ├─ configuration_common.nix
+#       ├─ configuration_desktop.nix
+#       ├─ configuration_server.nix
 #       ├─ home.nix
 #       └─ ./desktop OR ./laptop OR ./vm
 #            ├─ ./default.nix
 #            └─ ./home.nix
 #
+{
+  lib,
+  inputs,
+  nixpkgs,
+  nixpkgs-unstable,
+  nixos-hardware,
+  home-manager,
+  home-manager-unstable,
+  agenix,
+  jovian-nixos,
+  microvm,
+  impermanence,
+  lanzaboote,
+  ...
+}: let
+  # Default user — desktop hosts share this; server hosts may override per-host
+  # by passing a different `user` value in their own specialArgs block.
+  defaultUser = "kabbone";
+  location = builtins.getEnv "HOME" + "/.setup";
 
-{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:
+  system = "x86_64-linux";
-
-let
-  user = "kabbone";
-  userdmz = "diablo";
-  userserver = "mephisto";
-  location = "$HOME/.setup";
-
-  system = "x86_64-linux";                                  # System architecture
-
-  pkgs = import nixpkgs {
-    inherit system;
-    config.allowUnfree = true;                              # Allow proprietary software
-  };
 
   pkgs-unstable = import nixpkgs-unstable {
     inherit system;
-    config.allowUnfree = true;                              # Allow proprietary software
+    config.allowUnfree = true;
-  };
-
-  pkgs-stable = import nixpkgs {
-    inherit system;
-    config.allowUnfree = true;                              # Allow proprietary software
   };
 
   pkgs-kabbone = import ../packages {
     inherit system;
-    inherit pkgs;
+    pkgs = import nixpkgs {
+      inherit system;
+      config.allowUnfree = true;
+    };
   };
 
-  lib = nixpkgs.lib;
+  pkgs = import nixpkgs {
-  users.defaultShell = "pkgs.zsh";
-
-in
-{
-  hades = lib.nixosSystem {                                # Desktop profile
     inherit system;
-    specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix microvm nixpkgs lanzaboote pkgs-kabbone; };
+    config.allowUnfree = true;
-    modules = [
+    # Prefer host-specific overlays over a global one here.
-      agenix.nixosModules.default
+    # Set nixpkgs.overlays inside the host's own module (e.g. hosts/desktop/default.nix)
-      microvm.nixosModules.host
+    # so only that host's pkgs is affected. Packages can be imported inline —
-      lanzaboote.nixosModules.lanzaboote
+    # no specialArgs needed. See hosts/desktop/default.nix for an example.
-      ./desktop
-      ./configuration_desktop.nix
-      ../modules/hardware/hydraCache.nix
-      ../modules/hardware/remoteBuilder.nix
-      nixos-hardware.nixosModules.common-cpu-amd
-      nixos-hardware.nixosModules.common-gpu-amd
-      nixos-hardware.nixosModules.common-pc-ssd
-      
-
-      home-manager.nixosModules.home-manager {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit user; };
-        home-manager.users.${user} = {
-        imports = [(import ./home.nix)] ++ [(import ./desktop/home.nix)];
-        };
-      }
-    ];
   };
 
-  lifebook = lib.nixosSystem {                                # Laptop profile
+  # Helper: returns [hm-module, config-attrset] for the modules list.
+  # hm        - the home-manager flake input to use (stable or unstable)
+  # user      - the username whose home-manager config to build
+  # hmImports - list of home.nix paths for this host
+  mkHM = hm: user: hmImports: [
+    hm.nixosModules.home-manager
+    {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.extraSpecialArgs = {inherit user;};
+      home-manager.users.${user}.imports = hmImports;
+    }
+  ];
+in {
+  hades = lib.nixosSystem {
+    # Desktop profile
     inherit system;
-    specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix lanzaboote; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix microvm nixpkgs lanzaboote;
-      agenix.nixosModules.default
+      user = defaultUser;
-      lanzaboote.nixosModules.lanzaboote
+    };
-      ./lifebook
+    modules =
-      ./configuration_desktop.nix
+      [
-      ../modules/hardware/hydraCache.nix
+        agenix.nixosModules.default
-      nixos-hardware.nixosModules.common-cpu-intel
+        microvm.nixosModules.host
-      nixos-hardware.nixosModules.common-pc-ssd
+        lanzaboote.nixosModules.lanzaboote
-
+        ./desktop # myDesktop options set inside
-      home-manager.nixosModules.home-manager {
+        ./configuration_common.nix
-        home-manager.useGlobalPkgs = true;
+        ../modules/hardware/remoteBuilder.nix
-        home-manager.useUserPackages = true;
+        nixos-hardware.nixosModules.common-cpu-amd
-        home-manager.extraSpecialArgs = { inherit user; };
+        nixos-hardware.nixosModules.common-gpu-amd
-        home-manager.users.${user} = {
+        nixos-hardware.nixosModules.common-pc-ssd
-        imports = [(import ./home.nix)] ++ [(import ./lifebook/home.nix)];
+      ]
-        };
+      ++ (mkHM home-manager defaultUser [./home.nix ./desktop/home.nix]);
-      }
-    ];
   };
 
-  steamdeck = nixpkgs-unstable.lib.nixosSystem {            # steamdeck profile
+  lifebook = lib.nixosSystem {
+    # Laptop profile
     inherit system;
-    specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix jovian-nixos lanzaboote; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix lanzaboote;
-      agenix.nixosModules.default
+      user = defaultUser;
-      jovian-nixos.nixosModules.default
+    };
-      lanzaboote.nixosModules.lanzaboote
+    modules =
-      ./steamdeck
+      [
-      ./configuration_desktop.nix
+        agenix.nixosModules.default
-      ../modules/hardware/hydraCache.nix
+        lanzaboote.nixosModules.lanzaboote
-
+        ./lifebook # myDesktop options set inside
-      home-manager-unstable.nixosModules.home-manager {
+        ./configuration_common.nix
-        home-manager.useGlobalPkgs = true;
+        nixos-hardware.nixosModules.common-cpu-intel
-        home-manager.useUserPackages = true;
+        nixos-hardware.nixosModules.common-pc-ssd
-        home-manager.extraSpecialArgs = { inherit user; };
+      ]
-        home-manager.users.${user} = {
+      ++ (mkHM home-manager defaultUser [./home.nix ./lifebook/home.nix]);
-        imports = [(import ./home.nix)] ++ [(import ./steamdeck/home.nix)];
-        };
-      }
-    ];
   };
 
-  kabtop = lib.nixosSystem {                                # Desktop profile
+  steamdeck = nixpkgs-unstable.lib.nixosSystem {
+    # steamdeck profile
     inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs pkgs-unstable impermanence; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix jovian-nixos lanzaboote;
-      agenix.nixosModules.default
+      user = defaultUser;
-      microvm.nixosModules.host
+    };
-      ./kabtop
+    modules =
-      ./configuration_server.nix
+      [
-      ../modules/hardware/hydraCache.nix
+        agenix.nixosModules.default
-      nixos-hardware.nixosModules.common-cpu-amd
+        jovian-nixos.nixosModules.default
-      nixos-hardware.nixosModules.common-pc-ssd
+        lanzaboote.nixosModules.lanzaboote
-
+        ./steamdeck
-      home-manager.nixosModules.home-manager {
+        ./configuration_common.nix
-        home-manager.useGlobalPkgs = true;
+      ]
-        home-manager.useUserPackages = true;
+      ++ (mkHM home-manager-unstable defaultUser [./home.nix ./steamdeck/home.nix]);
-        home-manager.extraSpecialArgs = { inherit user; };
-        home-manager.users.${user} = {
-        imports = [(import ./home_server.nix)] ++ [(import ./kabtop/home.nix)];
-        };
-      }
-    ];
   };
 
-  nasbak = lib.nixosSystem {                                # Desktop profile
+  kabtop = lib.nixosSystem {
+    # Server profile
     inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware agenix; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix impermanence;
-      agenix.nixosModules.default
+      user = defaultUser;
-      ./nasbackup
+    };
-      ./configuration_server.nix
+    modules =
-      ../modules/hardware/hydraCache.nix
+      [
-      nixos-hardware.nixosModules.common-cpu-intel
+        agenix.nixosModules.default
-      nixos-hardware.nixosModules.common-pc-ssd
+        microvm.nixosModules.host
-
+        ./kabtop
-      home-manager.nixosModules.home-manager {
+        ./configuration_common.nix
-        home-manager.useGlobalPkgs = true;
+        nixos-hardware.nixosModules.common-cpu-amd
-        home-manager.useUserPackages = true;
+        nixos-hardware.nixosModules.common-pc-ssd
-        home-manager.extraSpecialArgs = { inherit user; };
+      ]
-        home-manager.users.${user} = {
+      ++ (mkHM home-manager defaultUser [./home_server.nix ./kabtop/home.nix]);
-        imports = [(import ./home_server.nix)] ++ [(import ./nasbackup/home.nix)];
-        };
-      }
-    ];
   };
 
-  jupiter = lib.nixosSystem {                                # Desktop profile
+  nasbak = lib.nixosSystem {
+    # Server profile
     inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware agenix pkgs-kabbone; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix;
-      agenix.nixosModules.default
+      user = defaultUser;
-      ./jupiter
+    };
-      ./configuration_server.nix
+    modules =
-      ../modules/hardware/hydraCache.nix
+      [
-      nixos-hardware.nixosModules.common-cpu-intel
+        agenix.nixosModules.default
-      nixos-hardware.nixosModules.common-pc-ssd
+        ./nasbackup
-
+        ./configuration_common.nix
-      home-manager.nixosModules.home-manager {
+        nixos-hardware.nixosModules.common-cpu-intel
-        home-manager.useGlobalPkgs = true;
+        nixos-hardware.nixosModules.common-pc-ssd
-        home-manager.useUserPackages = true;
+      ]
-        home-manager.extraSpecialArgs = { inherit user; };
+      ++ (mkHM home-manager defaultUser [./home_server.nix ./nasbackup/home.nix]);
-        home-manager.users.${user} = {
-        imports = [(import ./home_server.nix)] ++ [(import ./jupiter/home.nix)];
-        };
-      }
-    ];
   };
 
-  kabtopci = lib.nixosSystem {                                # Desktop profile
+  jupiter = lib.nixosSystem {
+    # Server profile
     inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs impermanence; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix;
-      agenix.nixosModules.default
+      user = defaultUser;
-      microvm.nixosModules.host
+    };
-      ./kabtopci
+    modules =
-      ./configuration_server.nix
+      [
-      ../modules/hardware/hydraCache.nix
+        agenix.nixosModules.default
-      nixos-hardware.nixosModules.common-pc-ssd
+        ./jupiter
-
+        ./configuration_common.nix
-      home-manager.nixosModules.home-manager {
+        nixos-hardware.nixosModules.common-cpu-intel
-        home-manager.useGlobalPkgs = true;
+        nixos-hardware.nixosModules.common-pc-ssd
-        home-manager.useUserPackages = true;
+      ]
-        home-manager.extraSpecialArgs = { inherit user; };
+      ++ (mkHM home-manager defaultUser [./home_server.nix ./jupiter/home.nix]);
-        home-manager.users.${user} = {
-        imports = [(import ./home_server.nix)] ++ [(import ./kabtopci/home.nix)];
-        };
-      }
-    ];
   };
 
-  kubemaster-1 = lib.nixosSystem {                                # Desktop profile
+  kabtopci = lib.nixosSystem {
+    # Server profile
     inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs impermanence; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix impermanence;
-      agenix.nixosModules.default
+      user = defaultUser;
-      microvm.nixosModules.host
+    };
-      ./kubemaster-1
+    modules =
-      ./configuration_server.nix
+      [
-      ../modules/hardware/hydraCache.nix
+        agenix.nixosModules.default
-      nixos-hardware.nixosModules.common-cpu-intel
+        microvm.nixosModules.host
-      nixos-hardware.nixosModules.common-pc-ssd
+        ./kabtopci
-
+        ./configuration_common.nix
-      home-manager.nixosModules.home-manager {
+        nixos-hardware.nixosModules.common-pc-ssd
-        home-manager.useGlobalPkgs = true;
+      ]
-        home-manager.useUserPackages = true;
+      ++ (mkHM home-manager defaultUser [./home_server.nix ./kabtopci/home.nix]);
-        home-manager.extraSpecialArgs = { inherit user; };
-        home-manager.users.${user} = {
-        imports = [(import ./home_server.nix)] ++ [(import ./kubemaster-1/home.nix)];
-        };
-      }
-    ];
   };
 
-  dmz = lib.nixosSystem {                                # Desktop profile
+  kubemaster-1 = lib.nixosSystem {
+    # Server profile
     inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs impermanence; };
+    specialArgs = {
-    modules = [
+      inherit inputs location nixos-hardware agenix impermanence;
-      agenix.nixosModules.default
+      user = defaultUser;
-      microvm.nixosModules.host
+    };
-      ./dmz
+    modules =
-      ./configuration_server.nix
+      [
-      ../modules/hardware/hydraCache.nix
+        agenix.nixosModules.default
-      nixos-hardware.nixosModules.common-pc-ssd
+        microvm.nixosModules.host
-
+        ./kubemaster-1
-      home-manager.nixosModules.home-manager {
+        ./configuration_common.nix
-        home-manager.useGlobalPkgs = true;
+        nixos-hardware.nixosModules.common-cpu-intel
-        home-manager.useUserPackages = true;
+        nixos-hardware.nixosModules.common-pc-ssd
-        home-manager.extraSpecialArgs = { inherit user; };
+      ]
-        home-manager.users.${user} = {
+      ++ (mkHM home-manager defaultUser [./home_server.nix ./kubemaster-1/home.nix]);
-        imports = [(import ./home_server.nix)] ++ [(import ./dmz/home.nix)];
-        };
-      }
-    ];
   };
 
-#  vm = lib.nixosSystem {                                    # VM profile
+  dmz = lib.nixosSystem {
-#    inherit system;
+    # Server profile
-#    specialArgs = { inherit inputs user location; };
+    inherit system;
-#    modules = [
+    specialArgs = {
-#      ./vm
+      inherit inputs location nixos-hardware agenix impermanence;
-#      ./configuration.nix
+      user = defaultUser;
-#
+    };
-#      home-manager.nixosModules.home-manager {
+    modules =
-#        home-manager.useGlobalPkgs = true;
+      [
-#        home-manager.useUserPackages = true;
+        agenix.nixosModules.default
-#        home-manager.extraSpecialArgs = { inherit user; }; 
+        microvm.nixosModules.host
-#        home-manager.users.${user} = {
+        ./dmz
-#          imports = [(import ./home.nix)] ++ [(import ./vm/home.nix)];
+        ./configuration_common.nix
-#        };
+        nixos-hardware.nixosModules.common-pc-ssd
-#      }
+      ]
-#    ];
+      ++ (mkHM home-manager defaultUser [./home_server.nix ./dmz/home.nix]);
-#  };
+  };
+
+  #  vm = lib.nixosSystem {                                    # VM profile
+  #    inherit system;
+  #    specialArgs = { inherit inputs user location; };
+  #    modules = [
+  #      ./vm
+  #      ./configuration.nix
+  #
+  #      (mkHM home-manager [ ./home.nix ./vm/home.nix ])
+  #    ];
+  #  };
 }

hosts/desktop/default.nix

@@ -1,104 +1,62 @@
 #
-#  Specific system configuration settings for desktop
+#  Hades desktop — system configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ inputs, lib, config, pkgs, user, nixpkgs, pkgs-kabbone, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  lib,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    [(import ../../modules/wm/niri/default.nix)] ++         # Window Manager
+  inputs,
-    (import ../../modules/wm/virtualisation) ++             # libvirt + Docker
+  ...
-    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # kvm module options
+}: {
-    #[(import ../../modules/kabbone/corosync-qdevice.nix)] ++   # corosync qdevice quorum
+  # Example: host-specific overlays — only hades gets these packages in its pkgs.
-    (import ../../modules/hardware);                             # Hardware devices
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     # pull a single package from unstable (no specialArgs needed)
+  #     firefox          = inputs.nixpkgs-unstable.legacyPackages.${prev.system}.firefox;
+  #     # pull a package from pkgs-kabbone (inline import, no specialArgs needed)
+  #     corosync-qdevice = (import ../../packages { pkgs = prev; }).corosync-qdevice;
+  #   })
+  # ];
 
-  boot = {                                  # Boot options
+  imports = [
+    ./hardware-configuration.nix
+    ../../modules/desktop
+  ];
+
+  # ── Desktop module options ──────────────────────────────────────────────
+  myDesktop.windowManager = "niri";
+  myDesktop.cpu = "amd";
+  myDesktop.virtualisation.enable = true;
+
+  myDesktop.openrgb.enable = true;
+  myDesktop.openrgb.motherboard = "amd";
+
+  myDesktop.syncthing.enable = true;
+  myDesktop.syncthing.devices = {
+    "jupiter.home.opel-online.de" = {id = "T53WU6Z-3NT74ZE-PZVZB2N-7FBTZ5K-HESC2ZM-W4ABDAS-NWXHTGI-ST4CDQR";};
+    "lifebook.home.opel-online.de" = {id = "RKPZG3H-BDUZID3-DV26MKR-UOARIQC-JBCAFXP-J5QFM4H-5EGBSM5-VEGXHQ4";};
+  };
+  myDesktop.syncthing.folders = {
+    "Sync" = {
+      path = "/home/kabbone/Sync";
+      devices = ["jupiter.home.opel-online.de" "lifebook.home.opel-online.de"];
+      ignorePerms = false;
+    };
+  };
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-
+    loader = {
-    loader = {                              # EFI Boot
       systemd-boot.enable = lib.mkForce false;
-      efi = {
+      efi.canTouchEfiVariables = true;
-        canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot";
-        efiSysMountPoint = "/boot";
+      timeout = 1;
-      };
-      timeout = 1;                          # Grub auto select time
     };
-
     lanzaboote = {
-        enable = true;
-        pkiBundle = "/etc/secureboot";
-    };
-  };
-
-#  hardware.sane = {                           # Used for scanning with Xsane
-#    enable = false;
-#    extraBackends = [ pkgs.sane-airscan ];
-#  };
-#  hardware = {
-#    nitrokey.enable = true;
-#  };
-
-  environment = {
-    systemPackages = [
-      pkgs.linux-firmware
-      #pkgs-kabbone.corosync-qdevice
-    ];
-  };
-
-  services = {
-    #auto-cpufreq.enable = true;
-    blueman.enable = true;
-    avahi = {                               # Needed to find wireless printer
       enable = true;
-      nssmdns4 = true;
+      pkiBundle = "/etc/secureboot";
-      publish = {                           # Needed for detecting the scanner
-        enable = true;
-        addresses = true;
-        userServices = true;
-      };
-    };
-    hardware.openrgb = {
-        enable = true;
-        motherboard = "amd";
-    };
-    syncthing = {
-        enable = true;
-        group = "users";
-        user = "kabbone";
-        dataDir = "/home/${config.services.syncthing.user}/Sync";
-        configDir = "/home/${config.services.syncthing.user}/.config/syncthing";
-        overrideDevices = true;     # overrides any devices added or deleted through the WebUI
-        overrideFolders = true;     # overrides any folders added or deleted through the WebUI
-        openDefaultPorts = true;
-        settings = {
-          devices = {
-            "jupiter.home.opel-online.de" = { id = "T53WU6Z-3NT74ZE-PZVZB2N-7FBTZ5K-HESC2ZM-W4ABDAS-NWXHTGI-ST4CDQR"; };
-            "lifebook.home.opel-online.de" = { id = "RKPZG3H-BDUZID3-DV26MKR-UOARIQC-JBCAFXP-J5QFM4H-5EGBSM5-VEGXHQ4"; };
-          };
-          folders = {
-            "Sync" = {         # Name of folder in Syncthing, also the folder ID
-              path = "/home/${config.services.syncthing.user}/Sync";    # Which folder to add to Syncthing
-              devices = [ "jupiter.home.opel-online.de" "lifebook.home.opel-online.de" ];      # Which devices to share the folder with
-              ignorePerms = false;  # By default, Syncthing doesn't sync file permissions. This line enables it for this folder.
-            };
-          };
-        };
     };
   };
+
+  environment.systemPackages = [pkgs.linux-firmware];
 }

hosts/desktop/hardware-configuration.nix

@@ -10,17 +10,21 @@
 # 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, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")] ++
+    [(modulesPath + "/installer/scan/not-detected.nix")]
-      [( import ../../modules/hardware/backup.nix )];
+    ++ [(import ../../modules/hardware/backup.nix)];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1"];
-  boot.kernelModules = [ "kvm-amd" "nct6775" ];
+  boot.kernelModules = ["kvm-amd" "nct6775"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -34,149 +38,148 @@
   };
 
   services.btrbk = {
-      extraPackages = [ pkgs.lz4 pkgs.mbuffer ];
+    extraPackages = [pkgs.lz4 pkgs.mbuffer];
-      instances = {
+    instances = {
-          hf = {
+      hf = {
-              onCalendar = "hourly";
+        onCalendar = "hourly";
-              settings = {
+        settings = {
-                  incremental = "yes";
+          incremental = "yes";
-                  snapshot_create = "ondemand";
+          snapshot_create = "ondemand";
-                  snapshot_dir = "@snapshots";
+          snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
+          timestamp_format = "long";
 
-                  snapshot_preserve = "2m 2w 5d 5h";
+          snapshot_preserve = "2m 2w 5d 5h";
-                  snapshot_preserve_min = "latest";
+          snapshot_preserve_min = "latest";
 
-                  volume =  {
+          volume = {
-                      "/mnt/snapshots/root" = {
+            "/mnt/snapshots/root" = {
-                          snapshot_create = "always";
+              snapshot_create = "always";
-                          subvolume = {
+              subvolume = {
-                              "@home" = {};
+                "@home" = {};
-                          };
-                      };
-                  };
               };
+            };
           };
-          bak = {
+        };
-              onCalendar = "daily";
-              settings = {
-	          stream_buffer = "256m";
-                  stream_compress = "lz4";
-                  incremental = "yes";
-                  snapshot_create = "no";
-                  snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
-
-                  snapshot_preserve_min = "all";
-                  target_preserve_min = "no";
-                  target_preserve = "4w 3d";
-
-                  ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
-                  ssh_user = "btrbk";
-                
-                  volume =  {
-                      "/mnt/snapshots/root" = {
-                          subvolume = {
-                              "@home" = {};
-                          };
-		          target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@hades";
-                      };
-                  };
-	      };
-	  };
       };
+      bak = {
+        onCalendar = "daily";
+        settings = {
+          stream_buffer = "256m";
+          stream_compress = "lz4";
+          incremental = "yes";
+          snapshot_create = "no";
+          snapshot_dir = "@snapshots";
+          timestamp_format = "long";
+
+          snapshot_preserve_min = "all";
+          target_preserve_min = "no";
+          target_preserve = "4w 3d";
+
+          ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
+          ssh_user = "btrbk";
+
+          volume = {
+            "/mnt/snapshots/root" = {
+              subvolume = {
+                "@home" = {};
+              };
+              target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@hades";
+            };
+          };
+        };
+      };
+    };
   };
 
   systemd.timers = {
-      btrbk-bak = {
+    btrbk-bak = {
-          after = [ "network-online.target" ];
+      after = ["network-online.target"];
-          requires = [ "network-online.target" ];
+      requires = ["network-online.target"];
-      };
+    };
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part1";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part1";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
-  fileSystems."/mnt/Pluto" =
+  fileSystems."/mnt/Pluto" = {
-    { device = "jupiter:/Pluto";
+    device = "jupiter:/Pluto";
-      fsType = "nfs";
+    fsType = "nfs";
-      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+    options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
-    };
+  };
 
-  fileSystems."/mnt/Mars" =
+  fileSystems."/mnt/Mars" = {
-    { device = "jupiter:/Mars";
+    device = "jupiter:/Mars";
-      fsType = "nfs";
+    fsType = "nfs";
-      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+    options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
-    };
+  };
 
-
+  swapDevices = [{device = "/swap/swapfile";}];
-  swapDevices = [ { device = "/swap/swapfile"; } ];
 
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "hades";
     networkmanager = {
       enable = true;
     };
     firewall = {
       enable = true;
-      allowedUDPPorts = [ 24727 ];
+      allowedUDPPorts = [24727];
-      allowedTCPPorts = [ 24727 ];
+      allowedTCPPorts = [24727];
     };
   };
 
-#  systemd.network = {
+  #  systemd.network = {
-#      enable = true;
+  #      enable = true;
-#      networks = {
+  #      networks = {
-#          "10-lan" = {
+  #          "10-lan" = {
-#              matchConfig.Name = "eno1";
+  #              matchConfig.Name = "eno1";
-#              ntp = [ "192.168.2.1" ];
+  #              ntp = [ "192.168.2.1" ];
-#              domains = [ "home.opel-online.de" ];
+  #              domains = [ "home.opel-online.de" ];
-#              networkConfig = {
+  #              networkConfig = {
-#                DHCP = "yes";
+  #                DHCP = "yes";
-#                IPv6AcceptRA = true;
+  #                IPv6AcceptRA = true;
-#              };
+  #              };
-#          };
+  #          };
-#      };
+  #      };
-#  };
+  #  };
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   #powerManagement.powertop.enable = true;

hosts/desktop/home.nix

@@ -1,52 +1,26 @@
 #
-#  Home-manager configuration for laptop
+#  Hades desktop — home-manager host-specific additions
-#
+#  (WM home config is loaded by modules/desktop based on myDesktop.windowManager)
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │       └─ home.nix *
-#   └─ ./modules
-#       └─ ./desktop
-#           └─ ./hyprland
-#              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # cmds / theme options
+  ];
 
-{ pkgs, ... }:
+  home.packages = with pkgs; [
+    chromium
+    thunderbird
+    streamlink
+    streamlink-twitch-gui-bin
+    pulsemixer
+    nitrokey-app
+    kicad
+  ];
 
-{
+  services = {
-  imports =
+    blueman-applet.enable = true;
-    [
+    network-manager-applet.enable = true;
-      #../../modules/wm/hyprland/home.nix # Window Manager
-      ../../modules/wm/niri/home.nix # Window Manager
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
-    packages = with pkgs; [
-      # Applications
-      #freecad                         # Office packages
-      #firefox
-      chromium
-      thunderbird
-      streamlink
-      streamlink-twitch-gui-bin
-      #nheko
-      pulsemixer
-      #yubioath-flutter
-      nitrokey-app
-      kicad
-
-      # Power Management
-      #auto-cpufreq                       # Power management
-      #tlp                                # Power management
-    ];
-  };
-
-  services = {                            # Applets
-   blueman-applet.enable = true;         # Bluetooth
-   network-manager-applet.enable = true; # Network
   };
 
   xsession.preferStatusNotifierItems = true;
-
 }

hosts/dmz/default.nix

@@ -1,59 +1,46 @@
 #
-#  Specific system configuration settings for desktop
+#  DMZ — demilitarised zone server configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ config, pkgs, user, agenix, impermanence, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+  user,
-    [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++   # Docker
+  agenix,
-    (import ../../modules/services/dmz);                       # Server Services
+  impermanence,
+  ...
+}: {
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../../modules/server
+    ]
+    ++ (import ../../modules/services/dmz);
 
-  boot = {                                  # Boot options
+  # ── Server module options ───────────────────────────────────────────────
+  myServer.virtualisation.enable = true;
+  myServer.virtualisation.cpu = "intel";
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-
+    loader = {
-    loader = {                              # EFI Boot
       systemd-boot.enable = true;
-      efi = {
+      efi.canTouchEfiVariables = true;
-        canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot";
-        efiSysMountPoint = "/boot";
+      timeout = 1;
-      };
-      timeout = 1;                          # Grub auto select time
     };
   };
 
-  programs = {                              
-    zsh.enable = true;
-  };
-
   services = {
     qemuGuest.enable = true;
-    avahi = {                               # Needed to find wireless printer
+    avahi = {
       enable = true;
       nssmdns4 = true;
-      publish = {                           # Needed for detecting the scanner
+      publish = {
         enable = true;
         addresses = true;
         userServices = true;
       };
     };
   };
-
 }

hosts/dmz/hardware-configuration.nix

@@ -10,17 +10,21 @@
 # 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 =
+  config,
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1"];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -33,75 +37,74 @@
     ];
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@var,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@var,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-  swapDevices = [  ];
+  swapDevices = [];
 
   systemd.network = {
-      enable = true;
+    enable = true;
-      networks = {
+    networks = {
-          "10-lan" = {
+      "10-lan" = {
-              matchConfig.Name = "ens18";
+        matchConfig.Name = "ens18";
-              ntp = [ "192.168.101.1" ];
+        ntp = ["192.168.101.1"];
-              domains = [ "home.opel-online.de" ];
+        domains = ["home.opel-online.de"];
-              networkConfig = {
+        networkConfig = {
-                DHCP = "yes";
+          DHCP = "yes";
-                IPv6AcceptRA = true;
+          IPv6AcceptRA = true;
-              };
+        };
-              dns = [
+        dns = [
-                "192.168.101.1"
+          "192.168.101.1"
-              ];
+        ];
-          };
       };
+    };
   };
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "dmz";
     firewall = {
       enable = true;
-      allowedUDPPorts = [  ];
+      allowedUDPPorts = [];
-      allowedTCPPorts = [ 80 443 ];
+      allowedTCPPorts = [80 443];
     };
   };
-
 }

hosts/dmz/home.nix

@@ -10,16 +10,13 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
 
@@ -32,5 +29,4 @@
   programs = {
     alacritty.settings.font.size = 11;
   };
-
 }

hosts/fuji/default.nix

@@ -16,63 +16,75 @@
 #       └─ ./hardware
 #           └─ default.nix
 #
-
-{ config, nixpkgs, pkgs, user, lib, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  nixpkgs,
-    [(import ../../modules/wm/sway/default.nix)] ++         # Window Manager
+  pkgs,
-    (import ../../modules/wm/virtualisation) ++             # libvirt + Docker
+  user,
-    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # kvm module options
+  lib,
-    (import ../../modules/hardware);                             # Hardware devices
+  ...
+}: {
+  imports =
+    # For now, if applying to other system, swap files
+    [(import ./hardware-configuration.nix)]
+    ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+    [(import ../../modules/wm/sway/default.nix)]
+    ++ # Window Manager
+    (import ../../modules/wm/virtualisation)
+    ++ # libvirt + Docker
+    [(import ../../modules/wm/virtualisation/kvm-amd.nix)]
+    ++ # kvm module options
+    (import ../../modules/hardware); # Hardware devices
 
-  boot = {                                  # Boot options
+  boot = {
+    # Boot options
     kernelPackages = pkgs.linuxPackages_latest;
 
-    loader = {                              # EFI Boot
+    loader = {
+      # EFI Boot
       systemd-boot.enable = lib.mkForce false;
       efi = {
         canTouchEfiVariables = true;
         efiSysMountPoint = "/boot";
       };
-      timeout = 1;                          # Grub auto select time
+      timeout = 1; # Grub auto select time
     };
 
     lanzaboote = {
-        enable = true;
+      enable = true;
-        pkiBundle = "/etc/secureboot";
+      pkiBundle = "/etc/secureboot";
     };
   };
 
-#  hardware.sane = {                           # Used for scanning with Xsane
+  #  hardware.sane = {                           # Used for scanning with Xsane
-#    enable = false;
+  #    enable = false;
-#    extraBackends = [ pkgs.sane-airscan ];
+  #    extraBackends = [ pkgs.sane-airscan ];
-#  };
+  #  };
-#  hardware = {
+  #  hardware = {
-#    nitrokey.enable = true;
+  #    nitrokey.enable = true;
-#  };
+  #  };
 
-#  environment = {
+  #  environment = {
-#    systemPackages = with pkgs; [
+  #    systemPackages = with pkgs; [
-##      simple-scan
+  ##      simple-scan
-##       intel-media-driver
+  ##       intel-media-driver
-##       alacritty
+  ##       alacritty
-#    ];
+  #    ];
-#  };
+  #  };
 
   services = {
     #auto-cpufreq.enable = true;
     blueman.enable = true;
-    avahi = {                               # Needed to find wireless printer
+    avahi = {
+      # Needed to find wireless printer
       enable = true;
       nssmdns4 = true;
-      publish = {                           # Needed for detecting the scanner
+      publish = {
+        # Needed for detecting the scanner
         enable = true;
         addresses = true;
         userServices = true;
       };
     };
   };
-
 }

hosts/fuji/hardware-configuration.nix

@@ -10,17 +10,21 @@
 # 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, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")] ++
+    [(modulesPath + "/installer/scan/not-detected.nix")]
-      [( import ../../modules/hardware/backup.nix )];
+    ++ [(import ../../modules/hardware/backup.nix)];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1"];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -34,77 +38,76 @@
   };
 
   services.btrbk = {
-      instances = {
+    instances = {
-          hf = {
+      hf = {
-              onCalendar = "hourly";
+        onCalendar = "hourly";
-              settings = {
+        settings = {
-                  incremental = "yes";
+          incremental = "yes";
-                  snapshot_create = "ondemand";
+          snapshot_create = "ondemand";
-                  snapshot_dir = "@snapshots";
+          snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
+          timestamp_format = "long";
 
-                  snapshot_preserve = "2m 2w 5d 5h";
+          snapshot_preserve = "2m 2w 5d 5h";
-                  snapshot_preserve_min = "latest";
+          snapshot_preserve_min = "latest";
 
-                  volume =  {
+          volume = {
-                      "/mnt/snapshots/root" = {
+            "/mnt/snapshots/root" = {
-                          snapshot_create = "always";
+              snapshot_create = "always";
-                          subvolume = {
+              subvolume = {
-                              "@home" = {};
+                "@home" = {};
-                          };
-                      };
-                  };
               };
+            };
           };
+        };
       };
+    };
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part1";
+    device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part1";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
-
+  swapDevices = [{device = "/swap/swapfile";}];
-  swapDevices = [ { device = "/swap/swapfile"; } ];
 
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "fuji";
     networkmanager = {
       enable = false;
@@ -117,17 +120,17 @@
   };
 
   systemd.network = {
-      enable = true;
+    enable = true;
-      networks = {
+    networks = {
-          "10-lan" = {
+      "10-lan" = {
-              matchConfig.Name = "eno1";
+        matchConfig.Name = "eno1";
-              ntp = [ "192.168.2.1" ];
+        ntp = ["192.168.2.1"];
-              networkConfig = {
+        networkConfig = {
-                DHCP = "yes";
+          DHCP = "yes";
-                IPv6AcceptRA = true;
+          IPv6AcceptRA = true;
-              };
+        };
-          };
       };
+    };
   };
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/fuji/home.nix

@@ -10,18 +10,15 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    #../../modules/wm/hyprland/home.nix # Window Manager
+    #../../modules/wm/kde/home.nix # Window Manager
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      #../../modules/wm/hyprland/home.nix # Window Manager
-      #../../modules/wm/kde/home.nix # Window Manager
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
       #firefox
@@ -35,11 +32,11 @@
     ];
   };
 
-  services = {                            # Applets
+  services = {
-   #blueman-applet.enable = true;         # Bluetooth
+    # Applets
-   network-manager-applet.enable = true; # Network
+    #blueman-applet.enable = true;         # Bluetooth
+    network-manager-applet.enable = true; # Network
   };
 
   xsession.preferStatusNotifierItems = true;
-
 }

hosts/home.nix

@@ -14,32 +14,35 @@
 #       └─ ./shell
 #           └─ default.nix
 #
-
-{ config, lib, pkgs, user, pkgs-stable, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  user,
+  ...
+}: {
   imports =
-    (import ../modules/editors) ++
+    (import ../modules/editors)
-    (import ../modules/programs) ++
+    ++ (import ../modules/programs)
-    (import ../modules/programs/configs) ++
+    ++ (import ../modules/programs/configs)
-    (import ../modules/services) ++
+    ++ (import ../modules/services)
-    (import ../modules/shell);
+    ++ (import ../modules/shell);
 
   home = {
     username = "${user}";
     homeDirectory = "/home/${user}";
 
     packages = with pkgs; [
-# Terminal
+      # Terminal
-      pfetch            # Minimal fetch
+      pfetch # Minimal fetch
-      ranger            # File Manager
+      ranger # File Manager
-      gnupg             # sign and authorize 2nd Fac
+      gnupg # sign and authorize 2nd Fac
 
       xdg-utils
       steam
       wakelan
 
-# dev ols
+      # dev ols
       gcc
       gnumake
       gnupatch
@@ -47,14 +50,15 @@
       screen
       yubioath-flutter
       nitrokey-app
+      claude-code
 
       tailscale
       wireguard-tools
 
-# VideAudio
+      # VideAudio
-      mpv               # Media Player
+      mpv # Media Player
 
-# Apps
+      # Apps
       qalculate-qt
       hdparm
       python3
@@ -67,16 +71,16 @@
       vesktop
       element-desktop
 
-# Fileanagement
+      # Fileanagement
       kdePackages.ark
-      pcmanfm           # File Manager
+      pcmanfm # File Manager
-      rsync             # Syncer $ rsync -r dir1/ dir2/
+      rsync # Syncer $ rsync -r dir1/ dir2/
-      unzip             # Zip files
+      unzip # Zip files
-      unrar             # Rar files
+      unrar # Rar files
       papirus-icon-theme
       arc-theme
 
-# General configuration
+      # General configuration
       keepassxc
       libreoffice
       gimp
@@ -84,29 +88,28 @@
       # Flatpak
       #vscodium
       (vscode-with-extensions.override {
-          vscode = vscodium;
+        vscode = vscodium;
-          vscodeExtensions = with vscode-extensions; [
+        vscodeExtensions = with vscode-extensions; [
-            vscodevim.vim
+          vscodevim.vim
-            github.copilot
+          github.copilot
-            #ms-python.python
+          #ms-python.python
-            ms-vscode.cpptools
+          ms-vscode.cpptools
-	    catppuccin.catppuccin-vsc-icons
+          catppuccin.catppuccin-vsc-icons
-	    catppuccin.catppuccin-vsc
+          catppuccin.catppuccin-vsc
-          ];
+        ];
       })
 
       sdkmanager
-      android-tools
     ];
 
     file.".config/wall".source = ../modules/themes/wall.jpg;
     file.".config/lockwall".source = ../modules/themes/lockwall.jpg;
-#    pointerCursor = {                         # This will set cursor systemwide so applications can not choose their own
+    #    pointerCursor = {                         # This will set cursor systemwide so applications can not choose their own
-#      name = "Dracula-cursors";
+    #      name = "Dracula-cursors";
-#      package = pkgs.dracula-theme;
+    #      package = pkgs.dracula-theme;
-#      size = 16;
+    #      size = 16;
-#      gtk.enable = true;
+    #      gtk.enable = true;
-#    };
+    #    };
     stateVersion = "23.05";
   };
 
@@ -117,25 +120,24 @@
     };
   };
 
-
+  #  gtk = {                                     # Theming
-#  gtk = {                                     # Theming
+  #    enable = true;
-#    enable = true;
+  #    theme = {
-#    theme = {
+  #      name = "Dracula";
-#      name = "Dracula";
+  #      package = pkgs.dracula-theme;
-#      package = pkgs.dracula-theme;
+  #    };
-#    };
+  #    iconTheme = {
-#    iconTheme = {
+  #      name = "Papirus-Dark";
-#      name = "Papirus-Dark";
+  #      package = pkgs.papirus-icon-theme;
-#      package = pkgs.papirus-icon-theme;
+  #    };
-#    };
+  #    font = {
-#    font = {
+  #      name = "Cascadia Code";         # or FiraCode Nerd Font Mono Medium
-#      name = "Cascadia Code";         # or FiraCode Nerd Font Mono Medium
+  #    };                                        # Cursor is declared under home.pointerCursor
-#    };                                        # Cursor is declared under home.pointerCursor
+  #  };
-#  };
   systemd.user.services.mpris-proxy = {
     Unit.Description = "Mpris proxy";
-    Unit.After = [ "network.target" "sound.target" ];
+    Unit.After = ["network.target" "sound.target"];
     Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
-    Install.WantedBy = [ "default.target" ];
+    Install.WantedBy = ["default.target"];
   };
 }

hosts/home_server.nix

@@ -14,12 +14,17 @@
 #       └─ ./shell
 #           └─ default.nix
 #
-
-{ config, lib, pkgs, user, ... }:
-
 {
-  imports =                                   # Home Manager Modules
+  config,
-    (import ../modules/editors) ++
+  lib,
+  pkgs,
+  user,
+  ...
+}: {
+  imports =
+    # Home Manager Modules
+    (import ../modules/editors)
+    ++
     #(import ../modules/programs) ++
     #(import ../modules/programs/configs) ++
     #(import ../modules/services) ++
@@ -31,9 +36,9 @@
 
     packages = with pkgs; [
       # Terminal
-      pfetch            # Minimal fetch
+      pfetch # Minimal fetch
-      ranger            # File Manager
+      ranger # File Manager
-      gnupg             # sign and authorize 2nd Fac
+      gnupg # sign and authorize 2nd Fac
 
       #xdg-utils
 
@@ -45,10 +50,9 @@
       python3
 
       # File Management
-      rsync             # Syncer $ rsync -r dir1/ dir2/
+      rsync # Syncer $ rsync -r dir1/ dir2/
       #unzip             # Zip files
       #unrar             # Rar files
-
     ];
     stateVersion = "23.11";
   };

hosts/jupiter/default.nix

@@ -1,55 +1,44 @@
 #
-#  Specific system configuration settings for desktop
+#  Jupiter — NAS server configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ config, pkgs, user, pkgs-kabbone, ... }:
-
 {
-  imports =                                                         # For now, if applying to other ssystem, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    #(import ../../modules/wm/virtualisation) ++   # Docker
+  inputs,
-    (import ../../modules/services/nas) ++                       # Server Services
+  user,
-    (import ../../modules/hardware);                                # Hardware devices
+  ...
+}: {
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../../modules/server
+    ]
+    ++ (import ../../modules/services/nas);
 
-  boot = {                                  # Boot options
+  # ── Server module options ───────────────────────────────────────────────
+  # No virtualisation on the NAS
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+
+  # Example: host-specific overlay — only jupiter gets these packages in its pkgs.
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     corosync-qdevice = (import ../../packages { pkgs = prev; }).corosync-qdevice;
+  #     firefox          = inputs.nixpkgs-unstable.legacyPackages.${prev.system}.firefox;
+  #   })
+  # ];
+
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-
+    loader = {
-    loader = {                              # EFI Boot
       systemd-boot.enable = true;
-      efi = {
+      efi.canTouchEfiVariables = true;
-        canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot";
-        efiSysMountPoint = "/boot";
+      timeout = 1;
-      };
-      timeout = 1;                          # Grub auto select time
     };
   };
 
-#  environment = {
-#    systemPackages = with pkgs-kabbone; [
-#      corosync-qdevice
-###      simple-scan
-###       intel-media-driver
-###       alacritty
-#    ];
-#  };
-
   programs = {
-    zsh.enable = true;
     ssh.startAgent = false;
     gnupg.agent = {
       enable = false;
@@ -60,16 +49,14 @@
 
   services = {
     qemuGuest.enable = true;
-    avahi = {                               # Needed to find wireless printer
+    avahi = {
       enable = true;
       nssmdns4 = true;
-      publish = {                           # Needed for detecting the scanner
+      publish = {
         enable = true;
         addresses = true;
         userServices = true;
       };
     };
-
   };
-
 }

hosts/jupiter/hardware-configuration.nix

@@ -10,18 +10,22 @@
 # 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, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports =
-    [(modulesPath + "/profiles/qemu-guest.nix")] ++
+    [(modulesPath + "/profiles/qemu-guest.nix")]
-    [( import ../../modules/hardware/backup.nix )];
+    ++ [(import ../../modules/hardware/backup.nix)];
 
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [  ];
+  boot.initrd.kernelModules = [];
   boot.initrd.secrets = {
     "/root/NASKeyfile" =
-        /root/NASKeyfile;
+      /root/NASKeyfile;
   };
   boot.initrd.luks.devices = {
     NAS-RAID1 = {
@@ -33,8 +37,8 @@
       keyFile = "/root/NASKeyfile";
     };
   };
-  boot.kernelModules = [  ];
+  boot.kernelModules = [];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -50,174 +54,174 @@
   };
 
   services.btrbk = {
-      extraPackages = [ pkgs.lz4 pkgs.mbuffer ];
+    extraPackages = [pkgs.lz4 pkgs.mbuffer];
-      instances = {
+    instances = {
-          hf = {
+      hf = {
-              onCalendar = "hourly";
+        onCalendar = "hourly";
-              settings = {
+        settings = {
-                  incremental = "yes";
+          incremental = "yes";
-                  snapshot_create = "ondemand";
+          snapshot_create = "ondemand";
-                  snapshot_dir = "@snapshots";
+          snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
+          timestamp_format = "long";
 
-                  snapshot_preserve = "2w 5d 5h";
+          snapshot_preserve = "2w 5d 5h";
-                  snapshot_preserve_min = "latest";
+          snapshot_preserve_min = "latest";
 
-                  volume =  {
+          volume = {
-                      "/mnt/snapshots/root" = {
+            "/mnt/snapshots/root" = {
-                          snapshot_create = "always";
+              snapshot_create = "always";
-                          subvolume = {
+              subvolume = {
-                              "@" = {};
+                "@" = {};
-                              "@home" = {};
+                "@home" = {};
-                          };
-                      };
-                  };
-                  volume =  {
-                      "/mnt/snapshots/Mars" = {
-                          snapshot_create = "always";
-                          subvolume = {
-                              "@nas" = {};
-                          };
-                      };
-                  };
               };
+            };
           };
-          lf = {
+          volume = {
-              onCalendar = "daily";
+            "/mnt/snapshots/Mars" = {
-              settings = {
+              snapshot_create = "always";
-                  incremental = "yes";
+              subvolume = {
-                  snapshot_create = "ondemand";
+                "@nas" = {};
-                  snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
-
-                  snapshot_preserve = "2m 2w 5d";
-                  snapshot_preserve_min = "latest";
-                
-                  volume =  {
-                      "/mnt/snapshots/Pluto" = {
-                          snapshot_create = "always";
-                          subvolume = {
-                            "@" = {};
-                            "@/Backups" = {};
-                            "@/Games" = {};
-                            "@/IT" = {};
-                            "@/Media" = {};
-                            "@/Pictures" = {};
-                            "@/Rest" = {};
-                          };
-                      };
-                  };
               };
+            };
           };
+        };
       };
+      lf = {
+        onCalendar = "daily";
+        settings = {
+          incremental = "yes";
+          snapshot_create = "ondemand";
+          snapshot_dir = "@snapshots";
+          timestamp_format = "long";
+
+          snapshot_preserve = "2m 2w 5d";
+          snapshot_preserve_min = "latest";
+
+          volume = {
+            "/mnt/snapshots/Pluto" = {
+              snapshot_create = "always";
+              subvolume = {
+                "@" = {};
+                "@/Backups" = {};
+                "@/Games" = {};
+                "@/IT" = {};
+                "@/Media" = {};
+                "@/Pictures" = {};
+                "@/Rest" = {};
+              };
+            };
+          };
+        };
+      };
+    };
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-    fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-    fileSystems."/mnt/snapshots/Mars" =
+  fileSystems."/mnt/snapshots/Mars" = {
-    { device = "/dev/disk/by-label/MARS";
+    device = "/dev/disk/by-label/MARS";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/Pluto" =
+  fileSystems."/mnt/snapshots/Pluto" = {
-    { device = "/dev/disk/by-label/NAS-RAID";
+    device = "/dev/disk/by-label/NAS-RAID";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd:8,noatime,subvolid=5" ];
+    options = ["compress=zstd:8,noatime,subvolid=5"];
-    };
+  };
 
-  fileSystems."/mnt/Pluto" =
+  fileSystems."/mnt/Pluto" = {
-    { device = "/dev/disk/by-label/NAS-RAID";
+    device = "/dev/disk/by-label/NAS-RAID";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd:8,noatime,subvol=@" ];
+    options = ["compress=zstd:8,noatime,subvol=@"];
-    };
+  };
 
-  fileSystems."/mnt/Mars" =
+  fileSystems."/mnt/Mars" = {
-    { device = "/dev/disk/by-label/MARS";
+    device = "/dev/disk/by-label/MARS";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async"];
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-label/NIXBOOT";
+    device = "/dev/disk/by-label/NIXBOOT";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
-  fileSystems."/export/Pluto" =
+  fileSystems."/export/Pluto" = {
-    { device = "/mnt/Pluto";
+    device = "/mnt/Pluto";
-      options = [ "bind" ];
+    options = ["bind"];
-    };
+  };
 
-  fileSystems."/export/Mars" =
+  fileSystems."/export/Mars" = {
-    { device = "/mnt/Mars";
+    device = "/mnt/Mars";
-      options = [ "bind" ];
+    options = ["bind"];
-    };
+  };
 
-  swapDevices = [ { device = "/swap/swapfile"; } ];
+  swapDevices = [{device = "/swap/swapfile";}];
 
   systemd.network = {
-      enable = true;
+    enable = true;
-      networks = {
+    networks = {
-          "10-lan" = {
+      "10-lan" = {
-              matchConfig.Name = "ens18";
+        matchConfig.Name = "ens18";
-              ntp = [ "192.168.2.1" ];
+        ntp = ["192.168.2.1"];
-              domains = [ "home.opel-online.de" ];
+        domains = ["home.opel-online.de"];
-              networkConfig = {
+        networkConfig = {
-                DHCP = "yes";
+          DHCP = "yes";
-                IPv6AcceptRA = true;
+          IPv6AcceptRA = true;
-		IPv6PrivacyExtensions=false;
+          IPv6PrivacyExtensions = false;
-              };
+        };
-              ipv6AcceptRAConfig = {
+        ipv6AcceptRAConfig = {
-                DHCPv6Client = "always";
+          DHCPv6Client = "always";
-                UseDNS = true;
+          UseDNS = true;
-              };
+        };
-              dhcpV4Config = {
+        dhcpV4Config = {
-                UseDNS = true;
+          UseDNS = true;
-              };
+        };
-              dhcpV6Config = {
+        dhcpV6Config = {
-                UseDNS = true;
+          UseDNS = true;
-              };
+        };
-          };
       };
+    };
   };
   networking = {
     hostName = "jupiter";
     domain = "home.opel-online.de";
-    useDHCP = false;                     # For versatility sake, manually edit IP on nm-applet.
+    useDHCP = false; # For versatility sake, manually edit IP on nm-applet.
     #firewall = {
     #  enable = false;
     #  #allowedUDPPorts = [ 53 67 ];
@@ -234,5 +238,4 @@
       ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
     '';
   };
-  
 }

hosts/jupiter/home.nix

@@ -10,16 +10,13 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
 
@@ -32,5 +29,4 @@
   programs = {
     alacritty.settings.font.size = 11;
   };
-
 }

hosts/kabtop/default.nix

@@ -1,62 +1,54 @@
 #
-#  Specific system configuration settings for desktop
+#  Kabtop — server configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ config, pkgs, pkgs-unstable, user, agenix, impermanence, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+  user,
-    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++  # kvm module options
+  agenix,
-    (import ../../modules/services/server);                     # Server Services
+  impermanence,
+  ...
+}: {
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../../modules/server
+    ]
+    ++ (import ../../modules/services/server);
 
-  boot = {                                  # Boot options
+  # ── Server module options ───────────────────────────────────────────────
+  myServer.virtualisation.enable = true;
+  myServer.virtualisation.cpu = "amd";
+  myServer.fail2ban.enable = true;
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-
+    loader = {
-    loader = {                              # EFI Boot
+      grub = {
-    grub = {
         enable = true;
         device = "/dev/sda";
-    };
+      };
-      timeout = 1;                          # Grub auto select time
+      timeout = 1;
     };
   };
 
-  environment = {
+  environment.etc = {
-    etc = {
+    "fail2ban/filter.d/open-webui.conf" = {
-      "fail2ban/filter.d/open-webui.conf" = {
+      source = ../../modules/services/server/fail2ban/filter/open-webui.conf;
-        source = ../../modules/services/server/fail2ban/filter/open-webui.conf;
+      mode = "0444";
-        mode = "0444";
+    };
-      };
+    "fail2ban/filter.d/gitea.conf" = {
-      "fail2ban/filter.d/gitea.conf" = {
+      source = ../../modules/services/server/fail2ban/filter/gitea.conf;
-        source = ../../modules/services/server/fail2ban/filter/gitea.conf;
+      mode = "0444";
-        mode = "0444";
+    };
-      };
+    "fail2ban/filter.d/nextcloud.conf" = {
-      "fail2ban/filter.d/nextcloud.conf" = {
+      source = ../../modules/services/server/fail2ban/filter/nextcloud.conf;
-        source = ../../modules/services/server/fail2ban/filter/nextcloud.conf;
+      mode = "0444";
-        mode = "0444";
-      };
     };
   };
 
   programs = {
-    zsh.enable = true;
     ssh.startAgent = false;
     gnupg.agent = {
       enable = true;
@@ -65,47 +57,5 @@
     };
   };
 
-  services = {
+  services.qemuGuest.enable = true;
-    #auto-cpufreq.enable = true;
-    qemuGuest.enable = true;
-    #avahi = {                               # Needed to find wireless printer
-    #  enable = true;
-    #  nssmdns = true;
-    #  publish = {                           # Needed for detecting the scanner
-    #    enable = true;
-    #    addresses = true;
-    #    userServices = true;
-    #  };
-    #};
-    fail2ban = {
-        enable = true;
-        maxretry = 5;
-        jails.DEFAULT.settings = {
-           findtime = "15m";
-        };
-        jails = {
-            open-webui = ''
-              enabled = true
-              filter = open-webui
-              backend = systemd
-              action = iptables-allports
-            '';
-            gitea = ''
-              enabled = true
-              filter = gitea
-              backend = systemd
-              action = iptables-allports
-            '';
-            nextcloud = ''
-              backend = auto
-              enabled = true
-              filter = nextcloud
-              logpath = /var/lib/nextcloud/data/nextcloud.log
-              action = iptables-allports
-            '';
-          };
-    };
-
-  };
-
 }

hosts/kabtop/hardware-configuration.nix

@@ -10,17 +10,21 @@
 # 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 =
+  config,
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [  "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "ahci" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "ahci" "sd_mod" "sr_mod"];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1"];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -34,81 +38,80 @@
   };
 
   services.btrbk = {
-      instances = {
+    instances = {
-          hf = {
+      hf = {
-              onCalendar = "hourly";
+        onCalendar = "hourly";
-              settings = {
+        settings = {
-                  incremental = "yes";
+          incremental = "yes";
-                  snapshot_create = "ondemand";
+          snapshot_create = "ondemand";
-                  snapshot_dir = "@snapshots";
+          snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
+          timestamp_format = "long";
 
-                  snapshot_preserve = "2m 2w 5d 5h";
+          snapshot_preserve = "2m 2w 5d 5h";
-                  snapshot_preserve_min = "latest";
+          snapshot_preserve_min = "latest";
 
-                  volume =  {
+          volume = {
-                      "/mnt/snapshots/root" = {
+            "/mnt/snapshots/root" = {
-                          snapshot_create = "always";
+              snapshot_create = "always";
-                          subvolume = {
+              subvolume = {
-                              "@" = {};
+                "@" = {};
-                              "@home" = {};
+                "@home" = {};
-                              "@var" = {};
+                "@var" = {};
-                          };
-                      };
-                  };
               };
+            };
           };
+        };
       };
+    };
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "space_cache=v2,ssd,noatime,subvol=@var,discard=async" ];
+    options = ["space_cache=v2,ssd,noatime,subvol=@var,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
-
-  fileSystems."/mnt/snapshots/root" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
-    };
 
+  fileSystems."/mnt/snapshots/root" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    fsType = "btrfs";
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
+  };
 
   #swapDevices = [ { device = "/swap/swapfile"; } ];
-  swapDevices = [  ];
+  swapDevices = [];
 
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "kabtop";
     domain = "kabtop.de";
     networkmanager = {
@@ -116,34 +119,33 @@
     };
     firewall = {
       enable = true;
-      allowedUDPPorts = [  ];
+      allowedUDPPorts = [];
-      allowedTCPPorts = [ 80 443 ];
+      allowedTCPPorts = [80 443];
     };
   };
   systemd.network = {
-      enable = true;
+    enable = true;
-      networks = {
+    networks = {
-          "10-lan" = {
+      "10-lan" = {
-              matchConfig.Name = "ens18";
+        matchConfig.Name = "ens18";
 
-              address = [
+        address = [
-                "37.44.215.182/24"
+          "37.44.215.182/24"
-                "2a13:7e80:0:ef::2/64"
+          "2a13:7e80:0:ef::2/64"
-              ];
+        ];
 
-              routes = [
+        routes = [
-                {  Gateway = "37.44.215.1"; }
+          {Gateway = "37.44.215.1";}
-                {  Gateway = "fe80::1"; }
+          {Gateway = "fe80::1";}
-              ];
+        ];
 
-              dns = [
+        dns = [
-                "9.9.9.9"
+          "9.9.9.9"
-                "2620:fe::fe"
+          "2620:fe::fe"
-              ];
+        ];
-          };
       };
+    };
   };
 
-
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/kabtop/home.nix

@@ -10,16 +10,13 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
 
@@ -32,5 +29,4 @@
   programs = {
     alacritty.settings.font.size = 11;
   };
-
 }

hosts/kabtopci/default.nix

@@ -1,45 +1,34 @@
 #
-#  Specific system configuration settings for desktop
+#  Kabtopci — CI server configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ config, pkgs, user, agenix, impermanence, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+  user,
-    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # Docker
+  agenix,
-    (import ../../modules/services/kabtopci);                       # Server Services
+  impermanence,
+  ...
+}: {
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../../modules/server
+    ]
+    ++ (import ../../modules/services/kabtopci);
 
-  boot = {                                  # Boot options
+  # ── Server module options ───────────────────────────────────────────────
+  myServer.virtualisation.enable = true;
+  myServer.virtualisation.cpu = "amd";
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-
+    loader = {
-    loader = {                              # EFI Boot
+      grub = {
-    grub = {
         enable = true;
         device = "/dev/vda";
-    };
+      };
-      timeout = 1;                          # Grub auto select time
+      timeout = 1;
     };
   };
-
-  programs = {
-    zsh.enable = true;
-  };
-
 }

hosts/kabtopci/hardware-configuration.nix

@@ -10,16 +10,19 @@
 # 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 =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")];
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "virtio_scsi" "xhci_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = ["ata_piix" "virtio_pci" "virtio_scsi" "xhci_pci" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1"];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -32,46 +35,46 @@
     ];
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "space_cache=v2,ssd,noatime,subvol=@var,discard=async" ];
+    options = ["space_cache=v2,ssd,noatime,subvol=@var,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd:9,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd:9,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-  swapDevices = [  ];
+  swapDevices = [];
 
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "kabtopci";
     domain = "ci.kabtop.de";
     networkmanager = {
@@ -79,15 +82,19 @@
     };
     interfaces = {
       ens3 = {
-        useDHCP = false;                     # For versatility sake, manually edit IP on nm-applet.
+        useDHCP = false; # For versatility sake, manually edit IP on nm-applet.
-        ipv4.addresses = [ {
+        ipv4.addresses = [
+          {
             address = "195.90.221.87";
             prefixLength = 22;
-        } ];
+          }
-        ipv6.addresses = [ {
+        ];
+        ipv6.addresses = [
+          {
             address = "2a00:6800:3:d5b::2";
             prefixLength = 64;
-        } ];
+          }
+        ];
       };
     };
     defaultGateway = "195.90.220.1";
@@ -96,11 +103,11 @@
       interface = "ens3";
     };
 
-    nameservers = [ "9.9.9.9" "2620:fe::fe" ];
+    nameservers = ["9.9.9.9" "2620:fe::fe"];
     firewall = {
       enable = true;
-      allowedUDPPorts = [  ];
+      allowedUDPPorts = [];
-      allowedTCPPorts = [ 80 443 ];
+      allowedTCPPorts = [80 443];
     };
   };
 

hosts/kabtopci/home.nix

@@ -10,16 +10,13 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
 
@@ -32,5 +29,4 @@
   programs = {
     alacritty.settings.font.size = 11;
   };
-
 }

hosts/kubemaster-1/default.nix

@@ -1,58 +1,43 @@
 #
-#  Specific system configuration settings for desktop
+#  Kubemaster-1 — Kubernetes master server configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ config, pkgs, user, agenix, impermanence, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+  user,
-    [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++   # Docker
+  agenix,
-    (import ../../modules/services/kubemaster);                       # Server Services
+  impermanence,
+  ...
+}: {
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../../modules/server
+    ]
+    ++ (import ../../modules/services/kubemaster);
 
-  boot = {                                  # Boot options
+  # ── Server module options ───────────────────────────────────────────────
+  myServer.virtualisation.enable = true;
+  myServer.virtualisation.cpu = "intel";
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-
+    loader = {
-    loader = {                              # EFI Boot
       systemd-boot.enable = true;
-      efi = {
+      efi.canTouchEfiVariables = true;
-        canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot";
-        efiSysMountPoint = "/boot";
+      timeout = 1;
-      };
-      timeout = 1;                          # Grub auto select time
     };
   };
 
-  programs = {                             
+  services.avahi = {
-    zsh.enable = true;
+    enable = true;
-  };
+    nssmdns4 = true;
-
+    publish = {
-  services = {
-    avahi = {                               # Needed to find wireless printer
       enable = true;
-      nssmdns4 = true;
+      addresses = true;
-      publish = {                           # Needed for detecting the scanner
+      userServices = true;
-        enable = true;
-        addresses = true;
-        userServices = true;
-      };
     };
   };
-
 }

hosts/kubemaster-1/hardware-configuration.nix

@@ -10,17 +10,21 @@
 # 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 =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod"];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1"];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -33,74 +37,74 @@
     ];
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@var,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@var,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-  swapDevices = [  ];
+  swapDevices = [];
 
   systemd.network = {
-      enable = true;
+    enable = true;
-      networks = {
+    networks = {
-          "10-lan" = {
+      "10-lan" = {
-              matchConfig.Name = "enp0s31f6";
+        matchConfig.Name = "enp0s31f6";
-              ntp = [ "192.168.2.1" ];
+        ntp = ["192.168.2.1"];
-              domains = [ "home.opel-online.de" ];
+        domains = ["home.opel-online.de"];
-              networkConfig = {
+        networkConfig = {
-                DHCP = "yes";
+          DHCP = "yes";
-                IPv6AcceptRA = true;
+          IPv6AcceptRA = true;
-              };
+        };
-              dns = [
+        dns = [
-                "192.168.2.1"
+          "192.168.2.1"
-              ];
+        ];
-          };
       };
+    };
   };
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "kubemaster-1";
     firewall = {
       enable = true;
-      allowedUDPPorts = [  ];
+      allowedUDPPorts = [];
-      allowedTCPPorts = [ 80 443 ];
+      allowedTCPPorts = [80 443];
     };
   };
 
@@ -113,5 +117,4 @@
     '';
   };
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
 }

hosts/kubemaster-1/home.nix

@@ -10,16 +10,13 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
 
@@ -32,5 +29,4 @@
   programs = {
     alacritty.settings.font.size = 11;
   };
-
 }

hosts/lifebook/default.nix

@@ -1,99 +1,60 @@
 #
-#  Specific system configuration settings for desktop
+#  Lifebook laptop — system configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ inputs, lib, config, pkgs, user, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  lib,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    [(import ../../modules/wm/niri/default.nix)] ++        # Window Manager
+  user,
-    (import ../../modules/wm/virtualisation) ++             # libvirt + Docker
+  ...
-    [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++   # kvm module options
+}: {
-    (import ../../modules/hardware);                                # Hardware devices
+  imports = [
+    ./hardware-configuration.nix
+    ../../modules/desktop
+  ];
 
-  boot = {                                  # Boot options
+  # ── Desktop module options ──────────────────────────────────────────────
+  myDesktop.windowManager = "niri";
+  myDesktop.niri.hotkeyVariant = "lifebook";
+  myDesktop.cpu = "intel";
+  myDesktop.virtualisation.enable = true;
+
+  myDesktop.laptop.enable = true;
+  myDesktop.laptop.lidSwitch = "suspend-then-hibernate";
+  myDesktop.laptop.hibernateDelaySec = "1h";
+
+  myDesktop.git.signingKey = "/home/${user}/.ssh/id_ed25519_sk_rk_blackred";
+
+  myDesktop.syncthing.enable = true;
+  myDesktop.syncthing.devices = {
+    "jupiter.home.opel-online.de" = {id = "T53WU6Z-3NT74ZE-PZVZB2N-7FBTZ5K-HESC2ZM-W4ABDAS-NWXHTGI-ST4CDQR";};
+    "hades.home.opel-online.de" = {id = "3VPCBVW-RH7XKFM-TWJGQHC-ZRAQ575-CQKGGKP-NAB4VXE-KCKJFUT-AMCUQQA";};
+  };
+  myDesktop.syncthing.folders = {
+    "Sync" = {
+      path = "/home/kabbone/Sync";
+      devices = ["jupiter.home.opel-online.de" "hades.home.opel-online.de"];
+      ignorePerms = false;
+    };
+  };
+
+  myDesktop.extraSystemPackages = with pkgs; [
+    intel-media-driver
+    intel-compute-runtime
+  ];
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    initrd.prepend = [ "${./patched-SSDT4}" ];
+    initrd.prepend = ["${./patched-SSDT4}"];
-
+    loader = {
-    loader = {                              # EFI Boot
       systemd-boot.enable = lib.mkForce false;
-      efi = {
+      efi.canTouchEfiVariables = true;
-        canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot";
-        efiSysMountPoint = "/boot";
+      timeout = 1;
-      };
-      timeout = 1;                          # Grub auto select time
     };
-
     lanzaboote = {
-        enable = true;
-        pkiBundle = "/etc/secureboot";
-    };
-  };
-
-  hardware = {
-    nitrokey.enable = true;
-  };
-
-  environment = {
-    systemPackages = with pkgs; [
-       linux-firmware
-       intel-media-driver
-       intel-compute-runtime
-    ];
-  };
-
-  systemd.sleep.extraConfig = "HibernateDelaySec=1h";
-  services = {
-    logind.settings.Login.HandleLidSwitch = "suspend-then-hibernate";            # Laptop does not go to sleep when lid is closed
-    blueman.enable = true;
-    avahi = {                               # Needed to find wireless printer
       enable = true;
-      nssmdns4 = true;
+      pkiBundle = "/etc/secureboot";
-      publish = {                           # Needed for detecting the scanner
-        enable = true;
-        addresses = true;
-        userServices = true;
-      };
-    };
-    #tailscale.enable = true;
-    syncthing = {
-        enable = true;
-        group = "users";
-        user = "kabbone";
-        dataDir = "/home/${config.services.syncthing.user}/Sync";
-        configDir = "/home/${config.services.syncthing.user}/.config/syncthing";
-        overrideDevices = true;     # overrides any devices added or deleted through the WebUI
-        overrideFolders = true;     # overrides any folders added or deleted through the WebUI
-        openDefaultPorts = true;
-        settings = {
-          devices = {
-            "jupiter.home.opel-online.de" = { id = "T53WU6Z-3NT74ZE-PZVZB2N-7FBTZ5K-HESC2ZM-W4ABDAS-NWXHTGI-ST4CDQR"; };
-            "hades.home.opel-online.de" = { id = "3VPCBVW-RH7XKFM-TWJGQHC-ZRAQ575-CQKGGKP-NAB4VXE-KCKJFUT-AMCUQQA"; };
-          };
-          folders = {
-            "Sync" = {         # Name of folder in Syncthing, also the folder ID
-              path = "/home/${config.services.syncthing.user}/Sync";    # Which folder to add to Syncthing
-              devices = [ "jupiter.home.opel-online.de" "hades.home.opel-online.de" ];      # Which devices to share the folder with
-              ignorePerms = false;  # By default, Syncthing doesn't sync file permissions. This line enables it for this folder.
-            };
-          };
-        };
     };
   };
 }

hosts/lifebook/hardware-configuration.nix

@@ -10,222 +10,222 @@
 # 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, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")] ++
+    [(modulesPath + "/installer/scan/not-detected.nix")]
-      [( import ../../modules/hardware/backup.nix )];
+    ++ [(import ../../modules/hardware/backup.nix)];
 
   boot = {
-	  initrd = {
+    initrd = {
-		  availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+      availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci"];
-		  kernelModules = [ "i915" "kvm_intel" "vfio_pci" "vfio" "vfio_iommu_type1" ];
+      kernelModules = ["i915" "kvm_intel" "vfio_pci" "vfio" "vfio_iommu_type1"];
-		  systemd.enable = true;
+      systemd.enable = true;
-		  luks = {
+      luks = {
-			  devices."crypted" = {
+        devices."crypted" = {
-				  device = "/dev/disk/by-partlabel/disk-nvme0n1-luks";
+          device = "/dev/disk/by-partlabel/disk-nvme0n1-luks";
-				  allowDiscards = true;
+          allowDiscards = true;
-		                  bypassWorkqueues = true;
+          bypassWorkqueues = true;
-			  };
+        };
-		  };
+      };
-	  };
+    };
 
-	  kernelModules = [ "kvm-intel" ];
+    kernelModules = ["kvm-intel"];
-	  kernelParams = [ "luks.options=fido2-device=auto" "sysrq_always_enabled=1" "pcie_aspm=force" ];
+    kernelParams = ["luks.options=fido2-device=auto" "sysrq_always_enabled=1" "pcie_aspm=force"];
-	  extraModprobeConfig = ''
+    extraModprobeConfig = ''
-	options i915 force_probe=!9a49
+      options i915 force_probe=!9a49
-	options xe force_probe=9a49
+      options xe force_probe=9a49
-		  '';
+    '';
-	  tmp.useTmpfs = false;
+    tmp.useTmpfs = false;
-	  tmp.cleanOnBoot = true;
+    tmp.cleanOnBoot = true;
   };
 
   zramSwap.enable = true;
 
-
   services = {
-      btrfs.autoScrub = {
+    btrfs.autoScrub = {
-          enable = true;
+      enable = true;
-          interval = "monthly";
+      interval = "monthly";
-          fileSystems = [
+      fileSystems = [
-              "/"
+        "/"
-          ];
+      ];
-      };
+    };
-      udev.extraRules = ''
+    udev.extraRules = ''
-          ACTION=="add", SUBSYSTEM=="block", KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_FS_USAGE}=="filesystem", RUN{program}+="${pkgs.systemd}/bin/systemd-mount -o noatime,compress-force=zstd:15,ssd_spread,commit=120 --no-block --automount=yes --collect $devnode /run/media/mmcblk0p1"
+      ACTION=="add", SUBSYSTEM=="block", KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_FS_USAGE}=="filesystem", RUN{program}+="${pkgs.systemd}/bin/systemd-mount -o noatime,compress-force=zstd:15,ssd_spread,commit=120 --no-block --automount=yes --collect $devnode /run/media/mmcblk0p1"
-          '';
+    '';
 
-      btrbk = {
+    btrbk = {
-          extraPackages = [ pkgs.lz4 pkgs.mbuffer ];
+      extraPackages = [pkgs.lz4 pkgs.mbuffer];
-          instances = {
+      instances = {
-              hf = {
+        hf = {
-                  onCalendar = "hourly";
+          onCalendar = "hourly";
-                  settings = {
+          settings = {
-                      incremental = "yes";
+            incremental = "yes";
-                      snapshot_create = "ondemand";
+            snapshot_create = "ondemand";
-                      snapshot_dir = "@snapshots";
+            snapshot_dir = "@snapshots";
-                      timestamp_format = "long";
+            timestamp_format = "long";
 
-                      snapshot_preserve = "2m 2w 5d 5h";
+            snapshot_preserve = "2m 2w 5d 5h";
-                      snapshot_preserve_min = "latest";
+            snapshot_preserve_min = "latest";
 
-                      volume =  {
+            volume = {
-                          "/mnt/snapshots/root" = {
+              "/mnt/snapshots/root" = {
-                              snapshot_create = "always";
+                snapshot_create = "always";
-                              subvolume = {
+                subvolume = {
-                                  "@home" = {};
+                  "@home" = {};
-                              };
+                };
-                          };
-                      };
-                  };
               };
-              bak = {
-                  onCalendar = "daily";
-                  settings = {
-	              stream_buffer = "256m";
-                      stream_compress = "lz4";
-                      incremental = "yes";
-                      snapshot_create = "no";
-                      snapshot_dir = "@snapshots";
-                      timestamp_format = "long";
-
-                      snapshot_preserve_min = "all";
-                      target_preserve_min = "no";
-                      target_preserve = "4w 3d";
-
-                      ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
-                      ssh_user = "btrbk";
-                    
-                      volume =  {
-                          "/mnt/snapshots/root" = {
-                              subvolume = {
-                                  "@home" = {};
-                              };
-	                      target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@lifebook";
-                          };
-                      };
-	          };
-	      };
-          };
-      };
-
-      tuned = {
-        enable = true;
-        profiles = {
-          balanced_powertop = {
-            main = {
-              include = "balanced";
-            };
-            sysfs = {
-              "/sys/class/net/wlan0/device/power/wakeup" = "enabled";
-              "/sys/bus/usb/devices/usb3/power/wakeup" = "enabled";
-              "/sys/bus/usb/devices/usb1/power/wakeup" = "enabled";
-              "/sys/bus/usb/devices/3-9/power/wakeup" = "enabled";
-              "/sys/bus/usb/devices/usb4/power/wakeup" = "enabled";
-              "/sys/bus/usb/devices/3-10/power/wakeup" = "enabled";
-              "/sys/bus/usb/devices/usb2/power/wakeup" = "enabled";
-              "/sys/bus/usb/devices/3-5/power/wakeup" = "enabled";
             };
           };
-          balanced-battery_powertop = {
+        };
-            main = {
+        bak = {
-              include = "balanced-battery";
+          onCalendar = "daily";
-            };
+          settings = {
-            sysfs = {
+            stream_buffer = "256m";
-              "/sys/class/net/wlan0/device/power/wakeup" = "disabled";
+            stream_compress = "lz4";
-              "/sys/bus/usb/devices/usb3/power/wakeup" = "disabled";
+            incremental = "yes";
-              "/sys/bus/usb/devices/usb1/power/wakeup" = "disabled";
+            snapshot_create = "no";
-              "/sys/bus/usb/devices/3-9/power/wakeup" = "disabled";
+            snapshot_dir = "@snapshots";
-              "/sys/bus/usb/devices/usb4/power/wakeup" = "disabled";
+            timestamp_format = "long";
-              "/sys/bus/usb/devices/3-10/power/wakeup" = "disabled";
+
-              "/sys/bus/usb/devices/usb2/power/wakeup" = "disabled";
+            snapshot_preserve_min = "all";
-              "/sys/bus/usb/devices/3-5/power/wakeup" = "disabled";
+            target_preserve_min = "no";
+            target_preserve = "4w 3d";
+
+            ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
+            ssh_user = "btrbk";
+
+            volume = {
+              "/mnt/snapshots/root" = {
+                subvolume = {
+                  "@home" = {};
+                };
+                target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@lifebook";
+              };
             };
           };
         };
       };
+    };
+
+    tuned = {
+      enable = true;
+      profiles = {
+        balanced_powertop = {
+          main = {
+            include = "balanced";
+          };
+          sysfs = {
+            "/sys/class/net/wlan0/device/power/wakeup" = "enabled";
+            "/sys/bus/usb/devices/usb3/power/wakeup" = "enabled";
+            "/sys/bus/usb/devices/usb1/power/wakeup" = "enabled";
+            "/sys/bus/usb/devices/3-9/power/wakeup" = "enabled";
+            "/sys/bus/usb/devices/usb4/power/wakeup" = "enabled";
+            "/sys/bus/usb/devices/3-10/power/wakeup" = "enabled";
+            "/sys/bus/usb/devices/usb2/power/wakeup" = "enabled";
+            "/sys/bus/usb/devices/3-5/power/wakeup" = "enabled";
+          };
+        };
+        balanced-battery_powertop = {
+          main = {
+            include = "balanced-battery";
+          };
+          sysfs = {
+            "/sys/class/net/wlan0/device/power/wakeup" = "disabled";
+            "/sys/bus/usb/devices/usb3/power/wakeup" = "disabled";
+            "/sys/bus/usb/devices/usb1/power/wakeup" = "disabled";
+            "/sys/bus/usb/devices/3-9/power/wakeup" = "disabled";
+            "/sys/bus/usb/devices/usb4/power/wakeup" = "disabled";
+            "/sys/bus/usb/devices/3-10/power/wakeup" = "disabled";
+            "/sys/bus/usb/devices/usb2/power/wakeup" = "disabled";
+            "/sys/bus/usb/devices/3-5/power/wakeup" = "disabled";
+          };
+        };
+      };
+    };
   };
 
   systemd.timers = {
-      btrbk-bak = {
+    btrbk-bak = {
-          after = [ "network-online.target" ];
+      after = ["network-online.target"];
-          requires = [ "network-online.target" ];
+      requires = ["network-online.target"];
-      };
+    };
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-label/NIXBOOT";
+    device = "/dev/disk/by-label/NIXBOOT";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-  fileSystems."/opt" =
+  fileSystems."/opt" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async"];
-    };
+  };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@var,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@var,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
+  fileSystems."/mnt/Pluto" = {
+    device = "jupiter.home.opel-online.de:/Pluto";
+    fsType = "nfs";
+    options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
+  };
 
-  fileSystems."/mnt/Pluto" =
+  fileSystems."/mnt/Mars" = {
-    { device = "jupiter.home.opel-online.de:/Pluto";
+    device = "jupiter.home.opel-online.de:/Mars";
-      fsType = "nfs";
+    fsType = "nfs";
-      options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+    options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
-    };
+  };
-
-  fileSystems."/mnt/Mars" =
-    { device = "jupiter.home.opel-online.de:/Mars";
-      fsType = "nfs";
-      options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
-    };
-
-
-  swapDevices = [ { device = "/swap/swapfile"; } ];
 
+  swapDevices = [{device = "/swap/swapfile";}];
 
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "lifebook";
     wireless.iwd.enable = true;
     networkmanager = {
@@ -235,27 +235,27 @@
         powersave = true;
       };
     };
-#    interfaces = {
+    #    interfaces = {
-#      wlan0 = {
+    #      wlan0 = {
-#        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
+    #        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
-#        #ipv4.addresses = [ {
+    #        #ipv4.addresses = [ {
-#        #    address = "192.168.0.51";
+    #        #    address = "192.168.0.51";
-#        #    prefixLength = 24;
+    #        #    prefixLength = 24;
-#        #} ];
+    #        #} ];
-#      };
+    #      };
-#    };
+    #    };
     #defaultGateway = "192.168.0.1";
     #nameservers = [ "192.168.0.4" ];
     firewall = {
       checkReversePath = false;
       enable = true;
-      allowedUDPPorts = [ 24727 51820 ];
+      allowedUDPPorts = [24727 51820];
-      allowedTCPPorts = [ 24727 ];
+      allowedTCPPorts = [24727];
     };
   };
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-#  powerManagement = {
+  #  powerManagement = {
-#    powertop.enable = true;    
+  #    powertop.enable = true;
-#  };
+  #  };
 }

hosts/lifebook/home.nix

@@ -1,49 +1,26 @@
 #
-#  Home-manager configuration for laptop
+#  Lifebook laptop — home-manager host-specific additions
-#
+#  (WM home config is loaded by modules/desktop based on myDesktop.windowManager)
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │       └─ home.nix *
-#   └─ ./modules
-#       └─ ./desktop
-#           └─ ./hyprland
-#              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # cmds / theme options
+  ];
 
-{ pkgs, ... }:
+  home.packages = with pkgs; [
+    libreoffice
+    chromium
+    thunderbird
+    streamlink
+    streamlink-twitch-gui-bin
+    intel-gpu-tools
+    pulsemixer
+  ];
 
-{
+  services = {
-  imports =
+    blueman-applet.enable = true;
-    [
+    network-manager-applet.enable = true;
-      #../../modules/wm/hyprland/home.nix # Window Manager
-      ../../modules/wm/niri/home.nix # Window Manager
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
-    packages = with pkgs; [
-      # Applications
-      libreoffice                         # Office packages
-      #firefox
-      chromium
-      thunderbird
-      streamlink
-      streamlink-twitch-gui-bin
-      intel-gpu-tools
-      pulsemixer
-      
-      # Power Management
-      #auto-cpufreq                       # Power management
-      #tlp                                # Power management
-    ];
-  };
-
-  services = {                            # Applets
-   blueman-applet.enable = true;         # Bluetooth
-   network-manager-applet.enable = true; # Network
   };
 
   xsession.preferStatusNotifierItems = true;
-
 }

hosts/nasbackup/default.nix

@@ -1,46 +1,34 @@
 #
-#  Specific system configuration settings for desktop
+#  Nasbak — NAS backup server configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ config, pkgs, user, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    #[(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+  user,
-    (import ../../modules/services/nasbackup) ++                       # Server Services
+  ...
-    (import ../../modules/hardware);                                # Hardware devices
+}: {
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../../modules/server
+    ]
+    ++ (import ../../modules/services/nasbackup);
 
-  boot = {                                  # Boot options
+  # ── Server module options ───────────────────────────────────────────────
+  # No virtualisation on the backup NAS
+
+  # ── Host-specific settings ──────────────────────────────────────────────
+  boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-
+    loader = {
-    loader = {                              # EFI Boot
       systemd-boot.enable = true;
-      efi = {
+      efi.canTouchEfiVariables = true;
-        canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot";
-        efiSysMountPoint = "/boot";
+      timeout = 1;
-      };
-      timeout = 1;                          # Grub auto select time
     };
   };
 
   programs = {
-    zsh.enable = true;
     ssh.startAgent = false;
     gnupg.agent = {
       enable = false;
@@ -51,16 +39,14 @@
 
   services = {
     qemuGuest.enable = true;
-    avahi = {                               # Needed to find wireless printer
+    avahi = {
       enable = true;
       nssmdns4 = true;
-      publish = {                           # Needed for detecting the scanner
+      publish = {
         enable = true;
         addresses = true;
         userServices = true;
       };
     };
-
   };
-
 }

hosts/nasbackup/hardware-configuration.nix

@@ -1,4 +1,3 @@
-
 # Hardware settings for Teclast F5 10" Laptop
 # NixOS @ sda2
 #
@@ -10,18 +9,22 @@
 # 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 =
+  config,
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1"];
   boot.initrd.secrets = {
     "/root/NASKeyfile" =
-        /root/NASKeyfile;
+      /root/NASKeyfile;
   };
   boot.initrd.luks.devices = {
     NAS-RAID1 = {
@@ -35,8 +38,8 @@
       bypassWorkqueues = true;
     };
   };
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -51,168 +54,167 @@
   };
 
   services.btrbk = {
-      extraPackages = [ pkgs.lz4 pkgs.mbuffer ];
+    extraPackages = [pkgs.lz4 pkgs.mbuffer];
-      instances = {
+    instances = {
-          hf = {
+      hf = {
-              onCalendar = "hourly";
+        onCalendar = "hourly";
-              settings = {
+        settings = {
-                  incremental = "yes";
+          incremental = "yes";
-                  snapshot_create = "ondemand";
+          snapshot_create = "ondemand";
-                  snapshot_dir = "@snapshots";
+          snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
+          timestamp_format = "long";
 
-                  snapshot_preserve = "2m 2w 5d 5h";
+          snapshot_preserve = "2m 2w 5d 5h";
-                  snapshot_preserve_min = "latest";
+          snapshot_preserve_min = "latest";
 
-                  volume =  {
+          volume = {
-                      "/mnt/snapshots/root" = {
+            "/mnt/snapshots/root" = {
-                          snapshot_create = "always";
+              snapshot_create = "always";
-                          subvolume = {
+              subvolume = {
-                              "@" = {};
+                "@" = {};
-                              "@home" = {};
+                "@home" = {};
-                          };
-                      };
-                  };
-              };
-          };
-          bak = {
-              onCalendar = "weekly";
-              settings = {
-	          stream_buffer = "265m";
-                  stream_compress = "lz4";
-                  incremental = "yes";
-                  snapshot_create = "no";
-                  snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
-
-                  snapshot_preserve_min = "all";
-                  target_preserve_min = "no";
-                  target_preserve = "4w 2m";
-                  archive_preserve_min = "no";
-                  archive_preserve = "4w 2m";
-
-                  ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk";
-                  ssh_user = "btrbk";
-                
-                  volume =  {
-                      "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars" = {
-                          subvolume = {
-                              "@nas" = {
-                                  target = "/mnt/nas/Backups/Mars";
-			      };
-                              "@hades/@home" = {
-				  target = "/mnt/nas/Backups/Hades";
-				  snapshot_dir = "@snapshots/@hades";
-			      };
-                              "@lifebook/@home" = {
-				  target = "/mnt/nas/Backups/Lifebook";
-				  snapshot_dir = "@snapshots/@lifebook";
-			      };
-#                              "@steamdeck/@home" = {
-#				  target = "/mnt/nas/Backups/Steamdeck";
-#				  snapshot_dir = "@snapshots/@steamdeck";
-#			      };
-                          };
-                      };
-                  };
-                  volume =  {
-                      "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Pluto" = {
-                          target = "/mnt/nas/Backups/Pluto";
-                          subvolume = {
-                              "@/Games" = {};
-                              "@/IT" = {};
-                              "@/Media" = {};
-                              "@/Pictures" = {};
-                              "@/Rest" = {};
-                          };
-                      };
-                  };
               };
+            };
           };
+        };
       };
+      bak = {
+        onCalendar = "weekly";
+        settings = {
+          stream_buffer = "265m";
+          stream_compress = "lz4";
+          incremental = "yes";
+          snapshot_create = "no";
+          snapshot_dir = "@snapshots";
+          timestamp_format = "long";
+
+          snapshot_preserve_min = "all";
+          target_preserve_min = "no";
+          target_preserve = "4w 2m";
+          archive_preserve_min = "no";
+          archive_preserve = "4w 2m";
+
+          ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk";
+          ssh_user = "btrbk";
+
+          volume = {
+            "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars" = {
+              subvolume = {
+                "@nas" = {
+                  target = "/mnt/nas/Backups/Mars";
+                };
+                "@hades/@home" = {
+                  target = "/mnt/nas/Backups/Hades";
+                  snapshot_dir = "@snapshots/@hades";
+                };
+                "@lifebook/@home" = {
+                  target = "/mnt/nas/Backups/Lifebook";
+                  snapshot_dir = "@snapshots/@lifebook";
+                };
+                #                              "@steamdeck/@home" = {
+                #				  target = "/mnt/nas/Backups/Steamdeck";
+                #				  snapshot_dir = "@snapshots/@steamdeck";
+                #			      };
+              };
+            };
+          };
+          volume = {
+            "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Pluto" = {
+              target = "/mnt/nas/Backups/Pluto";
+              subvolume = {
+                "@/Games" = {};
+                "@/IT" = {};
+                "@/Media" = {};
+                "@/Pictures" = {};
+                "@/Rest" = {};
+              };
+            };
+          };
+        };
+      };
+    };
   };
 
   systemd.services = {
-      btrbk-bak = {
+    btrbk-bak = {
-          after = [ "network-online.target" ];
+      after = ["network-online.target"];
-          requires = [ "network-online.target" ];
+      requires = ["network-online.target"];
-      };
+    };
   };
 
-
+  fileSystems."/" = {
-  fileSystems."/" =
+    device = "/dev/disk/by-label/NIXROOT";
-    { device = "/dev/disk/by-label/NIXROOT";
+    fsType = "btrfs";
-      fsType = "btrfs";
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
-    };
-
-  fileSystems."/srv" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
-    };
-
-  fileSystems."/swap" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
-    };
-
-  fileSystems."/mnt/snapshots/root" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
   };
 
-#  fileSystems."/mnt/snapshots/Pluto" =
+  fileSystems."/home" = {
-#    { device = "/dev/disk/by-label/NAS-RAID";
+    device = "/dev/disk/by-label/NIXROOT";
-#      fsType = "btrfs";
+    fsType = "btrfs";
-#      options = [ "compress=zstd,space_cache=v2,noatime,subvolid=5" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-#    };
+  };
-#
-  fileSystems."/mnt/nas" =
-    { device = "/dev/disk/by-uuid/70523c79-ef5c-40f2-8782-60fc86bb445b";
-      fsType = "btrfs";
-      options = [ "compress=zstd:9,space_cache=v2,noatime,subvol=@nasbak" ];
-    };
 
-  fileSystems."/boot" =
+  fileSystems."/srv" = {
-    { device = "/dev/disk/by-label/NIXBOOT";
+    device = "/dev/disk/by-label/NIXROOT";
-      fsType = "vfat";
+    fsType = "btrfs";
-    };
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
+  };
 
-  swapDevices = [ { device = "/swap/swapfile"; } ];
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    fsType = "btrfs";
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
+  };
+
+  fileSystems."/swap" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    fsType = "btrfs";
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
+  };
+
+  fileSystems."/mnt/snapshots/root" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    fsType = "btrfs";
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
+  };
+
+  #  fileSystems."/mnt/snapshots/Pluto" =
+  #    { device = "/dev/disk/by-label/NAS-RAID";
+  #      fsType = "btrfs";
+  #      options = [ "compress=zstd,space_cache=v2,noatime,subvolid=5" ];
+  #    };
+  #
+  fileSystems."/mnt/nas" = {
+    device = "/dev/disk/by-uuid/70523c79-ef5c-40f2-8782-60fc86bb445b";
+    fsType = "btrfs";
+    options = ["compress=zstd:9,space_cache=v2,noatime,subvol=@nasbak"];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/NIXBOOT";
+    fsType = "vfat";
+  };
+
+  swapDevices = [{device = "/swap/swapfile";}];
 
   systemd.network = {
-      enable = true;
+    enable = true;
-      networks = {
+    networks = {
-          "10-lan" = {
+      "10-lan" = {
-              matchConfig.Name = "ens18";
+        matchConfig.Name = "ens18";
-              ntp = [ "192.168.2.1" ];
+        ntp = ["192.168.2.1"];
-              domains = [ "home.opel-online.de" ];
+        domains = ["home.opel-online.de"];
-              networkConfig = {
+        networkConfig = {
-                DHCP = "yes";
+          DHCP = "yes";
-                IPv6AcceptRA = true;
+          IPv6AcceptRA = true;
-              };
+        };
-          };
       };
+    };
   };
   networking = {
     hostName = "nasbak";
     domain = "home.opel-online.de";
-    useDHCP = false;                     # For versatility sake, manually edit IP on nm-applet.
+    useDHCP = false; # For versatility sake, manually edit IP on nm-applet.
     #firewall = {
     #  enable = false;
     #  #allowedUDPPorts = [ 53 67 ];
@@ -224,10 +226,9 @@
   powerManagement = {
     cpuFreqGovernor = lib.mkDefault "powersave";
     powertop.enable = true;
-#    powerUpCommands = ''
+    #    powerUpCommands = ''
-#      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
+    #      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
-#      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2
+    #      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2
-#    '';
+    #    '';
   };
-  
 }

hosts/nasbackup/home.nix

@@ -10,16 +10,13 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
 
@@ -32,5 +29,4 @@
   programs = {
     alacritty.settings.font.size = 11;
   };
-
 }

hosts/nbf5/default.nix

@@ -16,57 +16,69 @@
 #       └─ ./hardware
 #           └─ default.nix
 #
-
-{ config, pkgs, user, ... }:
-
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  config,
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  pkgs,
-    #[(import ../../modules/wm/hyprland/default.nix)] ++        # Window Manager
+  user,
-   # [(import ../../modules/wm/sway/default.nix)] ++        # Window Manager
+  ...
-    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+}: {
-    [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++   # kvm module options
+  imports =
-    (import ../../modules/hardware) ++
+    # For now, if applying to other system, swap files
-    (import ../../modules/services/printer);                                # Hardware devices
+    [(import ./hardware-configuration.nix)]
+    ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
     
-  boot = {                                  # Boot options
+    #[(import ../../modules/wm/hyprland/default.nix)] ++        # Window Manager
+    # [(import ../../modules/wm/sway/default.nix)] ++        # Window Manager
+    [(import ../../modules/wm/virtualisation/docker.nix)]
+    ++ # Docker
+    [(import ../../modules/wm/virtualisation/kvm-intel.nix)]
+    ++ # kvm module options
+    (import ../../modules/hardware)
+    ++ (import ../../modules/services/printer); # Hardware devices
+
+  boot = {
+    # Boot options
     kernelPackages = pkgs.linuxPackages_latest;
 
-    loader = {                              # EFI Boot
+    loader = {
+      # EFI Boot
       systemd-boot.enable = true;
       efi = {
         canTouchEfiVariables = true;
         efiSysMountPoint = "/boot";
       };
-      timeout = 1;                          # Grub auto select time
+      timeout = 1; # Grub auto select time
     };
   };
 
   environment = {
     systemPackages = with pkgs; [
-       intel-media-driver
+      intel-media-driver
     ];
   };
 
-  programs = {                              # No xbacklight, this is the alterantive
+  programs = {
+    # No xbacklight, this is the alterantive
     light.enable = true;
   };
 
   services = {
     tlp = {
-      enable = true;                      # TLP and auto-cpufreq for power management
+      enable = true; # TLP and auto-cpufreq for power management
       settings = {
-        USB_DENYLIST="fc32:1287 1e7d:2e4a 1d5c:5500 1d5c:5510";
+        USB_DENYLIST = "fc32:1287 1e7d:2e4a 1d5c:5500 1d5c:5510";
       };
     };
 
-    logind.lidSwitch = "suspend-then-hibernate";            # Laptop does not go to sleep when lid is closed
+    logind.lidSwitch = "suspend-then-hibernate"; # Laptop does not go to sleep when lid is closed
     #auto-cpufreq.enable = true;
     blueman.enable = true;
-    avahi = {                               # Needed to find wireless printer
+    avahi = {
+      # Needed to find wireless printer
       enable = true;
       nssmdns4 = true;
-      publish = {                           # Needed for detecting the scanner
+      publish = {
+        # Needed for detecting the scanner
         enable = true;
         addresses = true;
         userServices = true;
@@ -75,8 +87,8 @@
   };
 
   #temporary bluetooth fix
-#  systemd.tmpfiles.rules = [
+  #  systemd.tmpfiles.rules = [
-#    "d /var/lib/bluetooth 700 root root - -"
+  #    "d /var/lib/bluetooth 700 root root - -"
-#  ];
+  #  ];
-#  systemd.targets."bluetooth".after = ["systemd-tmpfiles-setup.service"];
+  #  systemd.targets."bluetooth".after = ["systemd-tmpfiles-setup.service"];
 }

hosts/nbf5/hardware-configuration.nix

@@ -10,32 +10,36 @@
 # 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 =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
   boot = {
-	  initrd = {
+    initrd = {
-		  availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" "rtsx_usb_sdmmc" ];
+      availableKernelModules = ["ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" "rtsx_usb_sdmmc"];
-		  kernelModules = [ "i915" "kvm_intel" ];
+      kernelModules = ["i915" "kvm_intel"];
-		  systemd.enable = true;
+      systemd.enable = true;
-		  luks = {
+      luks = {
-			  devices."root" = {
+        devices."root" = {
-				  device = "/dev/disk/by-uuid/75eccc7f-30b0-4fe8-8f82-90edaf284cd5";
+          device = "/dev/disk/by-uuid/75eccc7f-30b0-4fe8-8f82-90edaf284cd5";
-				  allowDiscards = true;
+          allowDiscards = true;
-			  };
+        };
-		  };
+      };
-	  };
+    };
 
-	  kernelModules = [ "kvm-intel" ];
+    kernelModules = ["kvm-intel"];
-	  extraModprobeConfig = ''
+    extraModprobeConfig = ''
-		  options i915 enable_guc=3 enable_fbc=1 fastboot=1
+      options i915 enable_guc=3 enable_fbc=1 fastboot=1
-		  '';
+    '';
-	  kernelParams = [ "mitigations=off" "luks.options=fido2-device=auto" ];
+    kernelParams = ["mitigations=off" "luks.options=fido2-device=auto"];
-	  tmp.useTmpfs = true;
+    tmp.useTmpfs = true;
   };
 
   zramSwap.enable = true;
@@ -49,104 +53,102 @@
   };
 
   services.btrbk = {
-      instances = {
+    instances = {
-          hf = {
+      hf = {
-              onCalendar = "hourly";
+        onCalendar = "hourly";
-              settings = {
+        settings = {
-                  incremental = "yes";
+          incremental = "yes";
-                  snapshot_create = "ondemand";
+          snapshot_create = "ondemand";
-                  snapshot_dir = "@snapshots";
+          snapshot_dir = "@snapshots";
-                  timestamp_format = "long";
+          timestamp_format = "long";
 
-                  snapshot_preserve = "2m 2w 5d 5h";
+          snapshot_preserve = "2m 2w 5d 5h";
-                  snapshot_preserve_min = "latest";
+          snapshot_preserve_min = "latest";
 
-                  volume =  {
+          volume = {
-                      "/mnt/snapshots/root" = {
+            "/mnt/snapshots/root" = {
-                          snapshot_create = "always";
+              snapshot_create = "always";
-                          subvolume = {
+              subvolume = {
-                              "@home" = {};
+                "@home" = {};
-                          };
-                      };
-                  };
               };
+            };
           };
+        };
       };
+    };
   };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/mapper/root";
+    device = "/dev/mapper/root";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/mapper/root";
+    device = "/dev/mapper/root";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/mapper/root";
+    device = "/dev/mapper/root";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/opt" =
+  fileSystems."/opt" = {
-    { device = "/dev/mapper/root";
+    device = "/dev/mapper/root";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/mapper/root";
+    device = "/dev/mapper/root";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/mapper/root";
+    device = "/dev/mapper/root";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-label/BOOT";
+    device = "/dev/disk/by-label/BOOT";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
-  fileSystems."/mnt/Pluto" =
+  fileSystems."/mnt/Pluto" = {
-    { device = "jupiter:/Pluto";
+    device = "jupiter:/Pluto";
-      fsType = "nfs";
+    fsType = "nfs";
-      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+    options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
-    };
+  };
 
-  fileSystems."/mnt/Mars" =
+  fileSystems."/mnt/Mars" = {
-    { device = "jupiter:/Mars";
+    device = "jupiter:/Mars";
-      fsType = "nfs";
+    fsType = "nfs";
-      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+    options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
-    };
+  };
-
-
-  swapDevices = [ ];
 
+  swapDevices = [];
 
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "nbf5";
     wireless = {
       iwd.enable = true;
-      interfaces = [ "wlan0" ];
+      interfaces = ["wlan0"];
     };
     interfaces = {
       wlan0 = {
-        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
+        useDHCP = true; # For versatility sake, manually edit IP on nm-applet.
       };
     };
     firewall = {
       enable = true;
       #allowedUDPPorts = [ 53 67 ];
-      allowedTCPPorts = [ 80 443 ];
+      allowedTCPPorts = [80 443];
     };
   };
 

hosts/nbf5/home.nix

@@ -10,18 +10,15 @@
 #           └─ ./hyprland
 #              └─ hyprland.nix
 #
+{pkgs, ...}: {
+  imports = [
+    #../../modules/wm/hyprland/home.nix # Window Manager
+    #../../modules/wm/sway/home.nix # Window Manager
+    ../../modules/home.nix # Window Manager
+  ];
 
-{ pkgs, ... }:
+  home = {
-
+    # Specific packages for laptop
-{
-  imports =
-    [
-      #../../modules/wm/hyprland/home.nix # Window Manager
-      #../../modules/wm/sway/home.nix # Window Manager
-      ../../modules/home.nix # Window Manager
-    ];
-
-  home = {                                # Specific packages for laptop
     packages = with pkgs; [
       # Applications
       firefox
@@ -29,7 +26,7 @@
       pulsemixer
 
       # Display
-      light                              # xorg.xbacklight not supported. Other option is just use xrandr.
+      light # xorg.xbacklight not supported. Other option is just use xrandr.
 
       # Power Management
       #auto-cpufreq                       # Power management
@@ -41,11 +38,11 @@
     alacritty.settings.font.size = 11;
   };
 
-  services = {                            # Applets
+  services = {
-   blueman-applet.enable = true;         # Bluetooth
+    # Applets
-   network-manager-applet.enable = true; # Network
+    blueman-applet.enable = true; # Bluetooth
+    network-manager-applet.enable = true; # Network
   };
 
   xsession.preferStatusNotifierItems = true;
-
 }

hosts/steamdeck/default.nix

@@ -1,80 +1,53 @@
 #
-#  Specific system configuration settings for desktop
+#  Steamdeck — system configuration
 #
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │        ├─ default.nix *
-#   │        └─ hardware-configuration.nix       
-#   └─ ./modules
-#       ├─ ./desktop
-#       │   └─ ./hyprland
-#       │       └─ hyprland.nix
-#       ├─ ./modules
-#       │   └─ ./programs
-#       │       └─ waybar.nix
-#       └─ ./hardware
-#           └─ default.nix
-#
-
-{ config, pkgs, user, jovian-nixos, lib, ... }:
-
 {
+  lib,
+  pkgs,
+  user,
+  jovian-nixos,
+  ...
+}: {
+  imports = [
+    ./hardware-configuration.nix
+    ../../modules/desktop
+    ../../modules/wm/steam
+  ];
+
+  # ── Desktop module options ──────────────────────────────────────────────
+  myDesktop.windowManager = "kde";
+  myDesktop.cpu = "amd";
+  myDesktop.virtualisation.enable = true;
+  myDesktop.nitrokey.enable = true;
+
   specialisation = {
-  	sway.configuration = {
+    sway.configuration = {
-		imports =
+      imports = [(import ../../modules/wm/sway)];
-		  [(import ../../modules/wm/sway)];
+      jovian.steam.enable = lib.mkForce false;
-
+      services.desktopManager.plasma6.enable = lib.mkForce false;
-		jovian.steam.enable = lib.mkForce false;
+    };
-		services.desktopManager.plasma6.enable = lib.mkForce false;
-	};
   };
 
-  imports =                                                         # For now, if applying to other system, swap files
+  # ── Host-specific settings ──────────────────────────────────────────────
-    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+  boot = {
-    (import ../../modules/wm/virtualisation) ++                 # libvirt + Docker
+    loader = {
-    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # kvm module options
-    [(import ../../modules/wm/steam)] ++
-    [(import ../../modules/wm/kde)] ++
-    (import ../../modules/hardware);                                 # Hardware devices
-
-  boot = {                                  # Boot options
-    loader = {                              # EFI Boot
       systemd-boot.enable = lib.mkForce false;
-      efi = {
+      efi.canTouchEfiVariables = true;
-        canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot";
-        efiSysMountPoint = "/boot";
+      timeout = 1;
-      };
-      timeout = 1;                          # Grub auto select time
     };
-
     lanzaboote = {
-        enable = true;
-        pkiBundle = "/etc/secureboot";
-    };
-  };
-
-  hardware = {
-    nitrokey.enable = true;
-  };
-
-  services = {
- #   blueman.enable = true;
-    printing = {                            # Printing and drivers for TS5300
       enable = true;
-      drivers = [ pkgs.gutenprint ];
+      pkiBundle = "/etc/secureboot";
     };
-    avahi = {                               # Needed to find wireless printer
-      enable = true;
-      nssmdns4 = true;
-      publish = {                           # Needed for detecting the scanner
-        enable = true;
-        addresses = true;
-        userServices = true;
-      };
-    };
-    tailscale.enable = true;
-
   };
+
+  services.printing = {
+    enable = true;
+    drivers = [pkgs.gutenprint];
+  };
+
+  services.tailscale.enable = true;
+
   security.pam.sshAgentAuth.enable = true;
 }

hosts/steamdeck/hardware-configuration.nix

@@ -10,178 +10,180 @@
 # 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 =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
   boot = {
-	  initrd = {
+    initrd = {
-          availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
+      availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
-		  kernelModules = [ ];
+      kernelModules = [];
-		  systemd.enable = true;
+      systemd.enable = true;
-		  luks = {
+      luks = {
-			  devices."crypted" = {
+        devices."crypted" = {
-				  device = "/dev/disk/by-partlabel/disk-nvme0n1-luks";
+          device = "/dev/disk/by-partlabel/disk-nvme0n1-luks";
-				  allowDiscards = true;
+          allowDiscards = true;
-                  bypassWorkqueues = true;
+          bypassWorkqueues = true;
-			  };
+        };
-		  };
+      };
-	  };
+    };
 
-	  kernelModules = [ "kvm-amd" "amdgpu" ];
+    kernelModules = ["kvm-amd" "amdgpu"];
-	  kernelParams = [ "luks.options=fido2-device=auto" ];
+    kernelParams = ["luks.options=fido2-device=auto"];
-	  tmp.useTmpfs = false;
+    tmp.useTmpfs = false;
-	  tmp.cleanOnBoot = true;
+    tmp.cleanOnBoot = true;
   };
 
   zramSwap.enable = true;
 
   services = {
-      btrfs.autoScrub = {
+    btrfs.autoScrub = {
-          enable = true;
+      enable = true;
-          interval = "monthly";
+      interval = "monthly";
-          fileSystems = [
+      fileSystems = [
-              "/"
+        "/"
-          ];
+      ];
-      };
+    };
-      udev.extraRules = ''
+    udev.extraRules = ''
-          ACTION=="add", SUBSYSTEM=="block", KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_FS_USAGE}=="filesystem", RUN{program}+="${pkgs.systemd}/bin/systemd-mount -o noatime,compress-force=zstd:15,ssd_spread,commit=120 --no-block --automount=yes --collect $devnode /run/media/mmcblk0p1"
+      ACTION=="add", SUBSYSTEM=="block", KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_FS_USAGE}=="filesystem", RUN{program}+="${pkgs.systemd}/bin/systemd-mount -o noatime,compress-force=zstd:15,ssd_spread,commit=120 --no-block --automount=yes --collect $devnode /run/media/mmcblk0p1"
-          '';
+    '';
 
-      btrbk = {
+    btrbk = {
-          instances = {
+      instances = {
-              hf = {
+        hf = {
-                  onCalendar = "hourly";
+          onCalendar = "hourly";
-                  settings = {
+          settings = {
-                      incremental = "yes";
+            incremental = "yes";
-                      snapshot_create = "ondemand";
+            snapshot_create = "ondemand";
-                      snapshot_dir = "@snapshots";
+            snapshot_dir = "@snapshots";
-                      timestamp_format = "long";
+            timestamp_format = "long";
 
-                      snapshot_preserve = "2m 2w 5d 5h";
+            snapshot_preserve = "2m 2w 5d 5h";
-                      snapshot_preserve_min = "latest";
+            snapshot_preserve_min = "latest";
 
-                      volume =  {
+            volume = {
-                          "/mnt/snapshots/root" = {
+              "/mnt/snapshots/root" = {
-                              snapshot_create = "always";
+                snapshot_create = "always";
-                              subvolume = {
+                subvolume = {
-                                  "@home" = {};
+                  "@home" = {};
-                              };
+                };
-                          };
-                      };
-                  };
               };
-#              bak = {
+            };
-#                  onCalendar = "daily";
-#                  settings = {
-#	              stream_buffer = "256m";
-#                      stream_compress = "lz4";
-#                      incremental = "yes";
-#                      snapshot_create = "no";
-#                      snapshot_dir = "@snapshots";
-#                      timestamp_format = "long";
-#
-#                      snapshot_preserve_min = "all";
-#                      target_preserve_min = "no";
-#                      target_preserve = "2m 4w 3d";
-#
-#                      ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
-#                      ssh_user = "btrbk";
-#                    
-#                      volume =  {
-#                          "/mnt/snapshots/root" = {
-#                              subvolume = {
-#                                  "@home" = {};
-#                              };
-#	                      target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@steamdeck";
-#                          };
-#                      };
-#	          };
-#	      };
           };
+        };
+        #              bak = {
+        #                  onCalendar = "daily";
+        #                  settings = {
+        #	              stream_buffer = "256m";
+        #                      stream_compress = "lz4";
+        #                      incremental = "yes";
+        #                      snapshot_create = "no";
+        #                      snapshot_dir = "@snapshots";
+        #                      timestamp_format = "long";
+        #
+        #                      snapshot_preserve_min = "all";
+        #                      target_preserve_min = "no";
+        #                      target_preserve = "2m 4w 3d";
+        #
+        #                      ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
+        #                      ssh_user = "btrbk";
+        #
+        #                      volume =  {
+        #                          "/mnt/snapshots/root" = {
+        #                              subvolume = {
+        #                                  "@home" = {};
+        #                              };
+        #	                      target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@steamdeck";
+        #                          };
+        #                      };
+        #	          };
+        #	      };
       };
+    };
   };
-#
+  #
-#  systemd.timers = {
+  #  systemd.timers = {
-#      btrbk-bak = {
+  #      btrbk-bak = {
-#          requires = [ "network-online.target" ];
+  #          requires = [ "network-online.target" ];
-#      };
+  #      };
-#  };
+  #  };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async"];
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-label/NIXBOOT";
+    device = "/dev/disk/by-label/NIXBOOT";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async"];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async"];
-    };
+  };
 
-  fileSystems."/srv" =
+  fileSystems."/srv" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async"];
-    };
+  };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async"];
-    };
+  };
 
-  fileSystems."/opt" =
+  fileSystems."/opt" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async"];
-    };
+  };
 
-  fileSystems."/mnt/snapshots/root" =
+  fileSystems."/mnt/snapshots/root" = {
-    { device = "/dev/mapper/crypted";
+    device = "/dev/mapper/crypted";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async"];
-    };
+  };
 
-#  fileSystems."/sdcard" =
+  #  fileSystems."/sdcard" =
-#    { device = "/dev/disk/by-label/sdcard";
+  #    { device = "/dev/disk/by-label/sdcard";
-#      fsType = "ext4";
+  #      fsType = "ext4";
-#      options = [ "nofail,noauto,users,x-systemd.automount" ];
+  #      options = [ "nofail,noauto,users,x-systemd.automount" ];
-#    };
+  #    };
 
-  fileSystems."/mnt/Pluto" =
+  fileSystems."/mnt/Pluto" = {
-    { device = "jupiter:/Pluto";
+    device = "jupiter:/Pluto";
-      fsType = "nfs";
+    fsType = "nfs";
-      options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+    options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
-    };
+  };
 
-  fileSystems."/mnt/Mars" =
+  fileSystems."/mnt/Mars" = {
-    { device = "jupiter:/Mars";
+    device = "jupiter:/Mars";
-      fsType = "nfs";
+    fsType = "nfs";
-      options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+    options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
-    };
+  };
-
-
-  swapDevices = [ { device = "/swap/swapfile"; } ];
 
+  swapDevices = [{device = "/swap/swapfile";}];
 
   networking = {
-    useDHCP = false;                        # Deprecated
+    useDHCP = false; # Deprecated
     hostName = "steamdeck";
     wireless.iwd.enable = true;
     networkmanager = {
@@ -191,22 +193,22 @@
         powersave = false;
       };
     };
-#    interfaces = {
+    #    interfaces = {
-#      wlan0 = {
+    #      wlan0 = {
-#        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
+    #        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
-#        #ipv4.addresses = [ {
+    #        #ipv4.addresses = [ {
-#        #    address = "192.168.0.51";
+    #        #    address = "192.168.0.51";
-#        #    prefixLength = 24;
+    #        #    prefixLength = 24;
-#        #} ];
+    #        #} ];
-#      };
+    #      };
-#    };
+    #    };
     #defaultGateway = "192.168.0.1";
     #nameservers = [ "192.168.0.4" ];
     firewall = {
       checkReversePath = "loose";
       enable = true;
-      allowedUDPPorts = [ 24727 ];
+      allowedUDPPorts = [24727];
-      allowedTCPPorts = [ 24727 ];
+      allowedTCPPorts = [24727];
     };
   };
 

hosts/steamdeck/home.nix

@@ -1,52 +1,27 @@
 #
-#  Home-manager configuration for laptop
+#  Home-manager configuration for steamdeck
 #
-#  flake.nix
+{pkgs, ...}: {
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │       └─ home.nix *
-#   └─ ./modules
-#       └─ ./desktop
-#           └─ ./hyprland
-#              └─ hyprland.nix
-#
-
-{ pkgs, ... }:
-
-{
   specialisation = {
-  	sway.configuration = {
+    sway.configuration = {
-		imports =
+      imports = [(import ../../modules/wm/sway/home.nix)];
-		[(import ../../modules/wm/sway/home.nix)];
+    };
-	};
   };
 
   imports =
-    [(import ../../modules/home.nix)] ++ # Window Manager
+    [(import ../../modules/home.nix)]
-    [(import ../../modules/wm/steam/home.nix)] ++
+    ++ [(import ../../modules/wm/steam/home.nix)];
-    [(import ../../modules/wm/kde/home.nix)];
 
-  home = {                                # Specific packages for laptop
+  home = {
     packages = with pkgs; [
-      # Applications
+      libreoffice
-      libreoffice                         # Office packages
-      #firefox
       chromium
       thunderbird
       streamlink
       streamlink-twitch-gui-bin
       pulsemixer
-      #yuzu-early-access
-      
-      # Power Management
-      #auto-cpufreq                       # Power management
-      #tlp                                # Power management
     ];
   };
 
-  services = {                            # Applets
-  };
-
   xsession.preferStatusNotifierItems = true;
-
 }

hosts/vm/hardware-configuration.nix

@@ -1,36 +1,40 @@
 # 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 =
+  config,
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/nixos";
+    device = "/dev/disk/by-label/nixos";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime" ];
+    options = ["compress=zstd,space_cache=v2,ssd,noatime"];
-    };
+  };
 
-#  fileSystems."/home" =
+  #  fileSystems."/home" =
-#    { device = "/dev/disk/by-label/root";
+  #    { device = "/dev/disk/by-label/root";
-#      fsType = "btrfs";
+  #      fsType = "btrfs";
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home" ];
+  #      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home" ];
-#    };
+  #    };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-label/BOOT";
+    device = "/dev/disk/by-label/BOOT";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
-  swapDevices = [ ];
+  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

modules/desktop/default.nix

@@ -0,0 +1,552 @@
+#
+#  Desktop module — import this instead of manual WM/virtualisation imports.
+#
+#  Usage in hosts/<hostname>/default.nix:
+#
+#    imports = [
+#      ./hardware-configuration.nix
+#      ../../modules/desktop
+#    ];
+#
+#    myDesktop.windowManager  = "niri";   # niri (default) | sway | kde
+#    myDesktop.cpu            = "amd";    # amd | intel | none (default)
+#
+#    myDesktop.virtualisation.enable = true;
+#
+#    myDesktop.syncthing.enable  = true;
+#    myDesktop.syncthing.devices = { "jupiter.home.example.de" = { id = "XXXXX-..."; }; };
+#    myDesktop.syncthing.folders = { "Sync" = { path = "/home/user/Sync"; devices = [...]; }; };
+#
+#    myDesktop.openrgb.enable      = true;
+#    myDesktop.openrgb.motherboard = "amd";   # or "intel"
+#
+#    myDesktop.laptop.enable           = true;
+#    myDesktop.laptop.lidSwitch        = "suspend-then-hibernate";
+#    myDesktop.laptop.hibernateDelaySec = "1h";
+#
+#    myDesktop.nitrokey.enable = true;
+#
+#    myDesktop.extraSystemPackages = with pkgs; [ some-tool ];
+#
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  user,
+  ...
+}: let
+  cfg = config.myDesktop;
+in {
+  # Hardware modules that are always useful on desktops (bluetooth, …)
+  imports = import ../hardware;
+
+  # ── Options ──────────────────────────────────────────────────────────────
+
+  options.myDesktop = with lib; {
+    windowManager = mkOption {
+      type = types.enum ["niri" "sway" "kde"];
+      default = "niri";
+      description = "Window manager / desktop environment for this host.";
+    };
+
+    cpu = mkOption {
+      type = types.enum ["amd" "intel" "none"];
+      default = "none";
+      description = "CPU type — selects the matching KVM kernel parameters.";
+    };
+
+    virtualisation.enable =
+      mkEnableOption "virtualisation stack (podman/docker-compat, qemu/libvirt, virt-manager)";
+
+    syncthing = {
+      enable = mkEnableOption "syncthing continuous file synchronisation";
+      devices = mkOption {
+        type = types.attrs;
+        default = {};
+        example =
+          literalExpression
+          ''{ "jupiter.home.example.de" = { id = "XXXXX-XXXXX-XXXXX-..."; }; }'';
+        description = "Syncthing peer devices.";
+      };
+      folders = mkOption {
+        type = types.attrs;
+        default = {};
+        example =
+          literalExpression
+          ''{ "Sync" = { path = "/home/user/Sync"; devices = [ "jupiter" ]; ignorePerms = false; }; }'';
+        description = "Syncthing shared folders.";
+      };
+    };
+
+    openrgb = {
+      enable = mkEnableOption "OpenRGB RGB motherboard control";
+      motherboard = mkOption {
+        type = types.str;
+        default = "amd";
+        description = "Motherboard vendor string passed to OpenRGB (amd or intel).";
+      };
+    };
+
+    laptop = {
+      enable = mkEnableOption "laptop-specific settings (lid-switch, hibernate delay)";
+      lidSwitch = mkOption {
+        type = types.str;
+        default = "suspend-then-hibernate";
+        description = "systemd-logind action on lid close.";
+      };
+      hibernateDelaySec = mkOption {
+        type = types.str;
+        default = "1h";
+        description = "Delay before transitioning from suspend to hibernate.";
+      };
+    };
+
+    nitrokey.enable = mkEnableOption "Nitrokey hardware security key support";
+
+    niri.hotkeyVariant = mkOption {
+      type = types.enum ["default" "lifebook"];
+      default = "default";
+      description = "Niri hotkey variant to deploy — selects binds/<variant>.kdl.";
+    };
+
+    git.signingKey = mkOption {
+      type = types.str;
+      default = "/home/${user}/.ssh/id_ed25519_sk_rk_red";
+      description = "SSH key used for git commit signing on this host.";
+    };
+
+    extraSystemPackages = mkOption {
+      type = types.listOf types.package;
+      default = [];
+      description = "Additional system packages specific to this host.";
+    };
+  };
+
+  # ── Configuration ────────────────────────────────────────────────────────
+
+  config = lib.mkMerge [
+    # ── Base desktop config (replaces configuration_desktop.nix) ───────────
+    {
+      users.users.${user} = {
+        isNormalUser = true;
+        uid = 2000;
+        extraGroups = [
+          "wheel"
+          "video"
+          "audio"
+          "camera"
+          "networkmanager"
+          "lp"
+          "kvm"
+          "libvirtd"
+          "adb"
+          "dialout"
+          "tss"
+        ];
+      };
+
+      security = {
+        pam.services.login.enableGnomeKeyring = true;
+        # swaylock PAM is harmless on non-sway WMs
+        pam.services.swaylock = {};
+        rtkit.enable = true;
+      };
+
+      environment.systemPackages = with pkgs;
+        [
+          file
+          powertop
+          cpufrequtils
+          lm_sensors
+          libva-utils
+          at-spi2-core
+          qmk-udev-rules
+          gptfdisk
+          age-plugin-yubikey
+          pwgen
+          sbctl
+          ausweisapp
+          e2fsprogs
+          orca-slicer
+        ]
+        ++ cfg.extraSystemPackages;
+
+      nixpkgs.config.permittedInsecurePackages = ["mbedtls-2.28.10"];
+
+      services = {
+        pipewire = {
+          enable = true;
+          alsa.enable = true;
+          pulse.enable = true;
+          wireplumber.enable = true;
+        };
+        pcscd.enable = true;
+        yubikey-agent.enable = true;
+        udev.packages = with pkgs; [yubikey-personalization nitrokey-udev-rules];
+        flatpak.enable = true;
+        gvfs.enable = true;
+        fwupd.enable = true;
+        blueman.enable = true;
+        avahi = {
+          enable = true;
+          nssmdns4 = true;
+          publish = {
+            enable = true;
+            addresses = true;
+            userServices = true;
+          };
+        };
+      };
+
+      programs.dconf.enable = true;
+      system.autoUpgrade.enable = false;
+
+      home-manager.users.${user}.programs.git.signing.key =
+        cfg.git.signingKey;
+    }
+
+    # ── Niri ───────────────────────────────────────────────────────────────
+    (lib.mkIf (cfg.windowManager == "niri") {
+      environment = {
+        systemPackages = with pkgs; [
+          alacritty
+          xdg-desktop-portal-gnome
+          xdg-desktop-portal-gtk
+          swaylock
+          swayidle
+          slurp
+          grim
+          lxqt.lxqt-openssh-askpass
+          clinfo
+          glib
+          brightnessctl
+          playerctl
+          xwayland-satellite
+          breeze-hacked-cursor-theme
+          pwvucontrol
+        ];
+        loginShellInit = ''
+          export GTK_IM_MODULE="simple"
+          export ELECTRON_OZONE_PLATFORM_HINT="auto"
+          export NIXOS_OZONE_WL="1"
+          export WLR_RENDERER="vulkan"
+          export _JAVA_AWT_WM_NONREPARENTING="1"
+        '';
+      };
+
+      services = {
+        iio-niri.enable = false;
+        greetd = {
+          enable = true;
+          useTextGreeter = true;
+          settings.default_session.command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd niri-session";
+        };
+        tuned.enable = true;
+        upower.enable = true;
+      };
+
+      programs = {
+        niri.enable = true;
+        ssh.enableAskPassword = true;
+        ssh.askPassword = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass";
+      };
+
+      # Noctalia shell + niri home config via home-manager
+      home-manager.users.${user} = {
+        imports = [
+          inputs.noctalia.homeModules.default
+          ../wm/niri/home.nix
+        ];
+
+        xdg.configFile."niri/binds.kdl".source =
+          ../wm/niri/binds/${cfg.niri.hotkeyVariant}.kdl;
+
+        services = {
+          mako.enable = true;
+          polkit-gnome.enable = true;
+        };
+
+        programs = {
+          fuzzel.enable = true;
+
+          noctalia-shell = {
+            enable = true;
+            settings = {
+              appLauncher.terminalCommand = "alacritty -e";
+
+              bar = {
+                density = "compact";
+                position = "top";
+                showCapsule = false;
+                widgets = {
+                  left = [
+                    {
+                      id = "ControlCenter";
+                      useDistroLogo = true;
+                    }
+                    {
+                      hideUnoccupied = false;
+                      id = "Workspace";
+                      labelMode = "index";
+                      showApplications = true;
+                    }
+                    {id = "ActiveWindow";}
+                  ];
+                  center = [
+                    {
+                      formatHorizontal = "HH:mm\\ndd-MM-yy";
+                      formatVertical = "HH mm";
+                      id = "Clock";
+                      useMonospacedFont = true;
+                      usePrimaryColor = true;
+                    }
+                  ];
+                  right = [
+                    {id = "MediaMini";}
+                    {
+                      id = "SystemMonitor";
+                      showNetworkStats = true;
+                      compactMode = false;
+                    }
+                    {id = "WiFi";}
+                    {id = "Bluetooth";}
+                    {
+                      id = "Battery";
+                      displayMode = "icon-always";
+                      hideIfNotDetected = true;
+                    }
+                    {
+                      id = "Volume";
+                      displayMode = "alwaysShow";
+                    }
+                    {
+                      id = "NotificationHistory";
+                      hideWhenZero = true;
+                    }
+                    {id = "Tray";}
+                  ];
+                };
+              };
+
+              colorSchemes.predefinedScheme = "Catppuccin";
+
+              general = {
+                avatarImage = "/home/${user}/.face";
+                radiusRatio = 0.2;
+                lockOnSusepnd = true;
+              };
+
+              location = {
+                monthBeforeDay = true;
+                name = "Munich, Germany";
+                showWeekNumberInCalendar = true;
+                firstDayOfWeek = 0;
+              };
+
+              wallpaper = {
+                enabled = true;
+                overviewEnabled = false;
+                directory = "/home/${user}/.setup/modules/themes/";
+              };
+
+              brightness = {
+                enforceMinimum = true;
+                brightnessStep = 5;
+              };
+
+              controlCenter.shortcuts.left = [
+                {id = "WiFi";}
+                {id = "Bluetooth";}
+                {id = "ScreenRecorder";}
+                {id = "PowerProfile";}
+                {id = "KeepAwake";}
+              ];
+
+              dock.enabled = false;
+              sessionMenu.enableCountdown = false;
+
+              templates = {
+                fuzzel = true;
+                alacritty = true;
+                qt = true;
+                gtk = true;
+                discord = true;
+                code = true;
+                telegram = true;
+                niri = true;
+                firefox = true;
+              };
+            };
+          };
+        };
+
+        home.file.".cache/noctalia/wallpapers.json".text = builtins.toJSON {
+          defaultWallpaper = "/home/${user}/.setup/modules/themes/wall.jpg";
+        };
+      };
+    })
+
+    # ── Sway ───────────────────────────────────────────────────────────────
+    (lib.mkIf (cfg.windowManager == "sway") {
+      environment = {
+        loginShellInit = ''
+          if [ -z $DISPLAY ] && [ $UID != 0 ] && [ "$(tty)" = "/dev/tty1" ]; then
+            exec sway
+          fi
+        '';
+        systemPackages = with pkgs; [
+          xdg-desktop-portal-wlr
+          sway
+          swaylock
+          swayidle
+          slurp
+          grim
+          bemenu
+          lxqt.lxqt-openssh-askpass
+          clinfo
+          waybar
+          glib
+        ];
+      };
+
+      programs = {
+        sway = {
+          enable = true;
+          extraSessionCommands = ''
+            export MOZ_ENABLE_WAYLAND="1"
+            export MOZ_WEBRENDER="1"
+            export WLR_RENDERER="vulkan"
+            export XDG_SESSION_TYPE="wayland"
+            export GTK_THEME="Arc"
+            export _JAVA_AWT_WM_NONREPARENTING="1"
+          '';
+        };
+        ssh.enableAskPassword = true;
+        ssh.askPassword = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass";
+      };
+
+      xdg.portal = {
+        enable = true;
+        wlr.enable = true;
+        extraPortals = [pkgs.xdg-desktop-portal-gtk];
+      };
+
+      home-manager.users.${user}.imports = [
+        ../wm/sway/home.nix
+        ../wm/waybar.nix # sway uses waybar for the bar
+      ];
+    })
+
+    # ── KDE Plasma ─────────────────────────────────────────────────────────
+    (lib.mkIf (cfg.windowManager == "kde") {
+      environment.systemPackages = with pkgs; [
+        kdePackages.discover
+        maliit-keyboard
+        maliit-framework
+        kdePackages.ksshaskpass
+      ];
+
+      programs.ssh = {
+        enableAskPassword = true;
+        askPassword = lib.mkDefault "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
+      };
+
+      services = {
+        packagekit.enable = true;
+        desktopManager.plasma6.enable = true;
+        udev.packages = with pkgs; [gnome-settings-daemon];
+      };
+
+      qt.platformTheme = "kde";
+
+      home-manager.users.${user}.imports = [../wm/kde/home.nix];
+    })
+
+    # ── Virtualisation (podman/docker-compat + qemu/libvirt) ───────────────
+    (lib.mkIf cfg.virtualisation.enable {
+      users.groups = {
+        docker.members = [user];
+        libvirtd.members = ["root" user];
+      };
+
+      virtualisation = {
+        podman = {
+          enable = true;
+          autoPrune.enable = true;
+          dockerCompat = true;
+        };
+        libvirtd = {
+          enable = true;
+          onShutdown = "shutdown";
+          qemu.runAsRoot = false;
+        };
+        spiceUSBRedirection.enable = true;
+      };
+
+      environment.systemPackages = with pkgs; [
+        virt-manager
+        virt-viewer
+        qemu
+        OVMF
+        OVMF-cloud-hypervisor
+        gvfs
+        cloud-hypervisor
+      ];
+    })
+
+    # ── KVM – AMD ──────────────────────────────────────────────────────────
+    (lib.mkIf (cfg.virtualisation.enable && cfg.cpu == "amd") {
+      boot.extraModprobeConfig = ''
+        options kvm_amd nested=0 avic=1 npt=1
+      '';
+    })
+
+    # ── KVM – Intel ────────────────────────────────────────────────────────
+    (lib.mkIf (cfg.virtualisation.enable && cfg.cpu == "intel") {
+      boot.extraModprobeConfig = ''
+        options kvm_intel nested=1
+        options kvm_intel emulate_invalid_guest_state=0
+        options kvm ignore_nsrs=1
+      '';
+    })
+
+    # ── Syncthing ──────────────────────────────────────────────────────────
+    (lib.mkIf cfg.syncthing.enable {
+      services.syncthing = {
+        enable = true;
+        group = "users";
+        user = user;
+        dataDir = "/home/${user}/Sync";
+        configDir = "/home/${user}/.config/syncthing";
+        overrideDevices = true;
+        overrideFolders = true;
+        openDefaultPorts = true;
+        settings = {
+          devices = cfg.syncthing.devices;
+          folders = cfg.syncthing.folders;
+        };
+      };
+    })
+
+    # ── OpenRGB ────────────────────────────────────────────────────────────
+    (lib.mkIf cfg.openrgb.enable {
+      services.hardware.openrgb = {
+        enable = true;
+        motherboard = cfg.openrgb.motherboard;
+      };
+    })
+
+    # ── Laptop ─────────────────────────────────────────────────────────────
+    (lib.mkIf cfg.laptop.enable {
+      systemd.sleep.extraConfig = "HibernateDelaySec=${cfg.laptop.hibernateDelaySec}";
+      services.logind.settings.Login.HandleLidSwitch =
+        cfg.laptop.lidSwitch;
+    })
+
+    # ── Nitrokey ───────────────────────────────────────────────────────────
+    (lib.mkIf cfg.nitrokey.enable {
+      hardware.nitrokey.enable = true;
+    })
+  ];
+}

modules/editors/default.nix

@@ -9,7 +9,6 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
   ./nvim
 ]

modules/editors/nvim/config/default.nix

@@ -1,16 +1,15 @@
-{ nvim, ... }:
+{nvim, ...}: {
-{
   # Import all your configuration modules here
   programs.nixvim = {
-      enable = true;
+    enable = true;
-      colorschemes.gruvbox.enable = true;
+    colorschemes.gruvbox.enable = true;
 
-      imports = [
+    imports = [
-        ./bufferline.nix
+      ./bufferline.nix
-        ./plugins.nix
+      ./plugins.nix
-        ./options.nix
+      ./options.nix
-        ./keymaps.nix
+      ./keymaps.nix
-        ./highlight.nix
+      ./highlight.nix
-      ];
+    ];
   };
 }

modules/editors/nvim/config/options.nix

@@ -1,14 +1,14 @@
 {
-    config = {
+  config = {
-        globals.mapleader = " ";
+    globals.mapleader = " ";
-        viAlias = true;
+    viAlias = true;
-        vimAlias = true;
+    vimAlias = true;
 
-        opts = {
+    opts = {
-            number = true;         # Show line numbers
+      number = true; # Show line numbers
-            relativenumber = true; # Show relative line numbers
+      relativenumber = true; # Show relative line numbers
 
-            shiftwidth = 2;        # Tab width should be 2
+      shiftwidth = 2; # Tab width should be 2
-        };
     };
+  };
 }

modules/editors/nvim/config/plugins.nix

@@ -1,51 +1,51 @@
 {
-    plugins = {
+  plugins = {
-        lualine.enable = true;
+    lualine.enable = true;
 
-        cmp = {
+    cmp = {
-            enable = true;
+      enable = true;
-            autoEnableSources = true;
+      autoEnableSources = true;
-            settings = {
+      settings = {
-                sources = [
+        sources = [
-                  {name = "nvim_lsp";}
+          {name = "nvim_lsp";}
-                  {name = "path";}
+          {name = "path";}
-                  {name = "buffer";}
+          {name = "buffer";}
-                  {name = "luasnip";}
+          {name = "luasnip";}
-                ];
+        ];
 
-                mapping = {
+        mapping = {
-                    "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+          "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-                    "<C-f>" = "cmp.mapping.scroll_docs(4)";
+          "<C-f>" = "cmp.mapping.scroll_docs(4)";
-                    "<C-Space>" = "cmp.mapping.complete()";
+          "<C-Space>" = "cmp.mapping.complete()";
-                    "<C-e>" = "cmp.mapping.close()";
+          "<C-e>" = "cmp.mapping.close()";
-                    "<CR>" = "cmp.mapping.confirm({ select = true })";
+          "<CR>" = "cmp.mapping.confirm({ select = true })";
-                    "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+          "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
-                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+          "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
-                };
-            };
         };
-
+      };
-        lsp = {
-            enable = true;
-
-            servers = {
-                tsserver.enable = true;
-
-                lua-ls = {
-                    enable = true;
-                    settings.telemetry.enable = false;
-                };
-#                rust-analyzer = {
-#                    enable = true;
-#                    installCargo = true;
-#                };
-            };
-        };
-
-        telescope.enable = true;
-
-        treesitter.enable = true;
-
-        luasnip.enable = true;
     };
+
+    lsp = {
+      enable = true;
+
+      servers = {
+        tsserver.enable = true;
+
+        lua-ls = {
+          enable = true;
+          settings.telemetry.enable = false;
+        };
+        #                rust-analyzer = {
+        #                    enable = true;
+        #                    installCargo = true;
+        #                };
+      };
+    };
+
+    telescope.enable = true;
+
+    treesitter.enable = true;
+
+    luasnip.enable = true;
+  };
 }

modules/editors/nvim/default.nix

@@ -1,13 +1,9 @@
 #
 # Neovim
 #
-
+{pkgs, ...}: {
-{ pkgs, ... }:
-
-{
-
   home = {
-      packages = [ pkgs.gnvim ];
+    packages = [pkgs.gnvim];
   };
 
   programs = {
@@ -17,146 +13,147 @@
       vimAlias = true;
       vimdiffAlias = true;
       withNodeJs = true;
+      withRuby = true;
+      withPython3 = true;
 
-#      plugins = with pkgs.vimPlugins; [
+      #      plugins = with pkgs.vimPlugins; [
-#
+      #
-#        # Syntax
+      #        # Syntax
-#        #vim-nix
+      #        #vim-nix
-#        #vim-markdown
+      #        #vim-markdown
-#
+      #
-#        # Quality of life
+      #        # Quality of life
-#        vim-lastplace         # Opens document where you left it
+      #        vim-lastplace         # Opens document where you left it
-#        auto-pairs            # Print double quotes/brackets/etc.
+      #        auto-pairs            # Print double quotes/brackets/etc.
-#        vim-gitgutter         # See uncommitted changes of file :GitGutterEnable
+      #        vim-gitgutter         # See uncommitted changes of file :GitGutterEnable
-#
+      #
-#        # File Tree
+      #        # File Tree
-#        nerdtree              # File Manager - set in extraConfig to F6
+      #        nerdtree              # File Manager - set in extraConfig to F6
-#	
+      #
-#        # Customization 
+      #        # Customization
-#        wombat256-vim         # Color scheme for lightline
+      #        wombat256-vim         # Color scheme for lightline
-#        srcery-vim            # Color scheme for text
+      #        srcery-vim            # Color scheme for text
-#
+      #
-#        lightline-vim         # Info bar at bottom
+      #        lightline-vim         # Info bar at bottom
-#        indent-blankline-nvim # Indentation lines
+      #        indent-blankline-nvim # Indentation lines
-#
+      #
-#        # Syntax
+      #        # Syntax
-#        nvim-treesitter.withAllGrammars
+      #        nvim-treesitter.withAllGrammars
-#        # finder
+      #        # finder
-#        telescope-nvim
+      #        telescope-nvim
-#        # completion
+      #        # completion
-#        nvim-cmp
+      #        nvim-cmp
-#        # status line
+      #        # status line
-#        lualine-nvim
+      #        lualine-nvim
-#        # indent
+      #        # indent
-#        indent-blankline-nvim
+      #        indent-blankline-nvim
-#      ];
+      #      ];
 
-#      extraPackages = with pkgs; [
+      #      extraPackages = with pkgs; [
-#        ripgrep
+      #        ripgrep
-#        fd
+      #        fd
-#        nodejs
+      #        nodejs
-#        nodePackages.npm
+      #        nodePackages.npm
-#      ];
+      #      ];
 
-#      extraConfig = ''
+      #      extraConfig = ''
-#        set expandtab
+      #        set expandtab
-#        set shiftwidth=4
+      #        set shiftwidth=4
-#        set tabstop=4
+      #        set tabstop=4
-#      '';
+      #      '';
 
-#      extraLuaConfig = ''
+      #      extraLuaConfig = ''
-#          vim.g.mapleader = ' '
+      #          vim.g.mapleader = ' '
-#          vim.g.maplocalleader = ' '
+      #          vim.g.maplocalleader = ' '
-#
+      #
-#          -- Set highlight on search
+      #          -- Set highlight on search
-#          vim.o.hlsearch = false
+      #          vim.o.hlsearch = false
-#          
+      #
-#          -- Make line numbers default
+      #          -- Make line numbers default
-#          vim.wo.number = true
+      #          vim.wo.number = true
-#          
+      #
-#          -- Enable mouse mode
+      #          -- Enable mouse mode
-#          vim.o.mouse = 'a'
+      #          vim.o.mouse = 'a'
-#          
+      #
-#          -- Sync clipboard between OS and Neovim.
+      #          -- Sync clipboard between OS and Neovim.
-#          --  Remove this option if you want your OS clipboard to remain independent.
+      #          --  Remove this option if you want your OS clipboard to remain independent.
-#          --  See `:help 'clipboard'`
+      #          --  See `:help 'clipboard'`
-#          vim.o.clipboard = 'unnamedplus'
+      #          vim.o.clipboard = 'unnamedplus'
-#          
+      #
-#          -- Enable break indent
+      #          -- Enable break indent
-#          vim.o.breakindent = true
+      #          vim.o.breakindent = true
-#          
+      #
-#          -- Save undo history
+      #          -- Save undo history
-#          vim.o.undofile = true
+      #          vim.o.undofile = true
-#          
+      #
-#          -- Case insensitive searching UNLESS /C or capital in search
+      #          -- Case insensitive searching UNLESS /C or capital in search
-#          vim.o.ignorecase = true
+      #          vim.o.ignorecase = true
-#          vim.o.smartcase = true
+      #          vim.o.smartcase = true
-#          
+      #
-#          -- Keep signcolumn on by default
+      #          -- Keep signcolumn on by default
-#          vim.wo.signcolumn = 'yes'
+      #          vim.wo.signcolumn = 'yes'
-#          
+      #
-#          -- Decrease update time
+      #          -- Decrease update time
-#          vim.o.updatetime = 250
+      #          vim.o.updatetime = 250
-#          vim.o.timeout = true
+      #          vim.o.timeout = true
-#          vim.o.timeoutlen = 300
+      #          vim.o.timeoutlen = 300
-#          
+      #
-#          -- Set completeopt to have a better completion experience
+      #          -- Set completeopt to have a better completion experience
-#          vim.o.completeopt = 'menuone,noselect'
+      #          vim.o.completeopt = 'menuone,noselect'
-#          
+      #
-#          -- NOTE: You should make sure your terminal supports this
+      #          -- NOTE: You should make sure your terminal supports this
-#          vim.o.termguicolors = true
+      #          vim.o.termguicolors = true
-#
+      #
-#          -- [[ Highlight on yank ]]
+      #          -- [[ Highlight on yank ]]
-#          -- See `:help vim.highlight.on_yank()`
+      #          -- See `:help vim.highlight.on_yank()`
-#          local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
+      #          local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
-#          vim.api.nvim_create_autocmd('TextYankPost', {
+      #          vim.api.nvim_create_autocmd('TextYankPost', {
-#            callback = function()
+      #            callback = function()
-#              vim.highlight.on_yank()
+      #              vim.highlight.on_yank()
-#            end,
+      #            end,
-#            group = highlight_group,
+      #            group = highlight_group,
-#            pattern = '*',
+      #            pattern = '*',
-#          })
+      #          })
-#          
+      #
-#          -- [[ Configure Telescope ]]
+      #          -- [[ Configure Telescope ]]
-#          -- See `:help telescope` and `:help telescope.setup()`
+      #          -- See `:help telescope` and `:help telescope.setup()`
-#          require('telescope').setup {
+      #          require('telescope').setup {
-#            defaults = {
+      #            defaults = {
-#              mappings = {
+      #              mappings = {
-#                i = {
+      #                i = {
-#                  ['<C-u>'] = false,
+      #                  ['<C-u>'] = false,
-#                  ['<C-d>'] = false,
+      #                  ['<C-d>'] = false,
-#                },
+      #                },
-#              },
+      #              },
-#            },
+      #            },
-#          }
+      #          }
-#          
+      #
-#          -- Enable telescope fzf native, if installed
+      #          -- Enable telescope fzf native, if installed
-#          pcall(require('telescope').load_extension, 'fzf')
+      #          pcall(require('telescope').load_extension, 'fzf')
-#          
+      #
-#          -- See `:help telescope.builtin`
+      #          -- See `:help telescope.builtin`
-#          vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
+      #          vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-#          vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
+      #          vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
-#          vim.keymap.set('n', '<leader>/', function()
+      #          vim.keymap.set('n', '<leader>/', function()
-#            -- You can pass additional configuration to telescope to change theme, layout, etc.
+      #            -- You can pass additional configuration to telescope to change theme, layout, etc.
-#            require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
+      #            require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-#              winblend = 10,
+      #              winblend = 10,
-#              previewer = false,
+      #              previewer = false,
-#            })
+      #            })
-#          end, { desc = '[/] Fuzzily search in current buffer' })
+      #          end, { desc = '[/] Fuzzily search in current buffer' })
-#          
+      #
-#          vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
+      #          vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
-#          vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
+      #          vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
-#          vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
+      #          vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
-#          vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
+      #          vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
-#          vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
+      #          vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
-#          vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
+      #          vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
-#          require("indent_blankline").setup {
+      #          require("indent_blankline").setup {
-#              -- for example, context is off by default, use this to turn it on
+      #              -- for example, context is off by default, use this to turn it on
-#              show_current_context = true,
+      #              show_current_context = true,
-#              show_current_context_start = true,
+      #              show_current_context_start = true,
-#          }
+      #          }
-#      '';
+      #      '';
     };
   };
 }
-

modules/hardware/backup.nix

@@ -1,17 +1,18 @@
-
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   services.btrbk = {
     sshAccess = [
       {
         key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU2NJ9xwYnp6/frIOv96ih8psiFcC2eOQeT+ZEMW5rq";
-        roles = [ "source" "info" "send" ];
+        roles = ["source" "info" "send"];
       }
       {
         key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIma7jNVQZM+lFMOKUex0+cyDpeUA3Wo4SEJ7P9YnHPG";
-        roles = [ "target" "info" "receive" "delete" ];
+        roles = ["target" "info" "receive" "delete"];
       }
     ];
   };

modules/hardware/bluetooth.nix

@@ -1,13 +1,10 @@
 #
 # Bluetooth
 #
-
+{pkgs, ...}: {
-{ pkgs, ... }:
-
-{
   hardware.bluetooth = {
     enable = true;
-    hsphfpd.enable = false;         # HSP & HFP daemon
+    hsphfpd.enable = false; # HSP & HFP daemon
     settings = {
       General = {
         Enable = "Source,Sink,Media,Socket";

modules/hardware/hydraCache.nix

@@ -1,21 +1,20 @@
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   nix = {
     settings = {
       extra-trusted-public-keys = [
         "hades-builder:AFdPgi6Qq/yKqc2V2imgzMikEkVEFCrDaHyAmOJ3MII="
-	"steamdeck.cachix.org-1:BVoP4TEu3ECgotaO+3J3r9SSn62GkUDBwizOFU/q4Bc="
+        "steamdeck.cachix.org-1:BVoP4TEu3ECgotaO+3J3r9SSn62GkUDBwizOFU/q4Bc="
       ];
       extra-substituters = [
-	"https://steamdeck.cachix.org"
+        "https://cache.home.opel-online.de"
+        "https://steamdeck.cachix.org"
         "https://cache.ci.kabtop.de"
       ];
-      #extra-trusted-substituters = [
-      #  "https://cache.home.opel-online.de"
-      #];
     };
   };
-  
 }

modules/hardware/remoteBuilder.nix

@@ -1,17 +1,21 @@
-{ pkgs, config, ... }:
-
 {
-  users.users.nixremote = {                   # System User
+  pkgs,
-    isNormalUser = true;
+  config,
-    extraGroups = [ "kvm" ];
+  ...
-    shell = pkgs.zsh;                       # Default shell
+}: {
+  users.users.nixremote = {
+    # System User
+    isSystemUser = true;
+    group = "nixremote";
+    extraGroups = ["kvm"];
     uid = 1001;
-#    initialPassword = "password95";
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILczsj4W1kFQaalFwaY+RJ4LEzNeFKD+itXB40Q2O59M nixremote@hades"
     ];
   };
 
+  users.groups.nixremote = {};
+
   nix.settings.trusted-users = [
     "nixremote"
   ];

modules/hardware/remoteClient.nix

@@ -1,20 +1,24 @@
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   nix = {
     distributedBuilds = false;
-    buildMachines = [ {
+    buildMachines = [
-      hostName = "hades";
+      {
-      system = "x86_64-linux";
+        hostName = "hades";
-      supportedFeatures = [ "kvm" "big-parallel" ];
+        system = "x86_64-linux";
-      sshUser = "nixremote";
+        supportedFeatures = ["kvm" "big-parallel"];
-      sshKey = config.age.secrets."keys/nixremote".path;
+        sshUser = "nixremote";
-      maxJobs = 1;
+        sshKey = config.age.secrets."keys/nixremote".path;
-      speedFactor = 4;
+        maxJobs = 1;
-      publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUVnbld5UVVVYSt2Y0hBS3g2ZWRiVGdxVzhwaCtNQ2lTNmZVd1lqWWNTK28gcm9vdEBoYWRlcwo=%";
+        speedFactor = 4;
-      protocol = "ssh-ng";
+        publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUVnbld5UVVVYSt2Y0hBS3g2ZWRiVGdxVzhwaCtNQ2lTNmZVd1lqWWNTK28gcm9vdEBoYWRlcwo=%";
-    } ];
+        protocol = "ssh-ng";
+      }
+    ];
     settings = {
       extra-trusted-public-keys = [
         "hades-builder:AFdPgi6Qq/yKqc2V2imgzMikEkVEFCrDaHyAmOJ3MII="

modules/home.nix

@@ -1,31 +1,75 @@
-{ lib, options, ... }:
-
 {
+  lib,
+  options,
+  ...
+}: {
   options = with lib; {
     cmds = {
-      shell = mkOption { type = types.str; default = "zsh"; };
+      shell = mkOption {
-      fetch = mkOption { type = types.str; default = "hyfetch"; };
+        type = types.str;
-      editor = mkOption { type = types.str; default = "nvim"; };
+        default = "zsh";
+      };
+      fetch = mkOption {
+        type = types.str;
+        default = "hyfetch";
+      };
+      editor = mkOption {
+        type = types.str;
+        default = "nvim";
+      };
 
-      wm = mkOption { type = types.str; default = "sway"; };
+      wm = mkOption {
+        type = types.str;
+        default = "sway";
+      };
 
-      terminal = mkOption { type = types.str; default = "alacritty"; };
+      terminal = mkOption {
-      menu = mkOption { type = types.str; default = "rofi -show drun -show-icons"; };
+        type = types.str;
+        default = "alacritty";
+      };
+      menu = mkOption {
+        type = types.str;
+        default = "rofi -show drun -show-icons";
+      };
 
-      lock = mkOption { type = types.str; default = "locksway"; };
+      lock = mkOption {
+        type = types.str;
+        default = "locksway";
+      };
       notifications = {
-        volume = mkOption { type = types.str; default = "volume-notify"; };
+        volume = mkOption {
-        brightness = mkOption { type = types.str; default = "brightness-notify"; };
+          type = types.str;
+          default = "volume-notify";
+        };
+        brightness = mkOption {
+          type = types.str;
+          default = "brightness-notify";
+        };
       };
     };
 
-    is-wayland = mkOption { type = types.bool; default = true; };
+    is-wayland = mkOption {
+      type = types.bool;
+      default = true;
+    };
 
     theme = {
-      theme = mkOption { type = types.str; default = "catppuccin-mocha"; };
+      theme = mkOption {
-      icon-theme = mkOption { type = types.str; default = "Papirus-Dark"; };
+        type = types.str;
-      font = mkOption { type = types.str; default = "Cascadia Code 11"; };
+        default = "catppuccin-mocha";
-      wallpaper = mkOption { type = types.str; default = ""; };
+      };
+      icon-theme = mkOption {
+        type = types.str;
+        default = "Papirus-Dark";
+      };
+      font = mkOption {
+        type = types.str;
+        default = "Cascadia Code 11";
+      };
+      wallpaper = mkOption {
+        type = types.str;
+        default = "";
+      };
     };
   };
 }

modules/kabbone/corosync-qdevice.nix

@@ -4,20 +4,18 @@
   pkgs,
   pkgs-kabbone,
   ...
-}:
+}: let
-let
   cfg = config.services.corosync-qnetd;
   dataDir = "/var/run/corosync-qnetd";
-in
+in {
-{
   # interface
   options.services.corosync-qnetd = {
     enable = lib.mkEnableOption "corosync-qnetd";
-    package = lib.mkPackageOption pkgs-kabbone "corosync-qdevice" { };
+    package = lib.mkPackageOption pkgs-kabbone "corosync-qdevice" {};
 
     extraOptions = lib.mkOption {
       type = with lib.types; listOf str;
-      default = [ ];
+      default = [];
       description = "Additional options with which to start corosync-qnetd.";
     };
   };
@@ -26,7 +24,7 @@ in
 
   # implementation
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
+    environment.systemPackages = [cfg.package];
 
     users.users.coroqnetd = {
       isSystemUser = true;
@@ -35,23 +33,22 @@ in
       description = "Corosync-qnetd Service User";
     };
 
-    users.groups.coroqnetd = { };
+    users.groups.coroqnetd = {};
 
-   # environment.etc."corosync/corosync-qnetd.conf".text = ''
+    # environment.etc."corosync/corosync-qnetd.conf".text = ''
-   #   totem {
+    #   totem {
-   #     version: 2
+    #     version: 2
-   #     secauth: on
+    #     secauth: on
-   #     cluster_name: ${cfg.clusterName}
+    #     cluster_name: ${cfg.clusterName}
-   #     transport: knet
+    #     transport: knet
-   #   }
+    #   }
 
+    #   logging {
+    #     to_syslog: yes
+    #   }
+    # '';
 
-   #   logging {
+    systemd.packages = [cfg.package];
-   #     to_syslog: yes
-   #   }
-   # '';
-
-    systemd.packages = [ cfg.package ];
     systemd.services.corosync-qnetd = {
       serviceConfig = {
         User = "coroqnetd";
@@ -60,7 +57,7 @@ in
       };
     };
 
-    environment.etc."sysconfig/corosync-qnetd".text = lib.optionalString (cfg.extraOptions != [ ]) ''
+    environment.etc."sysconfig/corosync-qnetd".text = lib.optionalString (cfg.extraOptions != []) ''
       COROSYNC-QNETD_OPTIONS="${lib.escapeShellArgs cfg.extraOptions}"
     '';
   };

modules/kabbone/mautrix-whatsapp.nix

@@ -3,14 +3,13 @@
   config,
   pkgs,
   ...
-}:
+}: let
-let
   cfg = config.services.kabbone_mautrix-whatsapp;
   dataDir = "/var/lib/mautrix-whatsapp";
   registrationFile = "${dataDir}/whatsapp-registration.yaml";
   settingsFile = "${dataDir}/config.yaml";
   settingsFileUnsubstituted = settingsFormat.generate "mautrix-whatsapp-config-unsubstituted.json" cfg.settings;
-  settingsFormat = pkgs.formats.json { };
+  settingsFormat = pkgs.formats.json {};
   appservicePort = 29318;
 
   # to be used with a list of lib.mkIf values
@@ -47,8 +46,8 @@ let
       username_template = "whatsapp_{{.}}";
     };
     double_puppet = {
-      servers = { };
+      servers = {};
-      secrets = { };
+      secrets = {};
     };
     # By default, the following keys/secrets are set to `generate`. This would break when the service
     # is restarted, since the previously generated configuration will be overwritten everytime.
@@ -66,13 +65,11 @@ let
       };
     };
   };
-
+in {
-in
-{
   options.services.kabbone_mautrix-whatsapp = {
     enable = lib.mkEnableOption "mautrix-whatsapp, a Matrix-Whatsapp puppeting bridge";
 
-    package = lib.mkPackageOption pkgs "mautrix-whatsapp" { };
+    package = lib.mkPackageOption pkgs "mautrix-whatsapp" {};
 
     settings = lib.mkOption {
       apply = lib.recursiveUpdate defaultConfig;
@@ -159,7 +156,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-
     users.users.mautrix-whatsapp = {
       isSystemUser = true;
       group = "mautrix-whatsapp";
@@ -167,19 +163,18 @@ in
       description = "Mautrix-Whatsapp bridge user";
     };
 
-    users.groups.mautrix-whatsapp = { };
+    users.groups.mautrix-whatsapp = {};
 
     services.matrix-synapse = lib.mkIf cfg.registerToSynapse {
-      settings.app_service_config_files = [ registrationFile ];
+      settings.app_service_config_files = [registrationFile];
     };
     systemd.services.matrix-synapse = lib.mkIf cfg.registerToSynapse {
-      serviceConfig.SupplementaryGroups = [ "mautrix-whatsapp" ];
+      serviceConfig.SupplementaryGroups = ["mautrix-whatsapp"];
     };
 
     # Note: this is defined here to avoid the docs depending on `config`
     services.kabbone_mautrix-whatsapp.settings.homeserver = optOneOf (
-      with config.services;
+      with config.services; [
-      [
         (lib.mkIf matrix-synapse.enable (mkDefaults {
           domain = matrix-synapse.settings.server_name;
         }))
@@ -193,11 +188,11 @@ in
     systemd.services.kabbone_mautrix-whatsapp = {
       description = "mautrix-whatsapp, a Matrix-Whatsapp puppeting bridge.";
 
-      wantedBy = [ "multi-user.target" ];
+      wantedBy = ["multi-user.target"];
-      wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
+      wants = ["network-online.target"] ++ cfg.serviceDependencies;
-      after = [ "network-online.target" ] ++ cfg.serviceDependencies;
+      after = ["network-online.target"] ++ cfg.serviceDependencies;
       # ffmpeg is required for conversion of voice messages
-      path = [ pkgs.ffmpeg-headless ];
+      path = [pkgs.ffmpeg-headless];
 
       preStart = ''
         # substitute the settings file by environment variables
@@ -263,11 +258,11 @@ in
         RestrictSUIDSGID = true;
         SystemCallArchitectures = "native";
         SystemCallErrorNumber = "EPERM";
-        SystemCallFilter = [ "@system-service" ];
+        SystemCallFilter = ["@system-service"];
         Type = "simple";
         UMask = 27;
       };
-      restartTriggers = [ settingsFileUnsubstituted ];
+      restartTriggers = [settingsFileUnsubstituted];
     };
   };
   meta = {

modules/programs/alacritty.nix

@@ -1,28 +0,0 @@
-#
-# Terminal Emulator
-#
-
-# Hardcoded as terminal for rofi and doom emacs
-
-{ pkgs, ... }:
-
-{
-
-  home.packages = [ pkgs.alacritty ];
-
-  programs = {
-    alacritty = {
-      enable = true;
-      #settings = {
-      #  env.term = "screen-256color";
-      #  font = rec {                          # Font - Laptop has size manually changed at home.nix
-      #    #normal.family = "FiraCode Nerd Font";
-      #    normal.family = "Cascadia Code";
-      #    #normal.family = "Intel One Mono";
-      #    #bold = { style = "Bold"; };
-#     #    size = 8;
-      #  };
-      #};
-    };
-  };
-}

modules/programs/configs/default.nix

@@ -9,7 +9,6 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
-   ./mpv.nix
+  ./mpv.nix
 ]

modules/programs/configs/mpv.nix

@@ -9,17 +9,14 @@
 #           └─ ./configs
 #               └─ mpv.nix *
 #
-
+{pkgs, ...}: {
-{ pkgs, ... }:
-
-{
   home.file = {
     ".config/mpv/mpv.conf".text = ''
-        hwdec=vaapi
+      hwdec=vaapi
-        vo=gpu
+      vo=gpu
-        hwdec-codecs=all
+      hwdec-codecs=all
-        gpu-context=wayland
+      gpu-context=wayland
-        #profile=gpu-hq
+      #profile=gpu-hq
     '';
   };
 }

modules/programs/default.nix

@@ -1,21 +1,3 @@
-#
-#  Apps
-#
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ home.nix
-#   └─ ./modules
-#       └─ ./apps
-#           └─ default.nix *
-#               └─ ...
-#
-
 [
-#   ./alacritty.nix
+  ./firefox.nix
-#   ./rofi.nix
-   ./firefox.nix
-   #./waybar.nix
-   #./games.nix
 ]
-# Waybar.nix is pulled from modules/wm/..
-# Games.nix is pulled from desktop/default.nix

modules/programs/firefox.nix

@@ -1,167 +1,167 @@
 #
 # Firefox Brower Emulator
 #
-
-
-{ pkgs, ... }:
-
 {
-
+  pkgs,
+  config,
+  ...
+}: {
   #home.packages = [ pkgs.firefox-wayland ];
 
   programs = {
     firefox = {
       enable = true;
+      configPath = "${config.xdg.configHome}/mozilla/firefox";
       #package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
-          #forceWayland = true;
+      #forceWayland = true;
       #    extraPolicies = {
       #        ExtensionSettings =  {};
       #    };
       #};
-#      package = pkgs.firefox-wayland;
+      #      package = pkgs.firefox-wayland;
-#      profiles.kabbone = {
+      #      profiles.kabbone = {
-#          #id = 271987;
+      #          #id = 271987;
-#          name = "kabbone";
+      #          name = "kabbone";
-#          isDefault = true;
+      #          isDefault = true;
-#          settings = {
+      #          settings = {
-#              "media.ffmpeg.vaapi.enabled" = true;
+      #              "media.ffmpeg.vaapi.enabled" = true;
-#              "gfx.webrender.all" = true;
+      #              "gfx.webrender.all" = true;
-#              "browser.contentblocking.category" = "strict";
+      #              "browser.contentblocking.category" = "strict";
-#              "browser.search.region" = "DE";
+      #              "browser.search.region" = "DE";
-#              "extensions.active.ThemeID" = "dreamer-bold-colorway@mozilla.org";
+      #              "extensions.active.ThemeID" = "dreamer-bold-colorway@mozilla.org";
-#              "media.autoplay.default" = 0;
+      #              "media.autoplay.default" = 0;
-#              "security.enterprise_roots.enabled" = true;
+      #              "security.enterprise_roots.enabled" = true;
-#              "widget.gtk.overlay-scrollbars.enabled" = true;
+      #              "widget.gtk.overlay-scrollbars.enabled" = true;
-#              "signon.rememberSignons" = false;
+      #              "signon.rememberSignons" = false;
-#              "extensions.formautofill.creditCards.enabled" = false;
+      #              "extensions.formautofill.creditCards.enabled" = false;
-#              "datareporting.healthreport.uploadEnabled" = false;
+      #              "datareporting.healthreport.uploadEnabled" = false;
-#              "browser.urlbar.placeholderName" = "DuckDuckGo";
+      #              "browser.urlbar.placeholderName" = "DuckDuckGo";
-#              "browser.urlbar.placeholderName.private" = "DuckDuckGo";
+      #              "browser.urlbar.placeholderName.private" = "DuckDuckGo";
-#              "browser.theme.toolbar-theme" = 0;
+      #              "browser.theme.toolbar-theme" = 0;
-#          };
+      #          };
-#
+      #
-#          userChrome = ''
+      #          userChrome = ''
-#            /* Hide tab bar in FF Quantum */
+      #            /* Hide tab bar in FF Quantum */
-#            @-moz-document url("chrome://browser/content/browser.xul") {
+      #            @-moz-document url("chrome://browser/content/browser.xul") {
-#              #TabsToolbar {
+      #              #TabsToolbar {
-#                visibility: collapse !important;
+      #                visibility: collapse !important;
-#                margin-bottom: 21px !important;
+      #                margin-bottom: 21px !important;
-#              }
+      #              }
-#            
+      #
-#              #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
+      #              #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
-#                visibility: collapse !important;
+      #                visibility: collapse !important;
-#              }
+      #              }
-#            }
+      #            }
-#          '';
+      #          '';
-#
+      #
-#          search = {
+      #          search = {
-#            engines = {
+      #            engines = {
-#              "Nix Packages" = {
+      #              "Nix Packages" = {
-#                  urls = [{
+      #                  urls = [{
-#                    template = "https://search.nixos.org/packages";
+      #                    template = "https://search.nixos.org/packages";
-#                    params = [
+      #                    params = [
-#                      { name = "type"; value = "packages"; }
+      #                      { name = "type"; value = "packages"; }
-#                      { name = "query"; value = "{searchTerms}"; }
+      #                      { name = "query"; value = "{searchTerms}"; }
-#                    ];
+      #                    ];
-#                  }];
+      #                  }];
-#              
+      #
-#                  icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+      #                  icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-#                  definedAliases = [ "@np" ];
+      #                  definedAliases = [ "@np" ];
-#                };
+      #                };
-#              
+      #
-#                "NixOS Wiki" = {
+      #                "NixOS Wiki" = {
-#                  urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }];
+      #                  urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }];
-#                  iconUpdateURL = "https://nixos.wiki/favicon.png";
+      #                  iconUpdateURL = "https://nixos.wiki/favicon.png";
-#                  updateInterval = 24 * 60 * 60 * 1000; # every day
+      #                  updateInterval = 24 * 60 * 60 * 1000; # every day
-#                  definedAliases = [ "@nw" ];
+      #                  definedAliases = [ "@nw" ];
-#                };
+      #                };
-#            };
+      #            };
-#
+      #
-#            order = [ "DuckDuckGo" ];
+      #            order = [ "DuckDuckGo" ];
-#            default = "DuckDuckGo";
+      #            default = "DuckDuckGo";
-#          };
+      #          };
-#
+      #
-#          bookmarks = [
+      #          bookmarks = [
-#              {
+      #              {
-#                  name = "Kabtop Nextcloud";
+      #                  name = "Kabtop Nextcloud";
-#                  url = "https://cloud.kabtop.de/";
+      #                  url = "https://cloud.kabtop.de/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Home Assistant";
+      #                  name = "Home Assistant";
-#                  url = "https://hass.home.opel-online.de/";
+      #                  url = "https://hass.home.opel-online.de/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Netflix";
+      #                  name = "Netflix";
-#                  url = "https://netflix.com/browse";
+      #                  url = "https://netflix.com/browse";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "YouTube";
+      #                  name = "YouTube";
-#                  url = "https://youtube.com/";
+      #                  url = "https://youtube.com/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Kicker";
+      #                  name = "Kicker";
-#                  url = "https://kicker.de/";
+      #                  url = "https://kicker.de/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Chilloutzone";
+      #                  name = "Chilloutzone";
-#                  url = "https://chilloutzone.net/";
+      #                  url = "https://chilloutzone.net/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "myDealZ";
+      #                  name = "myDealZ";
-#                  url = "https://mydealz.de/";
+      #                  url = "https://mydealz.de/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Kabtop Git";
+      #                  name = "Kabtop Git";
-#                  url = "https://git.kabtop.de/";
+      #                  url = "https://git.kabtop.de/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Spotify";
+      #                  name = "Spotify";
-#                  url = "https://open.spotify.com/";
+      #                  url = "https://open.spotify.com/";
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Tech";
+      #                  name = "Tech";
-#                  bookmarks = [
+      #                  bookmarks = [
-#                    {
+      #                    {
-#                        name = "Golem";
+      #                        name = "Golem";
-#                        url = "https://golem.de/";
+      #                        url = "https://golem.de/";
-#                    }
+      #                    }
-#                    {
+      #                    {
-#                        name = "Heise";
+      #                        name = "Heise";
-#                        url = "https://heise.de/";
+      #                        url = "https://heise.de/";
-#                    }
+      #                    }
-#                    {
+      #                    {
-#                        name = "Phoronix";
+      #                        name = "Phoronix";
-#                        url = "https://phoronix.com/";
+      #                        url = "https://phoronix.com/";
-#                    }
+      #                    }
-#                  ];
+      #                  ];
-#              }
+      #              }
-#              {
+      #              {
-#                  name = "Foren";
+      #                  name = "Foren";
-#                  bookmarks = [
+      #                  bookmarks = [
-#                    {
+      #                    {
-#                        name = "Archlinux-en";
+      #                        name = "Archlinux-en";
-#                        url = "https://archlinux.org/";
+      #                        url = "https://archlinux.org/";
-#                    }
+      #                    }
-#                    {
+      #                    {
-#                        name = "Archlinux-ARM";
+      #                        name = "Archlinux-ARM";
-#                        url = "https://archlinuxarm.org/";
+      #                        url = "https://archlinuxarm.org/";
-#                    }
+      #                    }
-#                    {
+      #                    {
-#                        name = "Archlinux-de";
+      #                        name = "Archlinux-de";
-#                        url = "https://archlinux.de/";
+      #                        url = "https://archlinux.de/";
-#                    }
+      #                    }
-#                  ];
+      #                  ];
-#              }
+      #              }
-#          ];
+      #          ];
-#        };
+      #        };
-#
+      #
-#      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+      #      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-#        honey
+      #        honey
-#        keepassxc-browser
+      #        keepassxc-browser
-#        multi-account-containers
+      #        multi-account-containers
-#        netflix-1080p
+      #        netflix-1080p
-#        ublock-origin
+      #        ublock-origin
-#      ];
+      #      ];
     };
   };
 }

modules/programs/rofi.nix

@@ -1,119 +0,0 @@
-#
-# System Menu
-#
-
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (config.lib.formats.rasi) mkLiteral;        # Theme.rasi alternative. Add Theme here
-  colors = import ../themes/colors.nix;
-in
-{
-  programs = {
-    rofi = {
-      enable = true;
-      terminal = "${pkgs.alacritty}/bin/alacritty";           # Alacritty is default terminal emulator
-      location = "center";
-      theme =  with colors.scheme.doom; {
-        "*" = {
-          bg0 = mkLiteral "#${bg}";
-          bg1 = mkLiteral "#414868";
-          fg0 = mkLiteral "#${text}";
-          fg1 = mkLiteral "#${text-alt}";
-
-          background-color = mkLiteral "transparent";
-          text-color = mkLiteral "@fg0";
-
-          margin = 0;
-          padding = 0;
-          spacing = 0;
-        };
-
-        "element-icon, element-text, scrollbar" = {
-          cursor = mkLiteral "pointer";
-        };
-
-        "window" = {
-          location = mkLiteral "northwest";
-          width = mkLiteral "280px";
-          x-offset = mkLiteral "8px";
-          y-offset = mkLiteral "24px";
-
-          background-color = mkLiteral "@bg0";
-          border = mkLiteral "1px";
-          border-color = mkLiteral "@bg1";
-          border-radius = mkLiteral "6px";
-        };
-
-        "inputbar" = {
-          spacing = mkLiteral "8px";
-          padding = mkLiteral "4px 8px";
-          children = mkLiteral "[ icon-search, entry ]";
-
-          #background-color = mkLiteral "@bg0";
-          background-color = mkLiteral "@bg0";
-        };
-
-        "icon-search, entry, element-icon, element-text" = {
-          vertical-align = mkLiteral "0.5";
-        };
-
-        "icon-search" = {
-          expand = false;
-          filename = mkLiteral "[ search-symbolic ]";
-          size = mkLiteral "14px";
-        };
-
-        "textbox" = {
-          padding = mkLiteral "4px 8px";
-          background-color = mkLiteral "@bg0";
-        };
-
-        "listview" = {
-          padding = mkLiteral "4px 0px";
-          lines = 12;
-          columns = 1;
-          scrollbar = true;
-          fixed-height = false;
-          dynamic = true;
-        };
-
-        "element" = {
-          padding = mkLiteral "4px 8px";
-          spacing = mkLiteral "8px";
-        };
-
-        "element normal urgent" = {
-          text-color = mkLiteral "@fg1";
-        };
-
-        "element normal active" = {
-          text-color = mkLiteral "@fg1";
-        };
-
-        "element selected" = {
-          text-color = mkLiteral "@bg0"; #1
-          background-color = mkLiteral "@fg1";
-        };
-
-        "element selected urgent" = {
-          background-color = mkLiteral "@fg1";
-        };
-
-        "element-icon" = {
-          size = mkLiteral "0.8em";
-        };
-
-        "element-text" = {
-          text-color = mkLiteral "inherit";
-        };
-
-        "scrollbar" = {
-          handle-width = mkLiteral "4px";
-          handle-color = mkLiteral "@fg1";
-          padding = mkLiteral "0 4px";
-        };
-      };
-    };
-  };
-}

modules/server/default.nix

@@ -0,0 +1,151 @@
+#
+#  Server module — import this instead of configuration_server.nix + manual virtualisation imports.
+#
+#  Usage in hosts/<hostname>/default.nix:
+#
+#    imports = [
+#      ./hardware-configuration.nix
+#      ../../modules/server
+#    ];
+#
+#    myServer.virtualisation.enable = true;
+#    myServer.virtualisation.cpu    = "amd";   # amd | intel | none (default)
+#
+#    myServer.sshPort               = 2220;    # default
+#    myServer.fail2ban.enable       = true;
+#
+#    myServer.extraSystemPackages   = with pkgs; [ some-tool ];
+#
+{
+  config,
+  lib,
+  pkgs,
+  user,
+  ...
+}: let
+  cfg = config.myServer;
+in {
+  # ── Options ──────────────────────────────────────────────────────────────
+
+  options.myServer = with lib; {
+    uid = mkOption {
+      type = types.int;
+      default = 3000;
+      description = "UID for the server user.";
+    };
+
+    sshPort = mkOption {
+      type = types.port;
+      default = 2220;
+      description = "Port openssh listens on.";
+    };
+
+    sudoRequiresPassword = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Whether wheel users must enter a password for sudo.";
+    };
+
+    autoUpgrade.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable automatic NixOS upgrades (inherits flake URL from configuration_common.nix).";
+    };
+
+    virtualisation = {
+      enable = mkEnableOption "container/VM stack (podman with docker-compat, KVM tuning)";
+      cpu = mkOption {
+        type = types.enum ["amd" "intel" "none"];
+        default = "none";
+        description = "CPU type — selects KVM kernel parameters when virtualisation is enabled.";
+      };
+    };
+
+    extraGroups = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = "Additional groups for the server user beyond the defaults.";
+    };
+
+    extraSystemPackages = mkOption {
+      type = types.listOf types.package;
+      default = [];
+      description = "Additional system packages specific to this host.";
+    };
+
+    fail2ban = {
+      enable = mkEnableOption "fail2ban intrusion prevention";
+    };
+  };
+
+  # ── Configuration ────────────────────────────────────────────────────────
+
+  config = lib.mkMerge [
+    # ── Base server config ────────────────────────────────────────────────
+    {
+      users.users.${user} = {
+        isNormalUser = true;
+        uid = cfg.uid;
+        extraGroups = ["wheel" "networkmanager" "kvm" "libvirtd"] ++ cfg.extraGroups;
+      };
+
+      security.sudo.wheelNeedsPassword = cfg.sudoRequiresPassword;
+
+      environment.systemPackages = with pkgs;
+        [
+          ffmpeg
+          smartmontools
+          htop
+        ]
+        ++ cfg.extraSystemPackages;
+
+      services.openssh = {
+        ports = [cfg.sshPort];
+        openFirewall = true;
+      };
+
+      nix.extraOptions = ''
+        keep-outputs          = true
+        keep-derivations      = true
+      '';
+
+      system.autoUpgrade.enable = cfg.autoUpgrade.enable;
+    }
+
+    # ── Virtualisation (podman/docker-compat) ─────────────────────────────
+    (lib.mkIf cfg.virtualisation.enable {
+      virtualisation.podman = {
+        enable = true;
+        autoPrune.enable = true;
+        dockerCompat = true;
+      };
+
+      users.groups.docker.members = [user];
+    })
+
+    # ── KVM – AMD ─────────────────────────────────────────────────────────
+    (lib.mkIf (cfg.virtualisation.enable && cfg.virtualisation.cpu == "amd") {
+      boot.extraModprobeConfig = ''
+        options kvm_amd nested=0 avic=1 npt=1
+      '';
+    })
+
+    # ── KVM – Intel ───────────────────────────────────────────────────────
+    (lib.mkIf (cfg.virtualisation.enable && cfg.virtualisation.cpu == "intel") {
+      boot.extraModprobeConfig = ''
+        options kvm_intel nested=1
+        options kvm_intel emulate_invalid_guest_state=0
+        options kvm ignore_nsrs=1
+      '';
+    })
+
+    # ── Fail2ban ──────────────────────────────────────────────────────────
+    (lib.mkIf cfg.fail2ban.enable {
+      services.fail2ban = {
+        enable = true;
+        maxretry = 5;
+        jails.DEFAULT.settings.findtime = "15m";
+      };
+    })
+  ];
+}

modules/services/default.nix

@@ -1,26 +1,3 @@
-#
-#  Services
-#
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ home.nix
-#   └─ ./modules
-#       └─ ./services
-#           └─ default.nix *
-#               └─ ...
-#
-
 [
-  #./dunst.nix
-  #./flameshot.nix
-  #./picom.nix
-  #./polybar.nix
-  #./sxhkd.nix
-  #./udiskie.nix
-  #./redshift.nix
-  #./kanshi.nix
   ./keyring.nix
 ]
-
-# picom, polybar and sxhkd are pulled from desktop module
-# redshift temporarely disables

modules/services/dmz/default.nix

@@ -9,11 +9,10 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
   ./microvm.nix
-#  ./hydra.nix
+  #  ./hydra.nix
 ]
-
 # picom, polybar and sxhkd are pulled from desktop module
 # redshift temporarely disables
+

modules/services/dmz/gitea_runner.nix

@@ -1,60 +1,63 @@
-{ lib, config, pkgs, ... }:
-
 {
-    virtualisation = {
+  lib,
-      podman ={
+  config,
-        enable = true;
+  pkgs,
-        autoPrune.enable = true;
+  ...
-        dockerCompat = true;
+}: {
-      };
+  virtualisation = {
-      containers.containersConf.settings = {
+    podman = {
-        # podman seems to not work with systemd-resolved
+      enable = true;
-        containers.dns_servers = [ "192.168.101.1" ];
+      autoPrune.enable = true;
-        #containers.dns_servers = [ "8.8.8.8" "8.8.4.4" ];
+      dockerCompat = true;
+    };
+    containers.containersConf.settings = {
+      # podman seems to not work with systemd-resolved
+      containers.dns_servers = ["192.168.101.1"];
+      #containers.dns_servers = [ "8.8.8.8" "8.8.4.4" ];
+    };
+  };
+
+  services.gitea-actions-runner.instances = {
+    homerunner = {
+      enable = true;
+      url = "https://git.kabtop.de";
+      name = "Homerunner";
+      tokenFile = config.age.secrets."services/gitea/homerunner-token".path;
+      labels = [
+        "home"
+        "debian-latest:docker://node:18-bullseye"
+        "ubuntu-latest:docker://node:16-bullseye"
+        "ubuntu-22.04:docker://node:16-bullseye"
+        "ubuntu-20.04:docker://node:16-bullseye"
+        "ubuntu-18.04:docker://node:16-buster"
+        "native:host"
+      ];
+      hostPackages = with pkgs; [
+        bash
+        coreutils
+        curl
+        gawk
+        gitMinimal
+        gnused
+        nodejs
+        wget
+      ];
+      settings = {
+        # container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
+        # the default network that also respects our dns server settings
+        container.network = "host";
+        container.privileged = false;
+        # container.valid_volumes = [
+        #   "/nix"
+        #   "${storeDeps}/bin"
+        #   "${storeDeps}/etc/ssl"
+        # ];
       };
     };
+  };
 
-    services.gitea-actions-runner.instances = {
+  age.secrets."services/gitea/homerunner-token" = {
-        homerunner = {
+    file = ../../../secrets/services/gitea/homerunner-token.age;
-            enable = true;
+    owner = "gitea-runner";
-            url = "https://git.kabtop.de";
+  };
-            name = "Homerunner";
-            tokenFile = config.age.secrets."services/gitea/homerunner-token".path;
-            labels = [ 
-              "home"
-              "debian-latest:docker://node:18-bullseye"
-              "ubuntu-latest:docker://node:16-bullseye"
-              "ubuntu-22.04:docker://node:16-bullseye"
-              "ubuntu-20.04:docker://node:16-bullseye"
-              "ubuntu-18.04:docker://node:16-buster"
-              "native:host"
-            ];
-            hostPackages = with pkgs; [
-              bash
-              coreutils
-              curl
-              gawk
-              gitMinimal
-              gnused
-              nodejs
-              wget
-            ];
-            settings = {
-             # container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
-               # the default network that also respects our dns server settings
-              container.network = "host";
-              container.privileged = false;
-             # container.valid_volumes = [
-             #   "/nix"
-             #   "${storeDeps}/bin"
-             #   "${storeDeps}/etc/ssl"
-             # ];
-            };
-        };
-    };
-
-    age.secrets."services/gitea/homerunner-token" = {
-      file = ../../../secrets/services/gitea/homerunner-token.age;
-      owner = "gitea-runner";
-    };
 }

modules/services/dmz/hydra.nix

@@ -1,91 +1,92 @@
-{ lib, config, pkgs, ... }:
-
 {
-    services = {
+  lib,
-      hydra = {
+  config,
-        enable = true;
+  pkgs,
-        hydraURL = "https://hydra.home.opel-online.de";
+  ...
-        listenHost = "127.0.0.1";
+}: {
-        notificationSender = "hydra@localhost";
+  services = {
-        useSubstitutes = true;
+    hydra = {
-        minimumDiskFree = 30;
+      enable = true;
-      };
+      hydraURL = "https://hydra.home.opel-online.de";
-      nix-serve = {
+      listenHost = "127.0.0.1";
-          enable = true;
+      notificationSender = "hydra@localhost";
-          port = 5001;
+      useSubstitutes = true;
-          bindAddress = "127.0.0.1";
+      minimumDiskFree = 30;
-          secretKeyFile = config.age.secrets."keys/nixsign".path;
-      };
-      nginx = {
-        enable = true;
-        recommendedProxySettings = true;
-        recommendedTlsSettings = true;
-        recommendedGzipSettings = true;
-        recommendedOptimisation = true;
-        virtualHosts = {
-          "home.opel-online.de" = {
-            enableACME = true;
-            forceSSL = true;
-            default = true;
-            locations."/".return = "503";
-          };
-          "hydra.home.opel-online.de" = {
-            useACMEHost = "home.opel-online.de";
-            forceSSL = true;
-            locations."/" = {
-              proxyPass = "http://localhost:3000";
-              extraConfig = ''
-                proxy_set_header X-Forwarded-Port 443;
-              '';
-            };
-          };
-          "cache.home.opel-online.de" = {
-            useACMEHost = "home.opel-online.de";
-            forceSSL = true;
-            locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
-          };
-        };
-      };
     };
-
+    nix-serve = {
-    security.acme = {
+      enable = true;
-      acceptTerms = true;
+      port = 5001;
-      defaults = {
+      bindAddress = "127.0.0.1";
-        email = "webmaster@opel-online.de";
+      secretKeyFile = config.age.secrets."keys/nixsign".path;
-        #server = "https://acme-staging-v02.api.letsencrypt.org/directory";
+    };
-        dnsResolver = "9.9.9.9:53";
+    nginx = {
-      };
+      enable = true;
-      certs = {
+      recommendedProxySettings = true;
+      recommendedTlsSettings = true;
+      recommendedGzipSettings = true;
+      recommendedOptimisation = true;
+      virtualHosts = {
         "home.opel-online.de" = {
-          domain = "*.home.opel-online.de";
+          enableACME = true;
-          dnsProvider = "netcup";
+          forceSSL = true;
-          environmentFile = config.age.secrets."services/acme/opel-online".path;
+          default = true;
-          webroot = null;
+          locations."/".return = "503";
+        };
+        "hydra.home.opel-online.de" = {
+          useACMEHost = "home.opel-online.de";
+          forceSSL = true;
+          locations."/" = {
+            proxyPass = "http://localhost:3000";
+            extraConfig = ''
+              proxy_set_header X-Forwarded-Port 443;
+            '';
+          };
+        };
+        "cache.home.opel-online.de" = {
+          useACMEHost = "home.opel-online.de";
+          forceSSL = true;
+          locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
         };
       };
     };
+  };
 
-    nix = {
+  security.acme = {
-      settings = {
+    acceptTerms = true;
-        trusted-users = [
+    defaults = {
-          "hydra"
+      email = "webmaster@opel-online.de";
-        ];
+      #server = "https://acme-staging-v02.api.letsencrypt.org/directory";
-        allowed-uris = "http:// https://";
+      dnsResolver = "9.9.9.9:53";
+    };
+    certs = {
+      "home.opel-online.de" = {
+        domain = "*.home.opel-online.de";
+        dnsProvider = "netcup";
+        environmentFile = config.age.secrets."services/acme/opel-online".path;
+        webroot = null;
       };
+    };
+  };
 
-      extraOptions = ''
+  nix = {
-        secret-key-files = ${config.age.secrets."keys/nixsign".path}
+    settings = {
-      '';
+      trusted-users = [
-    };
+        "hydra"
-    
+      ];
-    age.secrets."keys/nixsign" = {
+      allowed-uris = "http:// https://";
-      file = ../../../secrets/keys/nixservepriv.age;
-      owner = "hydra";
-    };
-    age.secrets."services/acme/opel-online" = {
-      file = ../../../secrets/services/acme/opel-online.age;
-      owner = "acme";
     };
 
+    extraOptions = ''
+      secret-key-files = ${config.age.secrets."keys/nixsign".path}
+    '';
+  };
 
+  age.secrets."keys/nixsign" = {
+    file = ../../../secrets/keys/nixservepriv.age;
+    owner = "hydra";
+  };
+  age.secrets."services/acme/opel-online" = {
+    file = ../../../secrets/services/acme/opel-online.age;
+    owner = "acme";
+  };
 }

modules/services/dmz/microvm.nix

@@ -1,48 +1,55 @@
-{ config, microvm, lib, pkgs, user, agenix, impermanence, ... }:
-let
-  name = "gitea-runner";
-in
 {
+  config,
+  microvm,
+  lib,
+  pkgs,
+  user,
+  agenix,
+  impermanence,
+  ...
+}: let
+  name = "gitea-runner";
+in {
   microvm = {
     autostart = [
       name
     ];
     vms = {
       ${name} = {
-
         inherit pkgs;
 
         config = {
           imports =
-            [ agenix.nixosModules.default ] ++
+            [agenix.nixosModules.default]
-            [ impermanence.nixosModules.impermanence ] ++
+            ++ [impermanence.nixosModules.impermanence]
-            [( ./gitea_runner.nix )];
+            ++ [(./gitea_runner.nix)];
 
           networking = {
             hostName = "${name}";
 
             firewall = {
               enable = true;
-                allowedUDPPorts = [  ];
+              allowedUDPPorts = [];
-                allowedTCPPorts = [  ];
+              allowedTCPPorts = [];
             };
           };
           systemd.network = {
-              enable = true;
+            enable = true;
-              networks = {
+            networks = {
-                  "10-lan" = {
+              "10-lan" = {
-                      matchConfig.Name = "*";
+                matchConfig.Name = "*";
-                      networkConfig = {
+                networkConfig = {
-                        DHCP = "yes";
+                  DHCP = "yes";
-                        IPv6AcceptRA = true;
+                  IPv6AcceptRA = true;
-                      };
+                };
-                  };
               };
+            };
           };
 
-          users.users.${user} = {                   # System User
+          users.users.${user} = {
+            # System User
             isNormalUser = true;
-            extraGroups = [ "wheel" ];
+            extraGroups = ["wheel"];
             uid = 2000;
             openssh.authorizedKeys.keys = [
               "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIANmaraVJ/o20c4dqVnGLp/wGck9QNHFPvO9jcEbKS29AAAABHNzaDo= kabbone@kabc"
@@ -56,34 +63,37 @@ in
               enable = true;
               settings.PasswordAuthentication = false;
               hostKeys = [
-              {
+                {
                   path = "/persist/etc/ssh/ssh_host_ed25519_key";
                   type = "ed25519";
-              }
+                }
-              {
+                {
                   path = "/persist/etc/ssh/ssh_host_rsa_key";
                   type = "rsa";
                   bits = 4096;
-              }];
+                }
+              ];
             };
           };
 
           fileSystems."/persist".neededForBoot = lib.mkForce true;
 
           environment = {
-            systemPackages = with pkgs; [           # Default packages install system-wide
+            systemPackages = with pkgs; [
-               bash
+              # Default packages install system-wide
-               coreutils
+              bash
-               curl
+              coreutils
-               gawk
+              curl
-               gitMinimal
+              gawk
-               gnused
+              gitMinimal
-               nodejs
+              gnused
-               wget
+              nodejs
+              wget
             ];
             persistence."/persist" = {
               directories = [
                 "/var/log"
+                "/var/lib/nixos"
                 "/var/lib/private"
               ];
 
@@ -95,30 +105,34 @@ in
 
           microvm = {
             hypervisor = "cloud-hypervisor";
+            vsock.cid = 3;
             vcpu = 4;
             mem = 4096;
             interfaces = [
-            {
+              {
-              type = "macvtap";
+                type = "macvtap";
-              id = "vm-${name}";
+                id = "vm-${name}";
-              mac = "04:00:00:00:00:01";
+                mac = "04:00:00:00:00:01";
-              macvtap = {
+                macvtap = {
                   link = "ens18";
                   mode = "bridge";
-              };
+                };
-            } ];
+              }
-             shares = [{
+            ];
-              source = "/nix/store";
+            shares = [
-              mountPoint = "/nix/.ro-store";
+              {
-              tag = "ro-store";
+                source = "/nix/store";
-              proto = "virtiofs";
+                mountPoint = "/nix/.ro-store";
-            }
+                tag = "ro-store";
-            {
+                proto = "virtiofs";
-              source = "/etc/vm-persist/${name}";
+              }
-              mountPoint = "/persist";
+              {
-              tag = "persist";
+                source = "/etc/vm-persist/${name}";
-              proto = "virtiofs";
+                mountPoint = "/persist";
-            }];
+                tag = "persist";
+                proto = "virtiofs";
+              }
+            ];
             #writableStoreOverlay = "/nix/.rw-store";
             #storeOnDisk = true;
           };

modules/services/dunst.nix

@@ -1,76 +0,0 @@
-#
-# System notifications
-#
-
-{ config, lib, pkgs, ... }:
-
-let
-  colors = import ../themes/colors.nix;                 # Import colors theme
-
-  dunst-volume-notification = pkgs.writeShellScriptBin "volume-notify" ''
-    if [ "$(pulsemixer --get-mute)" = "0" ]; then dunstify -u low -r 1 " 🔊 $(pulsemixer --get-volume | awk '{print $1}')%"
-    else dunstify -u low -r 1 "🔈 Muted"; fi
-  '';
-  dunst-brightness-notification = pkgs.writeShellScriptBin "brightness-notify" ''    
-    dunstify -u low -r 1 " $(light -G)%"
-  '';
-in
-{
-  cmds.notifications.volume = "volume-notify";
-  cmds.notifications.brightness = "brightness-notify";
-
-  home.packages = [
-    dunst-volume-notification
-    dunst-brightness-notification
-    pkgs.libnotify
-  ];
-
-  services.dunst = {
-    enable = true;
-    settings = {
-      global = {
-        monitor = 0;
-        follow = "keyboard";
-        indicate_hidden = "yes";
-        shrink = true;
-        transparency = 0;
-        origin = "top-center";
-        offset = "0x20";
-        seperator_height = 0;
-        padding = 12;
-        horizontal_padding = 20;
-        frame_width = 4;
-        seperator_color = "auto";
-        font = "${config.theme.font}";
-        markup = "full";
-        format = "<span foreground='#b3cfa7'><b>%s</b>%p</span>\n%b";
-        alignment = "center";
-        show_age_threshold = 60;
-        word_wrap = "yes";
-        ellipsize = "middle";
-        ignore_newline = "no";
-        stack_duplicates = true;
-        hide_duplicate_count = true;
-        show_indicators = "yes";
-        icon_position = "off";
-        sticky_history = "yes";
-        history_length = 20;
-        always_run_script = true;
-        browser = "/usr/bin/xdg-open";
-        corner_radius = 12;
-        force_xinerama = false;
-        mouse_left_click = "close_current";
-        mouse_middle_click = "do_action";
-        mouse_right_click = "close_all";
-        progress_bar_min_width = "200";
-        enable_recursive_icon_lookup = true;
-      };
-
-      urgency_low.timeout = 4;
-      urgency_normal.timeout = 8;
-      urgency_critical.timeout = 0;
-    };
-
-  };
-  xdg.dataFile."dbus-1/services/org.knopwob.dunst.service".source = "${pkgs.dunst}/share/dbus-1/services/org.knopwob.dunst.service";
-}

modules/services/flameshot.nix

@@ -1,22 +0,0 @@
-#
-# Screenshots
-#
-
-{ pkgs, user, ... }:
-
-{
-  services = {                                    # sxhkd shortcut = Printscreen button (Print)
-    flameshot = {
-      enable = true;
-      settings = {
-        General = {                               # Settings
-          savePath = "/home/${user}/";
-          saveAsFileExtension = ".png";
-          uiColor = "#2d0096";
-          showHelp = "false";
-          disabledTrayIcon = "true";              # Hide from systray
-        };
-      };
-    };
-  };
-}

modules/services/kabtopci/default.nix

@@ -9,11 +9,10 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
-#  ./microvm.nix
+  #  ./microvm.nix
   ./hydra.nix
 ]
-
 # picom, polybar and sxhkd are pulled from desktop module
 # redshift temporarely disables
+

modules/services/kabtopci/gitea_runner.nix

@@ -1,59 +1,62 @@
-{ lib, config, pkgs, ... }:
-
 {
-    virtualisation = {
+  lib,
-      podman ={
+  config,
-        enable = true;
+  pkgs,
-        autoPrune.enable = true;
+  ...
-        dockerCompat = true;
+}: {
-      };
+  virtualisation = {
-      containers.containersConf.settings = {
+    podman = {
-        # podman seems to not work with systemd-resolved
+      enable = true;
-        containers.dns_servers = [ "8.8.8.8" "8.8.4.4" ];
+      autoPrune.enable = true;
+      dockerCompat = true;
+    };
+    containers.containersConf.settings = {
+      # podman seems to not work with systemd-resolved
+      containers.dns_servers = ["8.8.8.8" "8.8.4.4"];
+    };
+  };
+
+  services.gitea-actions-runner.instances = {
+    cirunner = {
+      enable = true;
+      url = "https://git.kabtop.de";
+      name = "CI Kabtop runner";
+      tokenFile = config.age.secrets."services/gitea/cirunner-token".path;
+      labels = [
+        "ci"
+        "debian-latest:docker://node:18-bullseye"
+        "ubuntu-latest:docker://node:16-bullseye"
+        "ubuntu-22.04:docker://node:16-bullseye"
+        "ubuntu-20.04:docker://node:16-bullseye"
+        "ubuntu-18.04:docker://node:16-buster"
+        "native:host"
+      ];
+      hostPackages = with pkgs; [
+        bash
+        coreutils
+        curl
+        gawk
+        gitMinimal
+        gnused
+        nodejs
+        wget
+      ];
+      settings = {
+        # container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
+        # the default network that also respects our dns server settings
+        container.network = "host";
+        container.privileged = false;
+        # container.valid_volumes = [
+        #   "/nix"
+        #   "${storeDeps}/bin"
+        #   "${storeDeps}/etc/ssl"
+        # ];
       };
     };
+  };
 
-    services.gitea-actions-runner.instances = {
+  age.secrets."services/gitea/cirunner-token" = {
-        cirunner = {
+    file = ../../../secrets/services/gitea/cirunner-token.age;
-            enable = true;
+    owner = "gitea-runner";
-            url = "https://git.kabtop.de";
+  };
-            name = "CI Kabtop runner";
-            tokenFile = config.age.secrets."services/gitea/cirunner-token".path;
-            labels = [ 
-              "ci"
-              "debian-latest:docker://node:18-bullseye"
-              "ubuntu-latest:docker://node:16-bullseye"
-              "ubuntu-22.04:docker://node:16-bullseye"
-              "ubuntu-20.04:docker://node:16-bullseye"
-              "ubuntu-18.04:docker://node:16-buster"
-              "native:host"
-            ];
-            hostPackages = with pkgs; [
-              bash
-              coreutils
-              curl
-              gawk
-              gitMinimal
-              gnused
-              nodejs
-              wget
-            ];
-            settings = {
-             # container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
-               # the default network that also respects our dns server settings
-              container.network = "host";
-              container.privileged = false;
-             # container.valid_volumes = [
-             #   "/nix"
-             #   "${storeDeps}/bin"
-             #   "${storeDeps}/etc/ssl"
-             # ];
-            };
-        };
-    };
-
-    age.secrets."services/gitea/cirunner-token" = {
-      file = ../../../secrets/services/gitea/cirunner-token.age;
-      owner = "gitea-runner";
-    };
 }

modules/services/kabtopci/hydra.nix

@@ -1,82 +1,84 @@
-{ lib, config, pkgs, ... }:
-
 {
-    services = {
+  lib,
-      hydra = {
+  config,
-        enable = true;
+  pkgs,
-        hydraURL = "https://hydra.ci.kabtop.de";
+  ...
-        listenHost = "127.0.0.1";
+}: {
-        notificationSender = "hydra@kabtop.de";
+  services = {
-        useSubstitutes = true;
+    hydra = {
-        minimumDiskFree = 8;
+      enable = true;
-      };
+      hydraURL = "https://hydra.ci.kabtop.de";
-      nix-serve = {
+      listenHost = "127.0.0.1";
-          enable = true;
+      notificationSender = "hydra@kabtop.de";
-          port = 5001;
+      useSubstitutes = true;
-          bindAddress = "127.0.0.1";
+      minimumDiskFree = 8;
-          secretKeyFile = config.age.secrets."keys/nixsign".path;
+    };
-      };
+    nix-serve = {
-      nginx = {
+      enable = true;
-        enable = true;
+      port = 5001;
-        recommendedProxySettings = true;
+      bindAddress = "127.0.0.1";
-        recommendedTlsSettings = true;
+      secretKeyFile = config.age.secrets."keys/nixsign".path;
-        recommendedGzipSettings = true;
+    };
-        recommendedOptimisation = true;
+    nginx = {
-        virtualHosts = {
+      enable = true;
-          "ci.kabtop.de" = {
+      recommendedProxySettings = true;
-            enableACME = true;
+      recommendedTlsSettings = true;
-            forceSSL = true;
+      recommendedGzipSettings = true;
-            default = true;
+      recommendedOptimisation = true;
-            locations."/".return = "503";
+      virtualHosts = {
-          };
+        "ci.kabtop.de" = {
-          "hydra.ci.kabtop.de" = {
+          enableACME = true;
-            enableACME = true;
+          forceSSL = true;
-            forceSSL = true;
+          default = true;
-            locations."/" = {
+          locations."/".return = "503";
-              proxyPass = "http://localhost:3000";
+        };
-              extraConfig = ''
+        "hydra.ci.kabtop.de" = {
-                proxy_set_header X-Forwarded-Port 443;
+          enableACME = true;
-              '';
+          forceSSL = true;
-            };
+          locations."/" = {
-          };
+            proxyPass = "http://localhost:3000";
-          "cache.ci.kabtop.de" = {
+            extraConfig = ''
-            enableACME = true;
+              proxy_set_header X-Forwarded-Port 443;
-            forceSSL = true;
+            '';
-            locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
           };
         };
+        "cache.ci.kabtop.de" = {
+          enableACME = true;
+          forceSSL = true;
+          locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+        };
       };
     };
+  };
 
-    security.acme = {
+  security.acme = {
-      acceptTerms = true;
+    acceptTerms = true;
-      defaults = {
+    defaults = {
-        email = "webmaster@kabtop.de";
+      email = "webmaster@kabtop.de";
-        webroot = "/var/lib/acme/acme-challenge";
+      webroot = "/var/lib/acme/acme-challenge";
-        #server = "https://acme-staging-v02.api.letsencrypt.org/directory";
+      #server = "https://acme-staging-v02.api.letsencrypt.org/directory";
-      };
+    };
+  };
+
+  nix = {
+    settings = {
+      trusted-users = [
+        "hydra"
+      ];
+      allowed-uris = [
+        "github:"
+        "https://github.com/"
+        "git+ssh://github.com/"
+      ];
     };
 
-    nix = {
+    extraOptions = ''
-      settings = {
+      secret-key-files = ${config.age.secrets."keys/nixsign".path}
-        trusted-users = [
+    '';
-          "hydra"
+  };
-        ];
-        allowed-uris = [
-	  "github:"
-	  "https://github.com/"
-  	  "git+ssh://github.com/"
-  	];
-      };
-
-      extraOptions = ''
-        secret-key-files = ${config.age.secrets."keys/nixsign".path}
-      '';
-    };
-    
-    age.secrets."keys/nixsign" = {
-      file = ../../../secrets/keys/nixservepriv.age;
-      owner = "hydra";
-    };
 
+  age.secrets."keys/nixsign" = {
+    file = ../../../secrets/keys/nixservepriv.age;
+    owner = "hydra";
+  };
 }

modules/services/kabtopci/microvm.nix

@@ -1,48 +1,55 @@
-{ config, microvm, lib, pkgs, user, agenix, impermanence, ... }:
-let
-  name = "gitea-runner";
-in
 {
+  config,
+  microvm,
+  lib,
+  pkgs,
+  user,
+  agenix,
+  impermanence,
+  ...
+}: let
+  name = "gitea-runner";
+in {
   microvm = {
     autostart = [
       name
     ];
     vms = {
       ${name} = {
-
         inherit pkgs;
 
         config = {
           imports =
-            [ agenix.nixosModules.default ] ++
+            [agenix.nixosModules.default]
-            [ impermanence.nixosModules.impermanence ] ++
+            ++ [impermanence.nixosModules.impermanence]
-            [( ./gitea_runner.nix )];
+            ++ [(./gitea_runner.nix)];
 
           networking = {
             hostName = "${name}";
 
             firewall = {
               enable = true;
-                allowedUDPPorts = [  ];
+              allowedUDPPorts = [];
-                allowedTCPPorts = [  ];
+              allowedTCPPorts = [];
             };
           };
           systemd.network = {
-              enable = true;
+            enable = true;
-              networks = {
+            networks = {
-                  "10-lan" = {
+              "10-lan" = {
-                      matchConfig.Name = "*";
+                matchConfig.Name = "*";
-                      networkConfig = {
+                networkConfig = {
-                        DHCP = "yes";
+                  DHCP = "yes";
-                        IPv6AcceptRA = true;
+                  IPv6AcceptRA = true;
-                      };
+                };
-                  };
               };
+            };
           };
 
-          users.users.${user} = {                   # System User
+          users.users.${user} = {
+            # System User
             isNormalUser = true;
-            extraGroups = [ "wheel" ];
+            extraGroups = ["wheel"];
             uid = 2000;
             openssh.authorizedKeys.keys = [
               "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIANmaraVJ/o20c4dqVnGLp/wGck9QNHFPvO9jcEbKS29AAAABHNzaDo= kabbone@kabc"
@@ -56,34 +63,37 @@ in
               enable = true;
               settings.PasswordAuthentication = false;
               hostKeys = [
-              {
+                {
                   path = "/persist/etc/ssh/ssh_host_ed25519_key";
                   type = "ed25519";
-              }
+                }
-              {
+                {
                   path = "/persist/etc/ssh/ssh_host_rsa_key";
                   type = "rsa";
                   bits = 4096;
-              }];
+                }
+              ];
             };
           };
 
           fileSystems."/persist".neededForBoot = lib.mkForce true;
 
           environment = {
-            systemPackages = with pkgs; [           # Default packages install system-wide
+            systemPackages = with pkgs; [
-               bash
+              # Default packages install system-wide
-               coreutils
+              bash
-               curl
+              coreutils
-               gawk
+              curl
-               gitMinimal
+              gawk
-               gnused
+              gitMinimal
-               nodejs
+              gnused
-               wget
+              nodejs
+              wget
             ];
             persistence."/persist" = {
               directories = [
                 "/var/log"
+                "/var/lib/nixos"
                 "/var/lib/private"
               ];
 
@@ -99,23 +109,26 @@ in
             mem = 3096;
             #kernel = pkgs.linuxKernel.packages.linux_latest;
             interfaces = [
-            {
+              {
-              type = "user";
+                type = "user";
-              id = "vm-${name}";
+                id = "vm-${name}";
-              mac = "04:00:00:00:00:02";
+                mac = "04:00:00:00:00:02";
-            } ];
+              }
-             shares = [{
+            ];
-              source = "/nix/store";
+            shares = [
-              mountPoint = "/nix/.ro-store";
+              {
-              tag = "ro-store";
+                source = "/nix/store";
-              proto = "virtiofs";
+                mountPoint = "/nix/.ro-store";
-            }
+                tag = "ro-store";
-            {
+                proto = "virtiofs";
-              source = "/etc/vm-persist/${name}";
+              }
-              mountPoint = "/persist";
+              {
-              tag = "persist";
+                source = "/etc/vm-persist/${name}";
-              proto = "virtiofs";
+                mountPoint = "/persist";
-            }];
+                tag = "persist";
+                proto = "virtiofs";
+              }
+            ];
             #writableStoreOverlay = "/nix/.rw-store";
             #storeOnDisk = true;
           };

modules/services/kanshi.nix

@@ -1,40 +0,0 @@
-#
-# System notifications
-#
-
-{ config, lib, pkgs, ... }:
-
-{
-    services.kanshi = {
-        enable = true;
-        settings = [
-            {
-	      profile = {
-	        name = "undocked";
-                outputs = [
-                    { criteria = "eDP-1"; status = "enable"; mode = "1920x1080"; position = "0,0"; }
-                ];
-	      };
-            }
-	    {
-	      profile = {
-	        name = "docked_c";
-                outputs = [
-                    { criteria = "eDP-1"; status = "enable"; mode = "1920x1080"; position = "0,0"; scale = 1.5; }
-                    { criteria = "DP-1"; status = "enable"; mode = "2560x1080"; position = "1920,0"; }
-                ];
-	      };
-            }
-	    {
-	      profile = {
-	        name = "docked_triple";
-                outputs = [
-                    { criteria = "eDP-1"; status = "disable"; mode = "1920x1080"; position = "4480,0"; }
-                    { criteria = "HDMI-A-1"; status = "enable"; mode = "1920x1080"; position = "0,0"; }
-                    { criteria = "DP-1"; status = "enable"; mode = "2560x1080"; position = "1920,0"; }
-                ];
-	      };
-            }
-        ];
-    };
-}

modules/services/keyring.nix

@@ -1,14 +1,16 @@
 #
 # Screenshots
 #
-
-{ pkgs, user, ... }:
-
 {
-  services = {                                    # sxhkd shortcut = Printscreen button (Print)
+  pkgs,
+  user,
+  ...
+}: {
+  services = {
+    # sxhkd shortcut = Printscreen button (Print)
     gnome-keyring = {
       enable = true;
     };
   };
-  home.packages = with pkgs; [ gcr seahorse ];
+  home.packages = with pkgs; [gcr seahorse];
 }

modules/services/kubemaster/default.nix

@@ -9,11 +9,10 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
-#  ./microvm.nix
+  #  ./microvm.nix
-#  ./hydra.nix
+  #  ./hydra.nix
 ]
-
 # picom, polybar and sxhkd are pulled from desktop module
 # redshift temporarely disables
+

modules/services/nas/default.nix

@@ -9,7 +9,6 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
   ./nfs.nix
   ./nginx.nix
@@ -17,6 +16,6 @@
   ./syncthing.nix
   ./paperless.nix
 ]
-
 # picom, polybar and sxhkd are pulled from desktop module
 # redshift temporarely disables
+

modules/services/nas/nfs.nix

@@ -1,18 +1,23 @@
-{config, pkgs, lib, ...}: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   # enable nfs
   services.nfs.server = rec {
-      enable = true;
+    enable = true;
-      exports = ''
+    exports = ''
-          /export         192.168.2.0/24(rw,fsid=0,no_subtree_check)
+      /export         192.168.2.0/24(rw,fsid=0,no_subtree_check)
-          /export/Pluto   192.168.2.0/24(rw,no_subtree_check)
+      /export/Pluto   192.168.2.0/24(rw,no_subtree_check)
-          /export/Mars    192.168.2.0/24(rw,no_subtree_check)
+      /export/Mars    192.168.2.0/24(rw,no_subtree_check)
-      '';
+    '';
-      createMountPoints = true;
+    createMountPoints = true;
   };
   # open the firewall
   networking.firewall = {
     interfaces.ens18 = {
-      allowedTCPPorts = [ 2049 ];
+      allowedTCPPorts = [2049];
     };
   };
 }

modules/services/nas/nginx.nix

@@ -1,16 +1,28 @@
 #
 # System notifications
 #
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   services.nginx = {
     enable = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
+
+    appendHttpConfig = ''
+      proxy_cache_path /mnt/Pluto/nix-cache
+        levels=1:2
+        keys_zone=nix_cache:10m
+        max_size=100g
+        inactive=14d
+        use_temp_path=off;
+    '';
+
     virtualHosts = {
       "home.opel-online.de" = {
         enableACME = true;
@@ -18,15 +30,40 @@
         default = true;
         locations."/".return = "503";
       };
+      "cache.home.opel-online.de" = {
+        useACMEHost = "home.opel-online.de";
+        forceSSL = true;
+        locations."/" = {
+          extraConfig = ''
+            proxy_pass              https://cache.ci.kabtop.de;
+            proxy_ssl_server_name   on;
+            proxy_http_version      1.1;
+            proxy_set_header        Connection "";
+            proxy_set_header        Host cache.ci.kabtop.de;
+
+            proxy_cache             nix_cache;
+            proxy_cache_valid       200 14d;
+            proxy_cache_valid       404 1m;
+            proxy_cache_use_stale   error timeout updating;
+            proxy_cache_lock        on;
+            proxy_cache_lock_timeout 1h;
+            add_header              X-Cache-Status $upstream_cache_status;
+
+            proxy_buffering         on;
+            proxy_buffer_size       128k;
+            proxy_buffers           8 1m;
+            proxy_max_temp_file_size 0;
+          '';
+        };
+      };
     };
   };
 
-
   security.acme = {
     acceptTerms = true;
     defaults = {
       email = "webmaster@opel-online.de";
-#      server = "https://acme-staging-v02.api.letsencrypt.org/directory";
+      #      server = "https://acme-staging-v02.api.letsencrypt.org/directory";
       dnsResolver = "9.9.9.9:53";
     };
     certs = {
@@ -39,15 +76,16 @@
     };
   };
 
+  systemd.services.nginx.serviceConfig.ReadWritePaths = ["/mnt/Pluto/nix-cache"];
+
   networking.firewall = {
     enable = true;
-    allowedUDPPorts = [  ];
+    allowedUDPPorts = [];
-    allowedTCPPorts = [ 80 443 ];
+    allowedTCPPorts = [80 443];
   };
 
   age.secrets."services/acme/opel-online" = {
     file = ../../../secrets/services/acme/opel-online.age;
     owner = "acme";
   };
-
 }

modules/services/nas/paperless.nix

@@ -1,15 +1,17 @@
 #
 # System notifications
 #
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   services.paperless = {
     enable = true;
     domain = "paperless.home.opel-online.de";
     passwordFile = config.age.secrets."services/paperless/pwFile".path;
-#    environmentFile = config.age.secrets."services/paperless/environment".path;
+    #    environmentFile = config.age.secrets."services/paperless/environment".path;
     configureTika = true;
     settings = {
       PAPERLESS_OCR_LANGUAGE = "deu+eng";
@@ -31,8 +33,7 @@
   };
 
   age.secrets."services/paperless/pwFile" = {
-      file = ../../../secrets/services/paperless/pwFile.age;
+    file = ../../../secrets/services/paperless/pwFile.age;
-      owner = "paperless";
+    owner = "paperless";
   };
-
 }

modules/services/nas/syncthing.nix

@@ -1,29 +1,32 @@
 #
 # System notifications
 #
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   services.syncthing = {
     enable = true;
     group = "users";
     user = "kabbone";
     dataDir = "/home/${config.services.syncthing.user}/Sync";
     configDir = "/home/${config.services.syncthing.user}/.config/syncthing";
-    overrideDevices = true;     # overrides any devices added or deleted through the WebUI
+    overrideDevices = true; # overrides any devices added or deleted through the WebUI
-    overrideFolders = true;     # overrides any folders added or deleted through the WebUI
+    overrideFolders = true; # overrides any folders added or deleted through the WebUI
     openDefaultPorts = true;
     settings = {
       devices = {
-        "hades.home.opel-online.de" = { id = "3VPCBVW-RH7XKFM-TWJGQHC-ZRAQ575-CQKGGKP-NAB4VXE-KCKJFUT-AMCUQQA"; };
+        "hades.home.opel-online.de" = {id = "3VPCBVW-RH7XKFM-TWJGQHC-ZRAQ575-CQKGGKP-NAB4VXE-KCKJFUT-AMCUQQA";};
-        "lifebook.home.opel-online.de" = { id = "RKPZG3H-BDUZID3-DV26MKR-UOARIQC-JBCAFXP-J5QFM4H-5EGBSM5-VEGXHQ4"; };
+        "lifebook.home.opel-online.de" = {id = "RKPZG3H-BDUZID3-DV26MKR-UOARIQC-JBCAFXP-J5QFM4H-5EGBSM5-VEGXHQ4";};
       };
       folders = {
-        "Sync" = {         # Name of folder in Syncthing, also the folder ID
+        "Sync" = {
-          path = "/mnt/Mars/${config.services.syncthing.user}/Sync";    # Which folder to add to Syncthing
+          # Name of folder in Syncthing, also the folder ID
-          devices = [ "hades.home.opel-online.de" "lifebook.home.opel-online.de" ];      # Which devices to share the folder with
+          path = "/mnt/Mars/${config.services.syncthing.user}/Sync"; # Which folder to add to Syncthing
-          ignorePerms = false;  # By default, Syncthing doesn't sync file permissions. This line enables it for this folder.
+          devices = ["hades.home.opel-online.de" "lifebook.home.opel-online.de"]; # Which devices to share the folder with
+          ignorePerms = false; # By default, Syncthing doesn't sync file permissions. This line enables it for this folder.
         };
       };
     };
@@ -35,19 +38,18 @@
         useACMEHost = "home.opel-online.de";
         forceSSL = true;
         locations."/" = {
-	  recommendedProxySettings = false;
+          recommendedProxySettings = false;
-	  proxyPass = "http://${toString config.services.syncthing.guiAddress}";
+          proxyPass = "http://${toString config.services.syncthing.guiAddress}";
           extraConfig = ''
-          proxy_set_header        Host localhost;
+            proxy_set_header        Host localhost;
-          proxy_set_header        X-Real-IP $remote_addr;
+            proxy_set_header        X-Real-IP $remote_addr;
-          proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header        X-Forwarded-Proto $scheme;
+            proxy_set_header        X-Forwarded-Proto $scheme;
-          proxy_set_header        X-Forwarded-Host $host;
+            proxy_set_header        X-Forwarded-Host $host;
-          proxy_set_header        X-Forwarded-Server $host;
+            proxy_set_header        X-Forwarded-Server $host;
           '';
         };
       };
     };
   };
-
 }

modules/services/nas/vaultwarden.nix

@@ -1,10 +1,12 @@
 #
 # System notifications
 #
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   services.vaultwarden = {
     enable = true;
     dbBackend = "sqlite";
@@ -31,8 +33,7 @@
   };
 
   age.secrets."services/vaultwarden/environment" = {
-      file = ../../../secrets/services/vaultwarden/environment.age;
+    file = ../../../secrets/services/vaultwarden/environment.age;
-      owner = "vaultwarden";
+    owner = "vaultwarden";
   };
-
 }

modules/services/nasbackup/default.nix

@@ -9,10 +9,9 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
-#  ./nfs.nix
+  #  ./nfs.nix
 ]
-
 # picom, polybar and sxhkd are pulled from desktop module
 # redshift temporarely disables
+

modules/services/printer/default.nix

@@ -9,10 +9,9 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
   ./klipper.nix
 ]
-
 # picom, polybar and sxhkd are pulled from desktop module
 # redshift temporarely disables
+

modules/services/printer/klipper.nix

@@ -1,101 +1,103 @@
-{ lib, config, pkgs, ... }:
-
 {
-    environment = {
+  lib,
-      systemPackages = with pkgs; [
+  config,
-         klipperscreen
+  pkgs,
-      ];
+  ...
+}: {
+  environment = {
+    systemPackages = with pkgs; [
+      klipperscreen
+    ];
+  };
+
+  services = {
+    klipper = {
+      enable = true;
+      user = "moonraker";
+      group = "moonraker";
+      configFile = ./printer.cfg;
+      mutableConfig = true;
+      configDir = "/var/lib/moonraker/config";
+      firmwares."sovol06" = {
+        serial = "/dev/serial/by-id/usb-1a86_USB_Serial-if00-port0";
+        enableKlipperFlash = true;
+        enable = true;
+        configFile = ./firmware.conf;
+      };
     };
 
-    services = {
+    mainsail = {
-      klipper = {
+      enable = true;
-        enable = true;
+      nginx = {
-	user = "moonraker";
+        enableACME = false;
-	group = "moonraker";
+        #useACMEHost = "home.opel-online.de";
-	configFile = ./printer.cfg;
+        serverName = "nbf5.home.opel-online.de";
-	mutableConfig = true;
+        #onlySSL = true;
-	configDir = "/var/lib/moonraker/config";
+        #listenAddresses = [ "0.0.0.0" "::" ];
-	firmwares."sovol06" = {
+        #forceSSL = true;
-	  serial = "/dev/serial/by-id/usb-1a86_USB_Serial-if00-port0";
-	  enableKlipperFlash = true;
-	  enable = true;
-	  configFile = ./firmware.conf;
-	};
       };
-
-      mainsail = {
-        enable = true;
-	nginx = {
-	  enableACME = false;
-	  #useACMEHost = "home.opel-online.de";
-	  serverName = "nbf5.home.opel-online.de";
-	  #onlySSL = true;
-	  #listenAddresses = [ "0.0.0.0" "::" ];
-	  #forceSSL = true;
-        };
-      };
-
-      moonraker = {
-        enable = true;
-	allowSystemControl = true;
-        address = "0.0.0.0";
-        settings = {
-          authorization = {
-            force_logins = true;
-            cors_domains = [
-              "*://nbf5.home.opel-online.de"
-              "*.local"
-            ];
-            trusted_clients = [
-              "127.0.0.0/8"
-              "192.168.2.0/24"
-            ];
-          };
-	  file_manager = {
-	    enable_object_processing = true;
-	  };
-        };
-      };
-
-#      nginx = {
-#        enable = true;
-#        recommendedProxySettings = true;
-#        recommendedTlsSettings = true;
-#        recommendedGzipSettings = true;
-#        recommendedOptimisation = true;
-#        virtualHosts = {
-#          "ci.kabtop.de" = {
-#            enableACME = true;
-#            forceSSL = true;
-#            default = true;
-#            locations."/".return = "503";
-#          };
-#          "hydra.ci.kabtop.de" = {
-#            enableACME = true;
-#            forceSSL = true;
-#            locations."/" = {
-#              proxyPass = "http://localhost:3000";
-#              extraConfig = ''
-#                proxy_set_header X-Forwarded-Port 443;
-#              '';
-#            };
-#          };
-#          "cache.ci.kabtop.de" = {
-#            enableACME = true;
-#            forceSSL = true;
-#            locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
-#          };
-#        };
-#      };
-#    };
-#
-#    security.acme = {
-#      acceptTerms = true;
-#      defaults = {
-#        email = "webmaster@kabtop.de";
-#        webroot = "/var/lib/acme/acme-challenge";
-#        #server = "https://acme-staging-v02.api.letsencrypt.org/directory";
-#      };
     };
 
+    moonraker = {
+      enable = true;
+      allowSystemControl = true;
+      address = "0.0.0.0";
+      settings = {
+        authorization = {
+          force_logins = true;
+          cors_domains = [
+            "*://nbf5.home.opel-online.de"
+            "*.local"
+          ];
+          trusted_clients = [
+            "127.0.0.0/8"
+            "192.168.2.0/24"
+          ];
+        };
+        file_manager = {
+          enable_object_processing = true;
+        };
+      };
+    };
+
+    #      nginx = {
+    #        enable = true;
+    #        recommendedProxySettings = true;
+    #        recommendedTlsSettings = true;
+    #        recommendedGzipSettings = true;
+    #        recommendedOptimisation = true;
+    #        virtualHosts = {
+    #          "ci.kabtop.de" = {
+    #            enableACME = true;
+    #            forceSSL = true;
+    #            default = true;
+    #            locations."/".return = "503";
+    #          };
+    #          "hydra.ci.kabtop.de" = {
+    #            enableACME = true;
+    #            forceSSL = true;
+    #            locations."/" = {
+    #              proxyPass = "http://localhost:3000";
+    #              extraConfig = ''
+    #                proxy_set_header X-Forwarded-Port 443;
+    #              '';
+    #            };
+    #          };
+    #          "cache.ci.kabtop.de" = {
+    #            enableACME = true;
+    #            forceSSL = true;
+    #            locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+    #          };
+    #        };
+    #      };
+    #    };
+    #
+    #    security.acme = {
+    #      acceptTerms = true;
+    #      defaults = {
+    #        email = "webmaster@kabtop.de";
+    #        webroot = "/var/lib/acme/acme-challenge";
+    #        #server = "https://acme-staging-v02.api.letsencrypt.org/directory";
+    #      };
+  };
 }

modules/services/printer/nginx.nix

@@ -1,10 +1,12 @@
 #
 # System notifications
 #
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   services.nginx = {
     enable = true;
     recommendedProxySettings = true;
@@ -21,12 +23,11 @@
     };
   };
 
-
   security.acme = {
     acceptTerms = true;
     defaults = {
       email = "webmaster@opel-online.de";
-#      server = "https://acme-staging-v02.api.letsencrypt.org/directory";
+      #      server = "https://acme-staging-v02.api.letsencrypt.org/directory";
       dnsResolver = "9.9.9.9:53";
     };
     certs = {
@@ -41,13 +42,12 @@
 
   networking.firewall = {
     enable = true;
-    allowedUDPPorts = [  ];
+    allowedUDPPorts = [];
-    allowedTCPPorts = [ 80 443 ];
+    allowedTCPPorts = [80 443];
   };
 
   age.secrets."services/acme/opel-online" = {
     file = ../../../secrets/services/acme/opel-online.age;
     owner = "acme";
   };
-
 }

modules/services/server/coturn.nix

@@ -1,10 +1,14 @@
-{config, pkgs, lib, ...}: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   # enable coturn
   services.coturn = rec {
     enable = true;
     no-cli = true;
     no-tcp-relay = true;
-    no-tls = true;
     min-port = 49000;
     max-port = 50000;
     use-auth-secret = true;
@@ -44,21 +48,24 @@
   # open the firewall
   networking.firewall = {
     interfaces.ens18 = let
-      range = with config.services.coturn; [ {
+      range = with config.services.coturn; [
-      from = min-port;
+        {
-      to = max-port;
+          from = min-port;
-    } ];
+          to = max-port;
-    in
+        }
-    {
+      ];
+    in {
       allowedUDPPortRanges = range;
-      allowedUDPPorts = [ 3478 ];
+      allowedUDPPorts = [3478];
       allowedTCPPortRanges = range;
-      allowedTCPPorts = [ 3478 ];
+      allowedTCPPorts = [3478 5349];
     };
   };
   # get a certificate
   security.acme.certs.${config.services.coturn.realm} = {
-    /* insert here the right configuration to obtain a certificate */
+    /*
+    insert here the right configuration to obtain a certificate
+    */
     postRun = "systemctl restart coturn.service";
     group = "turnserver";
   };
@@ -68,7 +75,7 @@
   #};
 
   age.secrets."services/coturn/static-auth" = {
-      file = ../../../secrets/services/coturn/static-auth.age;
+    file = ../../../secrets/services/coturn/static-auth.age;
-      owner = "turnserver";
+    owner = "turnserver";
   };
 }

modules/services/server/default.nix

@@ -9,7 +9,6 @@
 #           └─ default.nix *
 #               └─ ...
 #
-
 [
   ./postgresql.nix
   ./gitea.nix
@@ -19,8 +18,8 @@
   ./coturn.nix
   ./hydra.nix
   ./mealie.nix
-#  ./ollama.nix
+  #  ./ollama.nix
 ]
-
 # picom, polybar and sxhkd are pulled from desktop module
 # redshift temporarely disables
+

modules/services/server/gitea.nix

@@ -1,10 +1,12 @@
 #
 # System notifications
 #
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   services.gitea = {
     enable = true;
     dump.enable = false;
@@ -19,56 +21,56 @@
     appName = "Kabtop Git";
     mailerPasswordFile = config.age.secrets."services/gitea/mailerPassword".path;
     settings = {
-        server = {
+      server = {
-            ROOT_URL = "https://git.kabtop.de";
+        ROOT_URL = "https://git.kabtop.de";
-            HTTP_ADDR = "localhost";
+        HTTP_ADDR = "localhost";
-            DOMAIN = "git.kabtop.de";
+        DOMAIN = "git.kabtop.de";
-            SSH_PORT = 2220;
+        SSH_PORT = 2220;
-            ENABLE_GZIP = true;
+        ENABLE_GZIP = true;
-	    LFS_START_SERVER = true;
+        LFS_START_SERVER = true;
-	    LFS_ALLOW_PURE_SSH = true;
+        LFS_ALLOW_PURE_SSH = true;
-        };
+      };
-        security = {
+      security = {
-            MIN_PASSWORD_LENGTH = 8;
+        MIN_PASSWORD_LENGTH = 12;
-            PASSWORD_CHECK_PWN = true;
+        PASSWORD_CHECK_PWN = true;
-            PASSWORD_HASH_ALGO = "argon2";
+        PASSWORD_HASH_ALGO = "argon2";
-        };
+      };
-#        oauth2 = {
+      #        oauth2 = {
-#            ENABLE = true;
+      #            ENABLE = true;
-#            #JWT_SECRET = "secret123";
+      #            #JWT_SECRET = "secret123";
-#        };
+      #        };
-        repository = {
+      repository = {
-            MAX_CREATION_LIMIT = 100;
+        MAX_CREATION_LIMIT = 100;
-        };
+      };
-        ui = {
+      ui = {
-            SHOW_USER_EMAIL = false;
+        SHOW_USER_EMAIL = false;
-            DEFAULT_THEME = "gitea-dark";
+        DEFAULT_THEME = "gitea-dark";
-        };
+      };
-#        openid = {
+      #        openid = {
-#            ENABLE_OPENID_SIGNIN = true;
+      #            ENABLE_OPENID_SIGNIN = true;
-#            WHITELISTED_URIS = "https://auth.kabtop.de";
+      #            WHITELISTED_URIS = "https://auth.kabtop.de";
-#        };
+      #        };
-#        oauth2_client = {
+      #        oauth2_client = {
-#            ENABLE_AUTO_REGISTRATION = true;
+      #            ENABLE_AUTO_REGISTRATION = true;
-#        };
+      #        };
-        time = {
+      time = {
-            DEFAULT_UI_LOCATION = "Europe/Berlin";
+        DEFAULT_UI_LOCATION = "Europe/Berlin";
-        };
+      };
-        other = {
+      other = {
-            SHOW_FOOTER_VERSION = false;
+        SHOW_FOOTER_VERSION = false;
-        };
+      };
 
-        session.COOKIE_SECURE = true;
+      session.COOKIE_SECURE = true;
-        service = {
+      service = {
-            REGISTER_EMAIL_CONFIRM = true;
+        REGISTER_EMAIL_CONFIRM = true;
-            DISABLE_REGISTRATION = true;
+        DISABLE_REGISTRATION = true;
-        };
+      };
-        actions = {
+      actions = {
-            ENABLED = true;
+        ENABLED = true;
-        };
+      };
-	indexer = {
+      indexer = {
-	    REPO_INDEXER_ENABLED = false;
+        REPO_INDEXER_ENABLED = false;
-	};
+      };
     };
   };
 
@@ -87,11 +89,11 @@
     };
   };
   age.secrets."services/gitea/mailerPassword" = {
-      file = ../../../secrets/services/gitea/mailerPassword.age;
+    file = ../../../secrets/services/gitea/mailerPassword.age;
-      owner = "gitea";
+    owner = "gitea";
   };
   age.secrets."services/gitea/databasePassword" = {
-      file = ../../../secrets/services/gitea/databasePassword.age;
+    file = ../../../secrets/services/gitea/databasePassword.age;
-      owner = "gitea";
+    owner = "gitea";
   };
 }

modules/services/server/gitea_runner.nix

@@ -1,59 +1,62 @@
-{ lib, config, pkgs, ... }:
-
 {
-    virtualisation = {
+  lib,
-      podman ={
+  config,
-        enable = true;
+  pkgs,
-        autoPrune.enable = true;
+  ...
-        dockerCompat = true;
+}: {
-      };
+  virtualisation = {
-      containers.containersConf.settings = {
+    podman = {
-        # podman seems to not work with systemd-resolved
+      enable = true;
-        containers.dns_servers = [ "8.8.8.8" "8.8.4.4" ];
+      autoPrune.enable = true;
+      dockerCompat = true;
+    };
+    containers.containersConf.settings = {
+      # podman seems to not work with systemd-resolved
+      containers.dns_servers = ["8.8.8.8" "8.8.4.4"];
+    };
+  };
+
+  services.gitea-actions-runner.instances = {
+    serverrunner = {
+      enable = true;
+      url = "https://git.kabtop.de";
+      name = "Server runner";
+      tokenFile = config.age.secrets."services/gitea/serverrunner-token".path;
+      labels = [
+        "server"
+        "debian-latest:docker://node:18-bullseye"
+        "ubuntu-latest:docker://node:16-bullseye"
+        "ubuntu-22.04:docker://node:16-bullseye"
+        "ubuntu-20.04:docker://node:16-bullseye"
+        "ubuntu-18.04:docker://node:16-buster"
+        "native:host"
+      ];
+      hostPackages = with pkgs; [
+        bash
+        coreutils
+        curl
+        gawk
+        gitMinimal
+        gnused
+        nodejs
+        wget
+      ];
+      settings = {
+        # container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
+        # the default network that also respects our dns server settings
+        container.network = "host";
+        container.privileged = false;
+        # container.valid_volumes = [
+        #   "/nix"
+        #   "${storeDeps}/bin"
+        #   "${storeDeps}/etc/ssl"
+        # ];
       };
     };
+  };
 
-    services.gitea-actions-runner.instances = {
+  age.secrets."services/gitea/serverrunner-token" = {
-        serverrunner = {
+    file = ../../../secrets/services/gitea/serverrunner-token.age;
-            enable = true;
+    owner = "gitea-runner";
-            url = "https://git.kabtop.de";
+  };
-            name = "Server runner";
-            tokenFile = config.age.secrets."services/gitea/serverrunner-token".path;
-            labels = [ 
-              "server"
-              "debian-latest:docker://node:18-bullseye"
-              "ubuntu-latest:docker://node:16-bullseye"
-              "ubuntu-22.04:docker://node:16-bullseye"
-              "ubuntu-20.04:docker://node:16-bullseye"
-              "ubuntu-18.04:docker://node:16-buster"
-              "native:host"
-            ];
-            hostPackages = with pkgs; [
-              bash
-              coreutils
-              curl
-              gawk
-              gitMinimal
-              gnused
-              nodejs
-              wget
-            ];
-            settings = {
-             # container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
-               # the default network that also respects our dns server settings
-              container.network = "host";
-              container.privileged = false;
-             # container.valid_volumes = [
-             #   "/nix"
-             #   "${storeDeps}/bin"
-             #   "${storeDeps}/etc/ssl"
-             # ];
-            };
-        };
-    };
-
-    age.secrets."services/gitea/serverrunner-token" = {
-      file = ../../../secrets/services/gitea/serverrunner-token.age;
-      owner = "gitea-runner";
-    };
 }

modules/services/server/hydra.nix

@@ -1,77 +1,79 @@
-{ lib, config, pkgs, ... }:
-
 {
-    services = {
+  lib,
-      hydra = {
+  config,
-        enable = true;
+  pkgs,
-        hydraURL = "https://hydra.ci.kabtop.de";
+  ...
-        listenHost = "127.0.0.1";
+}: {
-        port = 3001;
+  services = {
-        notificationSender = "hydra@kabtop.de";
+    hydra = {
-        useSubstitutes = true;
+      enable = true;
-        minimumDiskFree = 50;
+      hydraURL = "https://hydra.ci.kabtop.de";
-	maxServers = 10;
+      listenHost = "127.0.0.1";
-      };
+      port = 3001;
-      nix-serve = {
+      notificationSender = "hydra@kabtop.de";
-          enable = true;
+      useSubstitutes = true;
-          port = 5001;
+      minimumDiskFree = 50;
-          bindAddress = "127.0.0.1";
+      maxServers = 10;
-          secretKeyFile = config.age.secrets."keys/nixsign".path;
+    };
-      };
+    nix-serve = {
-      nginx = {
+      enable = true;
-        enable = true;
+      port = 5001;
-        recommendedProxySettings = true;
+      bindAddress = "127.0.0.1";
-        recommendedTlsSettings = true;
+      secretKeyFile = config.age.secrets."keys/nixsign".path;
-        recommendedGzipSettings = true;
+    };
-        recommendedOptimisation = true;
+    nginx = {
-        virtualHosts = {
+      enable = true;
-          "ci.kabtop.de" = {
+      recommendedProxySettings = true;
-            enableACME = true;
+      recommendedTlsSettings = true;
-            forceSSL = true;
+      recommendedGzipSettings = true;
-            default = true;
+      recommendedOptimisation = true;
-            locations."/".return = "503";
+      virtualHosts = {
-          };
+        "ci.kabtop.de" = {
-          "hydra.ci.kabtop.de" = {
+          enableACME = true;
-            enableACME = true;
+          forceSSL = true;
-            forceSSL = true;
+          default = true;
-            locations."/" = {
+          locations."/".return = "503";
-              proxyPass = "http://localhost:3001";
+        };
-              extraConfig = ''
+        "hydra.ci.kabtop.de" = {
-                proxy_set_header X-Forwarded-Port 443;
+          enableACME = true;
-              '';
+          forceSSL = true;
-            };
+          locations."/" = {
-          };
+            proxyPass = "http://localhost:3001";
-          "cache.ci.kabtop.de" = {
+            extraConfig = ''
-            enableACME = true;
+              proxy_set_header X-Forwarded-Port 443;
-            forceSSL = true;
+            '';
-            locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
           };
         };
+        "cache.ci.kabtop.de" = {
+          enableACME = true;
+          forceSSL = true;
+          locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+        };
       };
     };
+  };
 
-    nix = {
+  nix = {
-      settings = {
+    settings = {
-        cores = 5;
+      cores = 5;
-	max-jobs = 1;
+      max-jobs = 1;
-        trusted-users = [
+      trusted-users = [
-          "hydra"
+        "hydra"
-        ];
+      ];
-        allowed-uris = [
+      allowed-uris = [
-	  "github:"
+        "github:"
-	  "https://github.com/"
+        "https://github.com/"
-  	  "git+ssh://github.com/"
+        "git+ssh://github.com/"
-  	];
+      ];
-      };
-
-      extraOptions = ''
-        secret-key-files = ${config.age.secrets."keys/nixsign".path}
-      '';
     };
 
-    age.secrets."keys/nixsign" = {
+    extraOptions = ''
-      file = ../../../secrets/keys/nixservepriv.age;
+      secret-key-files = ${config.age.secrets."keys/nixsign".path}
-      owner = "hydra";
+    '';
-    };
+  };
 
+  age.secrets."keys/nixsign" = {
+    file = ../../../secrets/keys/nixservepriv.age;
+    owner = "hydra";
+  };
 }

modules/services/server/jitsi.nix

@@ -1,46 +1,48 @@
-
-{ config, pkgs, ... }:
 {
-    services.jitsi-meet = {
+  config,
-        enable = true;
+  pkgs,
-        hostName = "meet.kabtop.de";
+  ...
-        config = {
+}: {
-            enableWelcomePage = false;
+  services.jitsi-meet = {
-            prejoinPageEnabled = true;
+    enable = true;
-            defaultLang = "en";
+    hostName = "meet.kabtop.de";
-        };
+    config = {
-        interfaceConfig = {
+      enableWelcomePage = false;
-            SHOW_JITSI_WATERMARK = false;
+      prejoinPageEnabled = true;
-            SHOW_WATERMARK_FOR_GUESTS = false;
+      defaultLang = "en";
-        };
     };
-    #services.jibri = {
+    interfaceConfig = {
-    #    enable = true;
+      SHOW_JITSI_WATERMARK = false;
-    #    config = {
+      SHOW_WATERMARK_FOR_GUESTS = false;
-    #        recording = {
-    #          recordings-directory = "/var/lib/jitsi-meet-recordings";
-    #        };
-    #        ffmpeg = {
-    #          #framerate = 30;
-    #          #video-encode-preset = "veryfast"; # https://trac.ffmpeg.org/wiki/Encode/H.264#a2.Chooseapresetandtune
-    #          h264-constant-rate-factor = 21; # https://trac.ffmpeg.org/wiki/Encode/H.264#a1.ChooseaCRFvalue
-    #        };
-    #    };
-    #};
-    services.jitsi-videobridge = {
-        enable = true;
-        openFirewall = true;
     };
+  };
+  #services.jibri = {
+  #    enable = true;
+  #    config = {
+  #        recording = {
+  #          recordings-directory = "/var/lib/jitsi-meet-recordings";
+  #        };
+  #        ffmpeg = {
+  #          #framerate = 30;
+  #          #video-encode-preset = "veryfast"; # https://trac.ffmpeg.org/wiki/Encode/H.264#a2.Chooseapresetandtune
+  #          h264-constant-rate-factor = 21; # https://trac.ffmpeg.org/wiki/Encode/H.264#a1.ChooseaCRFvalue
+  #        };
+  #    };
+  #};
+  services.jitsi-videobridge = {
+    enable = true;
+    openFirewall = true;
+  };
 
-    services.prosody.extraConfig = ''
+  services.prosody.extraConfig = ''
-        log = "/var/log/prosody/prosody.log"
+    log = "/var/log/prosody/prosody.log"
-    '';
+  '';
-    systemd.tmpfiles.rules = [
+  systemd.tmpfiles.rules = [
-      "d /var/log/prosody - prosody prosody"
+    "d /var/log/prosody - prosody prosody"
-      #"d ${config.services.jibri.config.recording.recordings-directory} 0750 jibri jibri -"
+    #"d ${config.services.jibri.config.recording.recordings-directory} 0750 jibri jibri -"
-    ];
+  ];
 
-    security.acme.defaults.email = "webmaster@kabtop.de";
+  security.acme.defaults.email = "webmaster@kabtop.de";
-    security.acme.defaults.webroot = "/var/lib/acme/acme-challenge";
+  security.acme.defaults.webroot = "/var/lib/acme/acme-challenge";
-    security.acme.acceptTerms = true;
+  security.acme.acceptTerms = true;
 }

modules/services/server/matrix.nix

@@ -1,10 +1,12 @@
 #
 # System notifications
 #
-
+{
-{ config, lib, pkgs, ... }:
+  config,
-
+  lib,
-let
+  pkgs,
+  ...
+}: let
   fqdn = "matrix.${config.networking.domain}";
   clientConfig = {
     "m.homeserver".base_url = "https://${fqdn}";
@@ -41,213 +43,220 @@ in {
           return 404;
         '';
       };
-#      "element.${config.networking.domain}" = {
+      #      "element.${config.networking.domain}" = {
-#        enableACME = true;
+      #        enableACME = true;
-#        forceSSL = true;
+      #        forceSSL = true;
-#
+      #
-#        root = pkgs.element-web.override {
+      #        root = pkgs.element-web.override {
-#            conf = {
+      #            conf = {
-#                default_server_config = clientConfig;
+      #                default_server_config = clientConfig;
-#            };
+      #            };
-#        };
+      #        };
-#      };
+      #      };
     };
   };
 
-  imports = [ ../../kabbone/mautrix-whatsapp.nix ];
+  imports = [../../kabbone/mautrix-whatsapp.nix];
 
   services.matrix-synapse = {
     enable = true;
     settings = {
-        server_name = config.networking.domain;
+      server_name = config.networking.domain;
-        public_baseurl = "https://matrix.${config.networking.domain}";
+      public_baseurl = "https://matrix.${config.networking.domain}";
-        listeners = [
+      listeners = [
-          { port = 8008;
+        {
-            bind_addresses = [ "::1" ];
+          port = 8008;
-            type = "http";
+          bind_addresses = ["::1"];
-            tls = false;
+          type = "http";
-            x_forwarded = true;
+          tls = false;
-            resources = [ 
+          x_forwarded = true;
-              { names = [ "client" ]; compress = true; }
+          resources = [
-              { names = [ "federation" ]; compress = false; }
+            {
-            ];
+              names = ["client"];
-          }
+              compress = true;
-        ];
+            }
+            {
+              names = ["federation"];
+              compress = false;
+            }
+          ];
+        }
+      ];
     };
     extraConfigFiles = [
-        config.age.secrets."services/matrix/synapse.yml".path
+      config.age.secrets."services/matrix/synapse.yml".path
     ];
   };
 
   systemd.services = {
-      matrix-synapse = {
+    matrix-synapse = {
-          requires = [ "postgresql.service" ];
+      requires = ["postgresql.service"];
-      };
+    };
   };
 
   services = {
-      mautrix-telegram = {
+    mautrix-telegram = {
-          enable = true;
+      enable = true;
-	  registerToSynapse = true;
+      registerToSynapse = true;
-          environmentFile = config.age.secrets."services/matrix/mautrix-telegram.env".path;
+      environmentFile = config.age.secrets."services/matrix/mautrix-telegram.env".path;
-          settings = {
+      settings = {
-              homeserver = {
+        homeserver = {
-                  address = "http://localhost:8008";
+          address = "http://localhost:8008";
-                  domain = "kabtop.de";
+          domain = "kabtop.de";
-              };
+        };
-              appservice = {
+        appservice = {
-                  hostname = "127.0.0.1";
+          hostname = "127.0.0.1";
-                  provisioning.enabled = false;
+          provisioning.enabled = false;
-                  id = "telegram";
+          id = "telegram";
-                  public = {
+          public = {
-                      enabled = false;
+            enabled = false;
-                  };
-              };
-              bridge = {
-                  sync_channel_members = true;
-                  startup_sync = true;
-                  public_portals = true;
-                  double_puppet_server_map = {
-                    "kabtop.de" = "https://kabtop.de";
-                  };
-                  encryption = {
-                      allow = true;
-                      default = true;
-                      verification_levels = {
-                          receive = "cross-signed-untrusted";
-                          send = "cross-signed-untrusted";
-                      };
-                  };
-                  private_chat_portal_meta = "default";
-                  backfill = {
-                      disable_notifications = true;
-                  };
-                  permissions = {
-                      "@kabbone:kabtop.de" = "admin";
-                  };
-              };
-              logging = {
-                  loggers = {
-                    mau = {
-                      level = "WARN";
-                    };
-                    telethon = {
-                      level = "WARN";
-                    };
-                  };
-                  root = {
-                    handlers = [
-                      "console"
-                    ];
-                    level = "WARN";
-                  };
-              };
           };
-      };
+        };
-      mautrix-signal = {
+        bridge = {
-          enable = true;
+          sync_channel_members = true;
-	  registerToSynapse = true;
+          startup_sync = true;
-          environmentFile = config.age.secrets."services/matrix/mautrix-signal.env".path;
+          public_portals = true;
-          settings = {
+          double_puppet_server_map = {
-              homeserver = {
+            "kabtop.de" = "https://kabtop.de";
-                  address = "http://localhost:8008";
-                  domain = "kabtop.de";
-              };
-              appservice = {
-                  hostname = "127.0.0.1";
-                  id = "signal";
-		  as_token = "$MAUTRIX_SIGNAL_AS_TOKEN";
-		  hs_token = "$MAUTRIX_SIGNAL_HS_TOKEN";
-              };
-	      database = {
-	        type = "postgres";
-	        uri = "$MAUTRIX_SIGNAL_APPSERVICE_DATABASE";
-	      };
-              encryption = {
-                  allow = true;
-                  default = true;
-                  verification_levels = {
-                      receive = "cross-signed-untrusted";
-                      send = "cross-signed-untrusted";
-                  };
-	          pickle_key = "$MAUTRIX_SIGNAL_ENCRYPTION_PICKLE_KEY";
-              };
-	      backfill = {
-	          enabled = true;
-	      };
-              bridge = {
-                  permissions = {
-                      "@kabbone:kabtop.de" = "admin";
-                  };
-              };
-              logging = {
-	          min_level = "warn";
-		  writers = [
-		    {
-		      format = "pretty-colored";
-		      type = "stdout";
-		    }
-		  ];
-              };
           };
-      };
+          encryption = {
-      kabbone_mautrix-whatsapp = {
+            allow = true;
-          enable = true;
+            default = true;
-	  registerToSynapse = true;
+            verification_levels = {
-          environmentFile = config.age.secrets."services/matrix/mautrix-whatsapp.env".path;
+              receive = "cross-signed-untrusted";
-          settings = {
+              send = "cross-signed-untrusted";
-              homeserver = {
+            };
-                  address = "http://localhost:8008";
-                  domain = "kabtop.de";
-              };
-              appservice = {
-                  hostname = "127.0.0.1";
-                  id = "whatsapp";
-		  as_token = "$MAUTRIX_WHATSAPP_AS_TOKEN";
-		  hs_token = "$MAUTRIX_WHATSAPP_HS_TOKEN";
-	      };
-	      database = {
-	        type = "postgres";
-	        uri = "$MAUTRIX_WHATSAPP_APPSERVICE_DATABASE";
-              };
-              encryption = {
-                  allow = true;
-                  default = true;
-                  verification_levels = {
-                      receive = "cross-signed-untrusted";
-                      send = "cross-signed-untrusted";
-                  };
-	          pickle_key = "$MAUTRIX_WHATSAPP_ENCRYPTION_PICKLE_KEY";
-              };
-	      network = {
-                  history_sync.request_full_sync = true;
-	      };
-              bridge = {
-                  permissions = {
-                      "@kabbone:kabtop.de" = "admin";
-                  };
-              };
-              logging = {
-	          min_level = "warn";
-              };
           };
+          private_chat_portal_meta = "default";
+          backfill = {
+            disable_notifications = true;
+          };
+          permissions = {
+            "@kabbone:kabtop.de" = "admin";
+          };
+        };
+        logging = {
+          loggers = {
+            mau = {
+              level = "WARN";
+            };
+            telethon = {
+              level = "WARN";
+            };
+          };
+          root = {
+            handlers = [
+              "console"
+            ];
+            level = "WARN";
+          };
+        };
       };
+    };
+    mautrix-signal = {
+      enable = true;
+      registerToSynapse = true;
+      environmentFile = config.age.secrets."services/matrix/mautrix-signal.env".path;
+      settings = {
+        homeserver = {
+          address = "http://localhost:8008";
+          domain = "kabtop.de";
+        };
+        appservice = {
+          hostname = "127.0.0.1";
+          id = "signal";
+          as_token = "$MAUTRIX_SIGNAL_AS_TOKEN";
+          hs_token = "$MAUTRIX_SIGNAL_HS_TOKEN";
+        };
+        database = {
+          type = "postgres";
+          uri = "$MAUTRIX_SIGNAL_APPSERVICE_DATABASE";
+        };
+        encryption = {
+          allow = true;
+          default = true;
+          verification_levels = {
+            receive = "cross-signed-untrusted";
+            send = "cross-signed-untrusted";
+          };
+          pickle_key = "$MAUTRIX_SIGNAL_ENCRYPTION_PICKLE_KEY";
+        };
+        backfill = {
+          enabled = true;
+        };
+        bridge = {
+          permissions = {
+            "@kabbone:kabtop.de" = "admin";
+          };
+        };
+        logging = {
+          min_level = "warn";
+          writers = [
+            {
+              format = "pretty-colored";
+              type = "stdout";
+            }
+          ];
+        };
+      };
+    };
+    kabbone_mautrix-whatsapp = {
+      enable = true;
+      registerToSynapse = true;
+      environmentFile = config.age.secrets."services/matrix/mautrix-whatsapp.env".path;
+      settings = {
+        homeserver = {
+          address = "http://localhost:8008";
+          domain = "kabtop.de";
+        };
+        appservice = {
+          hostname = "127.0.0.1";
+          id = "whatsapp";
+          as_token = "$MAUTRIX_WHATSAPP_AS_TOKEN";
+          hs_token = "$MAUTRIX_WHATSAPP_HS_TOKEN";
+        };
+        database = {
+          type = "postgres";
+          uri = "$MAUTRIX_WHATSAPP_APPSERVICE_DATABASE";
+        };
+        encryption = {
+          allow = true;
+          default = true;
+          verification_levels = {
+            receive = "cross-signed-untrusted";
+            send = "cross-signed-untrusted";
+          };
+          pickle_key = "$MAUTRIX_WHATSAPP_ENCRYPTION_PICKLE_KEY";
+        };
+        network = {
+          history_sync.request_full_sync = true;
+        };
+        bridge = {
+          permissions = {
+            "@kabbone:kabtop.de" = "admin";
+          };
+        };
+        logging = {
+          min_level = "warn";
+        };
+      };
+    };
   };
 
   age.secrets."services/matrix/synapse.yml" = {
-     file = ../../../secrets/services/matrix/synapse.age;
+    file = ../../../secrets/services/matrix/synapse.age;
-     owner = "matrix-synapse";
+    owner = "matrix-synapse";
   };
   age.secrets."services/matrix/mautrix-telegram.env" = {
-     file = ../../../secrets/services/matrix/mautrix-telegram.age;
+    file = ../../../secrets/services/matrix/mautrix-telegram.age;
-     owner = "mautrix-telegram";
+    owner = "mautrix-telegram";
   };
   age.secrets."services/matrix/mautrix-whatsapp.env" = {
-     file = ../../../secrets/services/matrix/mautrix-whatsapp.age;
+    file = ../../../secrets/services/matrix/mautrix-whatsapp.age;
-     owner = "mautrix-whatsapp";
+    owner = "mautrix-whatsapp";
   };
   age.secrets."services/matrix/mautrix-signal.env" = {
-     file = ../../../secrets/services/matrix/mautrix-signal.age;
+    file = ../../../secrets/services/matrix/mautrix-signal.age;
-     owner = "mautrix-signal";
+    owner = "mautrix-signal";
   };
 }

modules/services/server/mealie.nix

@@ -1,54 +1,36 @@
-
-{ config, pkgs, pkgs-unstable, ... }:
 {
-
+  config,
-    services.mealie = {
+  pkgs,
-        enable = true;
+  ...
-	#package = pkgs-unstable.mealie;
+}: {
-        listenAddress = "127.0.0.1";
+  services.mealie = {
-	credentialsFile = config.age.secrets."services/mealie/credentialsFile".path;
+    enable = true;
-        settings = {
+    listenAddress = "127.0.0.1";
-            ALLOW_SIGNUP = "false";
+    credentialsFile = config.age.secrets."services/mealie/credentialsFile".path;
-	    DB_ENGINE = "postgres";
+    settings = {
-	    TZ = "Europe/Berlin";
+      ALLOW_SIGNUP = "false";
-	    PGID = "911";
+      DB_ENGINE = "postgres";
-	    PUID = "911";
+      TZ = "Europe/Berlin";
-        };
     };
+  };
 
-    services.nginx = {
+  services.nginx = {
-      enable = true;
+    enable = true;
-      virtualHosts = {
+    virtualHosts = {
-        "mealie.kabtop.de" = {
+      "mealie.kabtop.de" = {
-          enableACME = true;
+        enableACME = true;
-          forceSSL = true;
+        forceSSL = true;
-          locations."/".proxyPass = "http://localhost:9000";
+        locations."/".proxyPass = "http://localhost:9000";
-        };
       };
     };
+  };
 
-    users = {
+  age.secrets."services/mealie/credentialsFile" = {
-      users = {
+    file = ../../../secrets/services/mealie/credentialsFile.age;
-        mealie = {
+    owner = "mealie";
-	  uid = 911;
+  };
-	  group = "mealie";
-	  isSystemUser = true;
-	};
-      };
-      groups = {
-        mealie = {
-	  gid = 911;
-	};
-      };
-    };
-
-    age.secrets."services/mealie/credentialsFile" = {
-        file = ../../../secrets/services/mealie/credentialsFile.age;
-        owner = "mealie";
-    };
-
-    security.acme.defaults.email = "webmaster@kabtop.de";
-    security.acme.defaults.webroot = "/var/lib/acme/acme-challenge";
-    security.acme.acceptTerms = true;
 
+  security.acme.defaults.email = "webmaster@kabtop.de";
+  security.acme.defaults.webroot = "/var/lib/acme/acme-challenge";
+  security.acme.acceptTerms = true;
 }