mob next [ci-skip] [ci skip] [skip ci]

lastFile:machines/vega/services/ups.nix

.gitignore

@@ -2,4 +2,4 @@
 # Ignore build outputs from performing a nix-build or `nix build` command
 result
 result-*
-run-vm-*
+

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766984802,
+        "lastModified": 1754535625,
-        "narHash": "sha256-SYZ/MXVtJEb3sRWxvPL/2HtpSL1CzQgu1o8ASXqCO98=",
+        "narHash": "sha256-RdT3/DskBjwx74cvHJHb/mLSO2XeSHitSYViNmYGU/k=",
         "ref": "refs/heads/main",
-        "rev": "052b66d8dc724c3e519b9003281c2f9a210fc380",
+        "rev": "f69e28a1333527cdbadb233966a7e19d4b35a1a3",
-        "revCount": 11770,
+        "revCount": 8886,
         "type": "git",
         "url": "https://git.clan.lol/clan/clan-core"
       },
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766977667,
+        "lastModified": 1753067306,
-        "narHash": "sha256-LUALgG4ZpsA0k7pGYzMDto/r6T8aIPlYTok3lGlojjA=",
+        "narHash": "sha256-jyoEbaXa8/MwVQ+PajUdT63y3gYhgD9o7snO/SLaikw=",
-        "rev": "3f852546b5d8bd2e9659a81c6b2cc14922e63a94",
+        "rev": "18dfd42bdb2cfff510b8c74206005f733e38d8b9",
         "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/3f852546b5d8bd2e9659a81c6b2cc14922e63a94.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/18dfd42bdb2cfff510b8c74206005f733e38d8b9.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766150702,
+        "lastModified": 1753140376,
-        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+        "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+        "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
         "type": "github"
       },
       "original": {
@@ -121,26 +121,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768068402,
-        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "import-tree": {
       "locked": {
         "lastModified": 1752730890,
@@ -156,24 +136,6 @@
         "type": "github"
       }
     },
-    "liminix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1760426231,
-        "narHash": "sha256-r8c5PKtsxAvtQ/k17GH+WNvP47Lr+AbExLMPdLtvAKE=",
-        "ref": "refs/heads/fix-gl-ar750",
-        "rev": "3f1f7c08d440130cce9262a93ce78ed7969d93cd",
-        "revCount": 1574,
-        "type": "git",
-        "url": "https://git.b4l.co.th/newedge/liminix"
-      },
-      "original": {
-        "ref": "refs/heads/fix-gl-ar750",
-        "rev": "3f1f7c08d440130cce9262a93ce78ed7969d93cd",
-        "type": "git",
-        "url": "https://git.b4l.co.th/newedge/liminix"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -182,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766784396,
+        "lastModified": 1751313918,
-        "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
+        "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55",
+        "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
         "type": "github"
       },
       "original": {
@@ -197,11 +159,11 @@
     },
     "nix-select": {
       "locked": {
-        "lastModified": 1763303120,
+        "lastModified": 1745005516,
-        "narHash": "sha256-yxcNOha7Cfv2nhVpz9ZXSNKk0R7wt4AiBklJ8D24rVg=",
+        "narHash": "sha256-IVaoOGDIvAa/8I0sdiiZuKptDldrkDWUNf/+ezIRhyc=",
-        "rev": "3d1e3860bef36857a01a2ddecba7cdb0a14c35a9",
+        "rev": "69d8bf596194c5c35a4e90dd02c52aa530caddf8",
         "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/nix-select/archive/3d1e3860bef36857a01a2ddecba7cdb0a14c35a9.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/nix-select/archive/69d8bf596194c5c35a4e90dd02c52aa530caddf8.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -210,11 +172,11 @@
     },
     "nixos-facter-modules": {
       "locked": {
-        "lastModified": 1766558141,
+        "lastModified": 1750412875,
-        "narHash": "sha256-Ud9v49ZPsoDBFuyJSQ2Mpw1ZgAH/aMwUwwzrVoetNus=",
+        "narHash": "sha256-uP9Xxw5XcFwjX9lNoYRpybOnIIe1BHfZu5vJnnPg3Jc=",
         "owner": "nix-community",
         "repo": "nixos-facter-modules",
-        "rev": "e796d536e3d83de74267069e179dc620a608ed7d",
+        "rev": "14df13c84552a7d1f33c1cd18336128fbc43f920",
         "type": "github"
       },
       "original": {
@@ -225,11 +187,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768395095,
+        "lastModified": 1754278406,
-        "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=",
+        "narHash": "sha256-jvIQTMN5EzoOP5RaGztpVese8a3wqy0M/h6tNzycW28=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5",
+        "rev": "6a489c9482ca676ce23c0bcd7f2e1795383325fa",
         "type": "github"
       },
       "original": {
@@ -244,9 +206,7 @@
         "clan-core": "clan-core",
         "devshell": "devshell",
         "flake-parts": "flake-parts",
-        "home-manager": "home-manager",
         "import-tree": "import-tree",
-        "liminix": "liminix",
         "nixpkgs": "nixpkgs",
         "treefmt-nix": "treefmt-nix"
       }
@@ -259,11 +219,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766894905,
+        "lastModified": 1754328224,
-        "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=",
+        "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7",
+        "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -15,20 +15,12 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
       url = "github:hercules-ci/flake-parts";
     };
-    home-manager = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:nix-community/home-manager";
-    };
     import-tree.url = "github:vic/import-tree";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    liminix = {
-      url = "git+https://git.b4l.co.th/newedge/liminix?ref=refs/heads/fix-gl-ar750&rev=3f1f7c08d440130cce9262a93ce78ed7969d93cd";
-      flake = false;
-    };
   };
   outputs =
     {
@@ -45,30 +37,10 @@
           ./fmt.nix
           ./shell.nix
 
-          ./overlays
-          ./modules/nixos
           ./machines
-          ./routers
           ./inventories
-          ./overlays
-          ./tests
           ./modules/clan/flake-module.nix
-          ./modules/nixos/flake-module.nix
         ];
-        perSystem =
-          { pkgs, system, ... }:
-          {
-            _module.args.pkgs = import inputs.nixpkgs {
-              inherit system;
-              overlays = [
-                inputs.self.overlays.packagesOverlay
-              ];
-              config = { };
-            };
-            packages.think = pkgs.think-gtcm;
-            packages.think-be = pkgs.think-backend-gtcm;
-            packages.file-uploader = pkgs.gtcm-file-uploader;
-          };
       }
     );
 }

inventories/default.nix

@@ -1,28 +1,22 @@
 {
-  imports = [ ./personal-computer.nix ];
+  inputs,
+  self,
+  lib,
+  pkgs,
+  ...
+}:
+{
   clan = {
     inventory = {
 
+      machines = {
+        rigel.deploy.targetHost = "root@rigel.local";
+        vega.deploy.targetHost = "root@vega.local";
+      };
+
       tags = {
-        glom = [
+        glom = [ "vega" ];
-          "vega"
+        b4l = [ "rigel" ];
-          "ramus"
-        ];
-        w = [ "sirius" ];
-        b4l = [
-          "rigel"
-          "neptune"
-          "rana"
-        ];
-        phonebox = [
-          "neptune"
-          "rigel"
-          "almach"
-          "alpheratz"
-          "mirach"
-          "adhil"
-          "buna"
-        ];
       };
 
       instances = {
@@ -48,28 +42,6 @@
           };
         };
 
-        tor = {
-          module = {
-            name = "tor";
-            input = "clan-core";
-          };
-          roles.server.tags."nixos" = { };
-        };
-
-        w-network = {
-          module = {
-            name = "zerotier";
-            input = "clan-core";
-          };
-          roles.controller.machines."sirius" = {
-            settings.allowedIps = [
-              #kurogeek
-              "fdfe:7bf:a795:4524:4c99:932b:d36d:b8cc"
-            ];
-          };
-          roles.peer.tags.w = { };
-        };
-
         glom-network = {
           module = {
             name = "zerotier";
@@ -88,31 +60,6 @@
           roles.peer.tags.b4l = { };
         };
 
-        yggdrasil-phone-network = {
-          module = {
-            name = "yggdrasil";
-            input = "clan-core";
-          };
-          roles.default.tags."phonebox" = { };
-          roles.default.settings.extraPeers = [
-            "tls://ygg.jjolly.dev:3443"
-            "tls://[2602:fc24:18:7a42::1]:993"
-            "tcp://leo.node.3dt.net:9002"
-            "tcp://ygg-kcmo.incognet.io:8883"
-          ];
-        };
-
-        phonebox = {
-          module = {
-            name = "phonebox";
-            input = "self";
-          };
-          roles.default.tags."phonebox" = { };
-          roles.default.machines."adhil".settings = {
-            ata-ethernet-iface = "end0";
-          };
-        };
-
         pocket-id = {
           module = {
             name = "pocket-id";
@@ -126,6 +73,7 @@
             input = "self";
           };
           roles.default.machines.b4l = { };
+          roles.default.machines.vega = { };
         };
         stirling-pdf = {
           module = {
@@ -162,6 +110,13 @@
           };
           roles.default.machines.b4l = { };
         };
+        pingvin = {
+          module = {
+            name = "pingvin";
+            input = "self";
+          };
+          roles.default.machines.b4l = { };
+        };
         paperless = {
           module = {
             name = "paperless";
@@ -169,80 +124,6 @@
           };
           roles.default.machines.b4l = { };
         };
-        pulse-stream = {
-          module = {
-            name = "pulse-stream";
-            input = "self";
-          };
-          roles.default.machines.neptune = {
-            settings.client-ip-ranges = [
-              "10.0.0.0/24"
-            ];
-          };
-        };
-        jukebox = {
-          module = {
-            name = "jukebox";
-            input = "self";
-          };
-          roles.default.machines.neptune = {
-            settings = {
-              binds = [ "wlp1s0" ];
-              disks.m3 = {
-                uuid = "105D-319E";
-                mountOptions = [ "utf8" ];
-              };
-            };
-          };
-        };
-        git-daemon = {
-          module = {
-            name = "git-daemon";
-            input = "self";
-          };
-          roles.default.machines.neptune = {
-            settings.repositories =
-              let
-                defaults = rec {
-                  write-access = [
-                    "10.0.0.0/24"
-                    "200:d7b1:c5d5:ea7:27ad:6837:40f6:404d/128"
-                  ];
-                  read-access = write-access;
-                };
-                PUBLIC = {
-                  read-access = [
-                    "10.0.0.0/24"
-                    "0200::/7"
-                  ];
-                };
-              in
-              builtins.mapAttrs (_: override: defaults // override) {
-                "9e" = PUBLIC;
-                archive-dl = { };
-                barrytown = { };
-                cleanroom = PUBLIC;
-                community-memory = { };
-                eris = { };
-                ftdi-sd-spi = { };
-                go-go-gadget = { };
-                hacking-the-kindle = { };
-                islands = PUBLIC;
-                kt = { };
-                legba = { };
-                llb = PUBLIC;
-                llc = PUBLIC;
-                lora = { };
-                mute = { };
-                navi = { };
-                notmuch-memoryhole = PUBLIC;
-                pms5003 = { };
-                thinc = PUBLIC;
-                toad = { };
-                yggdrasil-erlang = { };
-              };
-          };
-        };
       };
     };
   };

inventories/personal-computer.nix

@@ -1,37 +0,0 @@
-{
-  clan.inventory = {
-    tags = {
-      kde-desktop = [ "rana" ];
-      personal-computer = [ "rana" ];
-    };
-
-    instances = {
-      emmie-home = {
-        module = {
-          name = "home-user";
-          input = "self";
-        };
-        roles.default.settings = {
-          username = "emmie";
-          kbLayout = "us,th";
-          kbOptions = "grp:win_space_toggle,grp:alt_shift_toggle";
-        };
-        roles.default.machines."rana" = { };
-      };
-      personal-computer = {
-        module = {
-          name = "personal-computer";
-          input = "self";
-        };
-        roles.default.tags."personal-computer" = { };
-      };
-      kde = {
-        module = {
-          name = "kde";
-          input = "clan-core";
-        };
-        roles.default.tags."kde-desktop" = { };
-      };
-    };
-  };
-}

inventory.json

@@ -1,28 +1 @@
-{
+{}
-  "machines": {
-    "ramus": {
-      "installedAt": 1764139649
-    },
-    "alpheratz": {
-      "installedAt": 1764741499
-    },
-    "mirach": {
-      "installedAt": 1764744666
-    },
-    "almach": {
-      "installedAt": 1764745787
-    },
-    "neptune": {
-      "installedAt": 1762147067
-    },
-    "adhil": {
-      "installedAt": 1765277591
-    },
-    "buna": {
-      "installedAt": 1765343708
-    },
-    "rana": {
-      "installedAt": 1768294839
-    }
-  }
-}

machines/adhil/configuration.nix

@@ -1,13 +0,0 @@
-{ ... }:
-{
-  nixpkgs.hostPlatform = {
-    system = "aarch64-linux";
-  };
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
-  # clan.core.networking.targetHost = "root@";
-
-  clan.core.settings.name = "adhil";
-  # clan.meta.description = "Raspberry Pi 4 SBC board for one of w phone network. (With w office)";
-
-}

machines/adhil/disko.nix

@@ -1,56 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-SD64G_0xfb330ff6";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              end = "500M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              name = "root";
-              end = "-0";
-              content = {
-                type = "filesystem";
-                format = "f2fs";
-                mountpoint = "/";
-                extraArgs = [
-                  "-O"
-                  "extra_attr,inode_checksum,sb_checksum,compression"
-                ];
-                mountOptions = [
-                  "compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime,nodiscard"
-                ];
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/almach/configuration.nix

@@ -1,13 +0,0 @@
-{ config, ... }:
-{
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
-  # clan.core.networking.targetHost = "root@";
-
-  clan.core.settings.name = "almach";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network.";
-
-}

machines/almach/disko.nix

@@ -1,90 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-CUTB42_0x95d64f17";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
-              };
-            };
-            system = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-            swap = {
-              size = "4G";
-              content = {
-                type = "swap";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/alpheratz/configuration.nix

@@ -1,13 +0,0 @@
-{ config, ... }:
-{
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
-  # clan.core.networking.targetHost = "root@";
-
-  clan.core.settings.name = "alpheratz";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network.";
-
-}

machines/alpheratz/disko.nix

@@ -1,90 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-CUTB42_0xaedcfa8b";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
-              };
-            };
-            system = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-            swap = {
-              size = "4G";
-              content = {
-                type = "swap";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/b4l/configuration.nix

@@ -19,18 +19,4 @@
   services.nginx.virtualHosts."${config.networking.fqdn}" = {
     enableACME = true;
   };
-
-  clan.core.vars.generators.acme = {
-    share = true;
-    files.email.secret = false;
-
-    prompts.email = {
-      type = "line";
-      description = "Email for ACME registeration";
-    };
-
-    script = ''
-      cat $prompts/email > $out/email
-    '';
-  };
 }

machines/b4l/services/nextcloud.nix

@@ -19,7 +19,7 @@ in
 
   services.nextcloud = {
     hostName = ncDomain;
-    package = pkgs.nextcloud32;
+    package = pkgs.nextcloud31;
 
     settings = {
 

machines/b4l/services/pingvin.nix

@@ -0,0 +1,45 @@
+{
+  pkgs,
+  config,
+  ...
+}:
+let
+  serviceName = "${config.networking.hostName}-pingvin";
+  domain-name = "${
+    config.clan.core.vars.generators."${serviceName}".files.subdomain.value
+  }.${config.networking.fqdn}";
+in
+{
+  clan.core.vars.generators."${serviceName}" = {
+    files = {
+      subdomain.secret = false;
+    };
+    prompts = {
+      subdomain = {
+        persist = true;
+        type = "line";
+        description = "Sub-domain for Pingvin. Default:(share)";
+      };
+    };
+
+    runtimeInputs = [
+      pkgs.xkcdpass
+      pkgs.coreutils
+    ];
+
+    script = ''
+      prompt_domain=$(cat "$prompts"/subdomain)
+      if [[ -n "''${prompt_domain-}" ]]; then
+        echo $prompt_domain | tr -d "\n" > "$out"/subdomain
+      else
+        echo -n "share" > "$out"/subdomain
+      fi
+    '';
+  };
+
+  services.pingvin-share = {
+    nginx.enable = true;
+    https = true;
+    hostname = domain-name;
+  };
+}

machines/buna/configuration.nix

@@ -1,13 +0,0 @@
-{ config, ... }:
-{
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
-  # clan.core.networking.targetHost = "root@";
-
-  clan.core.settings.name = "buna";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network. (With w whitehouse)";
-
-}

machines/buna/disko.nix

@@ -1,56 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/usb-Generic_MassStorageClass_000000001539-0:0";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              end = "500M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              name = "root";
-              end = "-0";
-              content = {
-                type = "filesystem";
-                format = "f2fs";
-                mountpoint = "/";
-                extraArgs = [
-                  "-O"
-                  "extra_attr,inode_checksum,sb_checksum,compression"
-                ];
-                mountOptions = [
-                  "compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime,nodiscard"
-                ];
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/default.nix

@@ -1,8 +1,4 @@
-{
+{ inputs, self, ... }:
-  inputs,
-  self,
-  ...
-}:
 {
   imports = [
     inputs.clan-core.flakeModules.default

machines/mirach/configuration.nix

@@ -1,13 +0,0 @@
-{ config, ... }:
-{
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
-  # clan.core.networking.targetHost = "root@";
-
-  clan.core.settings.name = "mirach";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network.";
-
-}

machines/mirach/disko.nix

@@ -1,90 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-CUTB42_0x95d64f33";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
-              };
-            };
-            system = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-            swap = {
-              size = "4G";
-              content = {
-                type = "swap";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/neptune/configuration.nix

@@ -1,62 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  ...
-}:
-{
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
-
-  networking.interfaces.enx00e04c106368.useDHCP = true; # recovery
-
-  clan.core.vars.generators.wireless-credentials = {
-    files = {
-      essid.secret = false;
-      psk.secret = true;
-    };
-    prompts = {
-      essid.persist = true;
-      psk.persist = true;
-    };
-    script = ''
-      cat "$prompts"/essid > $out/essid
-      prompt_psk=$(cat "$prompts"/psk)
-      echo "psk=$prompt_psk" > $out/psk
-    '';
-  };
-
-  networking.wireless =
-    let
-      credentials = config.clan.core.vars.generators.wireless-credentials.files;
-    in
-    {
-      enable = true;
-      secretsFile = credentials.psk.path;
-      networks.${credentials.essid.value}.pskRaw = "ext:psk";
-    };
-
-  networking.interfaces.wlp1s0 = {
-    useDHCP = false;
-    ipv4.addresses = [
-      {
-        address = "10.0.0.9";
-        prefixLength = 24;
-      }
-    ];
-  };
-
-  services.yggdrasil.settings.Peers = lib.mkForce [
-    "tcp://newt.barry.town:1337"
-    "tls://yg-hkg.magicum.net:32333"
-    "tls://astrra.space:55535"
-  ];
-
-  clan.core.settings.name = "neptune";
-  # clan.meta.description = "Radxa SBC board for testing. (With vi)";
-
-}

machines/neptune/disko.nix

@@ -1,90 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-CUTB42_0x9d59499c";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
-              };
-            };
-            system = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-            swap = {
-              size = "16G";
-              content = {
-                type = "swap";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/ramus/configuration.nix

@@ -1,35 +0,0 @@
-{ self, config, ... }:
-{
-  system.stateVersion = "25.11";
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-
-  clan.core.settings.name = "ramus";
-  # clan.meta.description = ''
-  #   A Hetzner VPS machine own by Alex.
-  # '';
-
-  clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
-
-  clan.core.vars.generators.acme = {
-    share = true;
-    files.email.secret = false;
-
-    prompts.email = {
-      type = "line";
-      description = "Email for ACME registeration";
-    };
-
-    script = ''
-      cat $prompts/email > $out/email
-    '';
-  };
-
-  users.users.nginx.extraGroups = [ "acme" ];
-
-  security.acme.acceptTerms = true;
-
-  imports = [ ./think-greater-chiangmai.nix ];
-}

machines/ramus/disko.nix

@@ -1,84 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_107266387";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
-              };
-            };
-            system = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/ramus/think-greater-chiangmai.nix

@@ -1,139 +0,0 @@
-{ self, config, ... }:
-let
-  commonSettings = rec {
-    APP_NAME = "Laravel";
-    APP_ENV = "local";
-    APP_KEY._secret = config.clan.core.vars.generators.greaterchiangmai.files.app_key.path;
-    APP_DEBUG = "false";
-    APP_URL = "http://localhost";
-
-    DB_CONNECTION = "mysql";
-    DB_HOST = "localhost";
-    DB_PORT = 3306;
-    DB_DATABASE = "thinkgtcm";
-    DB_USERNAME = "gtcm";
-
-    R2_SCHEMA_URL = "https://${R2_BUCKET}.${R2_REGION}.your-objectstorage.com/test-large-files/";
-    R2_ACCESS_KEY_ID = config.clan.core.vars.generators.greaterchiangmai-s3.files.access_key_id.value;
-    R2_SECRET_ACCESS_KEY._secret =
-      config.clan.core.vars.generators.greaterchiangmai-s3.files.secret_access_key.path;
-    R2_REGION = config.clan.core.vars.generators.greaterchiangmai-s3.files.region.value;
-    R2_BUCKET = config.clan.core.vars.generators.greaterchiangmai-s3.files.bucket.value;
-    R2_ENDPOINT = config.clan.core.vars.generators.greaterchiangmai-s3.files.endpoint.value;
-
-    R2_BUCKET_NAME = R2_BUCKET;
-
-    LOG_CHANNEL = "stack";
-    LOG_LEVEL = "debug";
-
-    FILESYSTEM_DISK = "local";
-
-    BROADCAST_DRIVER = "log";
-    CACHE_DRIVER = "file";
-    QUEUE_CONNECTION = "sync";
-    SESSION_DRIVER = "file";
-    SESSION_LIFETIME = 120;
-
-    MEMCACHED_HOST = "127.0.0.1";
-
-    REDIS_HOST = "127.0.0.1";
-    REDIS_PORT = 6379;
-
-    UPLOAD_MAX_FILESIZE = "5000M";
-    POST_MAX_SIZE = "5000M";
-
-    TEST_LOCAL = true;
-  };
-
-  baseDomain = "greaterchiangmai.com";
-  domain = "think.${baseDomain}";
-  domainBackend = "think-backend.${baseDomain}";
-in
-{
-  imports = [
-    self.nixosModules.think-gtcm
-    self.nixosModules.think-backend-gtcm
-  ];
-  nixpkgs.overlays = [ self.overlays.packagesOverlay ];
-
-  clan.core.vars.generators.greaterchiangmai = {
-    files = {
-      app_key = {
-        secret = true;
-        owner = config.services.think-greaterchiangmai.user;
-        group = config.services.think-greaterchiangmai.group;
-      };
-    };
-
-    prompts = {
-      app_key.persist = true;
-    };
-
-    script = ''
-      cat $prompts/app_key > $out/app_key
-    '';
-  };
-
-  clan.core.vars.generators.greaterchiangmai-s3 = {
-    files = {
-      access_key_id.secret = false;
-      secret_access_key = {
-        secret = true;
-        owner = config.services.think-greaterchiangmai.user;
-        group = config.services.think-greaterchiangmai.group;
-      };
-      endpoint.secret = false;
-      region.secret = false;
-      bucket.secret = false;
-    };
-
-    prompts = {
-      access_key_id.persist = true;
-      secret_access_key.persist = true;
-      endpoint.persist = true;
-      region.persist = true;
-      bucket.persist = true;
-    };
-
-    script = ''
-      cat $prompts/access_key_id > $out/access_key_id
-      cat $prompts/secret_access_key > $out/secret_access_key
-      cat $prompts/endpoint > $out/endpoint
-      cat $prompts/region > $out/region
-      cat $prompts/bucket > $out/bucket
-    '';
-  };
-
-  services.think-greaterchiangmai = {
-    enable = true;
-    domain = domain;
-    settings = commonSettings;
-  };
-  services.think-backend-greaterchiangmai = {
-    enable = true;
-    domain = domainBackend;
-    settings = commonSettings;
-  };
-
-  security.acme.certs = {
-    "${domain}" = {
-      email = config.clan.core.vars.generators.acme.files.email.value;
-      webroot = "/var/lib/acme/acme-challenge/${domain}";
-    };
-    "${domainBackend}" = {
-      email = config.clan.core.vars.generators.acme.files.email.value;
-      webroot = "/var/lib/acme/acme-challenge/${domainBackend}";
-    };
-  };
-
-  services.nginx.virtualHosts.${domain} = {
-    forceSSL = true;
-    useACMEHost = domain;
-    acmeRoot = config.security.acme.certs.${domain}.webroot;
-  };
-  services.nginx.virtualHosts.${domainBackend} = {
-    forceSSL = true;
-    useACMEHost = domainBackend;
-    acmeRoot = config.security.acme.certs.${domainBackend}.webroot;
-  };
-}

machines/rana/configuration.nix

@@ -1,12 +0,0 @@
-{ self, ... }:
-{
-  imports = [
-    self.nixosModules.common
-  ];
-
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
-}

machines/rana/disko.nix

@@ -1,90 +0,0 @@
-{ ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/nvme-SAMSUNG_MZVL81T0HFLB-00BLL_S7XKNF0Y966645";
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
-              };
-            };
-            system = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-            swap = {
-              size = "16G";
-              content = {
-                type = "swap";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/rigel/configuration.nix

@@ -1,67 +1,13 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}:
 {
   imports = [
     (import ../../lib/auto-accept-zerotier-members.nix {
       memberIds = [
         "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
+        "1b495eede9" # kurogeek-thinkpad
-        "2bd36db8cc" # kurogeek-thinkpad
       ];
     })
-
-    inputs.self.nixosModules.inventree
   ];
 
-  nixpkgs.overlays = [
-    inputs.self.overlays.default
-  ];
-
-  clan.core.vars.generators.inventree = {
-    files = {
-      secret-key = {
-        owner = "inventree";
-        group = "inventree";
-        secret = true;
-      };
-      oidc-key = {
-        owner = "inventree";
-        group = "inventree";
-        secret = true;
-      };
-      admin-password = {
-        owner = "inventree";
-        group = "inventree";
-        secret = true;
-      };
-    };
-    runtimeInputs = [
-      pkgs.pwgen
-      pkgs.xkcdpass
-    ];
-    script = ''
-      pwgen -s 32 1 > $out/secret-key
-      pwgen -s 32 1 > $out/oidc-key
-      xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/admin-password
-    '';
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 ];
-
-  services.inventree = {
-    enable = true;
-    hostName = "rigel.local";
-    config.site_url = "http://${config.services.inventree.hostName}";
-    secretKeyFile = config.clan.core.vars.generators.inventree.files.secret-key.path;
-    config.oidc_private_key_file = config.clan.core.vars.generators.inventree.files.oidc-key.path;
-    config.adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
-  };
-
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
 }

machines/sirius/configuration.nix

@@ -1,24 +0,0 @@
-{
-  inputs,
-  config,
-  self,
-  ...
-}:
-{
-  imports = [
-    self.nixosModules.common
-
-    (inputs.import-tree ./services)
-
-  ];
-
-  clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
-
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-  };
-
-  system.stateVersion = "25.11";
-
-}

machines/sirius/disko.nix

@@ -1,141 +0,0 @@
-{ lib, ... }:
-let
-  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-FIXME";
-  vdev = [
-    "/dev/disk/by-id/ata-FIXME"
-    "/dev/disk/by-id/ata-FIXME"
-  ];
-in
-{
-
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
-
-  disko.devices = {
-    disk = {
-      "os-${hashDisk os}" = {
-        type = "disk";
-        device = os;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
-              };
-            };
-            system = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-            swap = {
-              size = "16G";
-              content = {
-                type = "swap";
-              };
-            };
-          };
-        };
-      };
-    }
-    // (lib.listToAttrs (
-      map (disk: {
-        name = "data-${hashDisk disk}";
-        value = {
-          type = "disk";
-          device = disk;
-          content = {
-            type = "zfs";
-            pool = "zdata";
-          };
-        };
-      }) vdev
-    ));
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
-          };
-        };
-      };
-      zdata = {
-        type = "zpool";
-        options.ashift = "12";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        mode = {
-          topology = {
-            type = "topology";
-            vdev = [
-              {
-                mode = "mirror";
-                members = vdev;
-              }
-            ];
-          };
-        };
-        datasets = {
-          "nas" = {
-            type = "zfs_fs";
-            mountpoint = "/mnt/hdd";
-            mountOptions = [ "nofail" ];
-          };
-          "service-data" = {
-            type = "zfs_fs";
-            mountpoint = "/var/lib";
-            mountOptions = [ "nofail" ];
-          };
-        };
-      };
-    };
-  };
-}

machines/sirius/services/samba.nix

@@ -1,93 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  sambaUser = lib.filterAttrs (
-    name: user: user.isNormalUser && builtins.elem "samba" user.extraGroups
-  ) config.users.users;
-
-  sharedFolders = {
-    WhiteHouse.users = [
-      "w"
-      "kurogeek"
-      "berwn"
-    ];
-  };
-in
-{
-
-  services.samba = {
-    enable = true;
-    openFirewall = true;
-    settings = {
-      global = {
-        security = "user";
-        workgroup = "WORKGROUP";
-        "server string" = "WhiteHouse NAS";
-        interfaces = "eth* en*";
-        "max log size" = "50";
-        "dns proxy" = false;
-        "syslog only" = true;
-        "map to guest" = "Bad User";
-        "guest account" = "nobody";
-      };
-    }
-    // lib.mapAttrs (share: opts: {
-      path = "/mnt/hdd/samba/${share}";
-      comment = share;
-      "force user" = share;
-      "force group" = share;
-      public = "yes";
-      "guest ok" = "yes";
-      "create mask" = "0640";
-      "directory mask" = "0750";
-      writable = "no";
-      browseable = "yes";
-      printable = "no";
-      # TODO
-      # "valid users" = toString opts.users;
-    }) sharedFolders;
-  };
-
-  users.users = lib.mapAttrs (share: opts: {
-    isSystemUser = true;
-    group = share;
-  }) sharedFolders;
-
-  users.groups = lib.mapAttrs (share: opts: { }) sharedFolders;
-
-  systemd.services.samba-smbd.postStart =
-    lib.concatMapStrings (
-      user:
-      let
-        password = config.clan.core.vars.generators."${user}-smb-password".files.password.path;
-      in
-      ''
-        mkdir -p /mnt/hdd/samba/${user}
-        chown ${user}:users /mnt/hdd/samba/${user}
-        # if a password is unchanged, this will error
-        (echo $(<${password}); echo $(<${password})) | ${config.services.samba.package}/bin/smbpasswd -s -a ${user}
-      ''
-    ) (lib.attrNames sambaUser)
-    + lib.concatMapStrings (share: ''
-      mkdir -p /mnt/hdd/samba/${share}
-      chown ${share}:${share} /mnt/hdd/samba/${share}
-    '') (lib.attrNames sharedFolders);
-
-  services.samba-wsdd = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  services.avahi = {
-    publish.enable = true;
-    publish.userServices = true;
-    # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile`
-    nssmdns4 = true;
-    # ^^ Not one hundred percent sure if this is needed- if it aint broke, don't fix it
-    enable = true;
-    openFirewall = true;
-  };
-}

machines/vega/configuration.nix

@@ -1,26 +1,21 @@
 {
   inputs,
   config,
-  self,
   ...
 }:
 {
   imports = [
-    self.nixosModules.common
-
     (inputs.import-tree ./services)
 
     (import ../../lib/auto-accept-zerotier-members.nix {
       memberIds = [
         "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
+        "1b495eede9" # kurogeek-thinkpad
-        "2bd36db8cc" # kurogeek-thinkpad
       ];
     })
   ];
 
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
 
   nixpkgs.hostPlatform = {
     system = "x86_64-linux";

machines/vega/disko.nix

@@ -1,7 +1,7 @@
 { lib, ... }:
 let
   hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-CUTB42_0x95d14f9e";
+  os = "/dev/disk/by-id/mmc-CUTB42_0x9d59499c";
   vdev = [
     "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG"
     "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X"

machines/vega/facter.json

@@ -23,8 +23,8 @@
     },
     "bluetooth": [
       {
-        "index": 31,
+        "index": 33,
-        "attached_to": 33,
+        "attached_to": 34,
         "class_list": ["usb", "bluetooth"],
         "bus_type": {
           "hex": "0086",
@@ -99,7 +99,7 @@
       },
       {
         "index": 36,
-        "attached_to": 33,
+        "attached_to": 34,
         "class_list": ["usb", "bluetooth"],
         "bus_type": {
           "hex": "0086",
@@ -597,7 +597,7 @@
         "fpu_exception": true,
         "cpuid_level": 32,
         "write_protect": false,
-        "tlb_size": 32764,
+        "tlb_size": 32767,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
@@ -636,7 +636,7 @@
         },
         "device": {
           "hex": "0561",
-          "name": "1",
+          "name": "0",
           "value": 1377
         },
         "revision": {
@@ -645,10 +645,10 @@
           "value": 0
         },
         "serial": "000000004EBF",
-        "model": "1",
+        "model": "0",
         "sysfs_id": "/class/block/sdb",
-        "sysfs_bus_id": "1:0:0:1",
+        "sysfs_bus_id": "1:0:0:0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:0",
         "unix_device_name": "/dev/sdb",
         "unix_device_number": {
           "type": 98,
@@ -657,10 +657,10 @@
           "range": 16
         },
         "unix_device_names": [
-          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X",
+          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG",
-          "/dev/disk/by-id/usb-USB_3.0_Device_1_000000004EBF-0:1",
+          "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:0",
           "/dev/sdb"
         ],
         "unix_device_name2": "/dev/sg1",
@@ -706,7 +706,7 @@
           "name": "Disk",
           "value": 0
         },
-        "serial": "0x95d14f9e",
+        "serial": "0x9d59499c",
         "model": "Disk",
         "sysfs_id": "/class/block/mmcblk0",
         "sysfs_bus_id": "mmc0:0001",
@@ -719,7 +719,7 @@
           "range": 32
         },
         "unix_device_names": [
-          "/dev/disk/by-id/mmc-CUTB42_0x95d14f9e",
+          "/dev/disk/by-id/mmc-CUTB42_0x9d59499c",
           "/dev/mmcblk0"
         ],
         "resources": [
@@ -745,6 +745,180 @@
       },
       {
         "index": 29,
+        "attached_to": 25,
+        "class_list": ["disk", "block_device"],
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "model": "Disk",
+        "sysfs_id": "/class/block/mmcblk0boot0",
+        "sysfs_bus_id": "mmcblk0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1a.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0",
+        "unix_device_name": "/dev/mmcblk0boot0",
+        "unix_device_number": {
+          "type": 98,
+          "major": 179,
+          "minor": 32,
+          "range": 32
+        },
+        "unix_device_names": ["/dev/mmcblk0boot0"],
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 128,
+            "heads": 4,
+            "sectors": 16,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 8192,
+            "value_2": 512
+          }
+        ],
+        "driver": "mmcblk",
+        "drivers": ["mmcblk"]
+      },
+      {
+        "index": 30,
+        "attached_to": 22,
+        "class_list": ["disk", "usb", "scsi", "block_device"],
+        "bus_type": {
+          "hex": "0084",
+          "name": "SCSI",
+          "value": 132
+        },
+        "slot": {
+          "bus": 1,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "152d",
+          "value": 5421
+        },
+        "device": {
+          "hex": "0561",
+          "name": "1",
+          "value": 1377
+        },
+        "revision": {
+          "hex": "0000",
+          "name": "~",
+          "value": 0
+        },
+        "serial": "000000004EBF",
+        "model": "1",
+        "sysfs_id": "/class/block/sdc",
+        "sysfs_bus_id": "1:0:0:1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:1",
+        "unix_device_name": "/dev/sdc",
+        "unix_device_number": {
+          "type": 98,
+          "major": 8,
+          "minor": 32,
+          "range": 16
+        },
+        "unix_device_names": [
+          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X",
+          "/dev/disk/by-id/usb-USB_3.0_Device_1_000000004EBF-0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:1",
+          "/dev/sdc"
+        ],
+        "unix_device_name2": "/dev/sg2",
+        "unix_device_number2": {
+          "type": 99,
+          "major": 21,
+          "minor": 2,
+          "range": 1
+        },
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 19074048,
+            "heads": 64,
+            "sectors": 32,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 39063650304,
+            "value_2": 512
+          }
+        ],
+        "driver": "uas",
+        "driver_module": "uas",
+        "drivers": ["sd", "uas"],
+        "driver_modules": ["sd_mod", "uas"]
+      },
+      {
+        "index": 31,
+        "attached_to": 25,
+        "class_list": ["disk", "block_device"],
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "model": "Disk",
+        "sysfs_id": "/class/block/mmcblk0boot1",
+        "sysfs_bus_id": "mmcblk0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1a.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0",
+        "unix_device_name": "/dev/mmcblk0boot1",
+        "unix_device_number": {
+          "type": 98,
+          "major": 179,
+          "minor": 64,
+          "range": 32
+        },
+        "unix_device_names": ["/dev/mmcblk0boot1"],
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 128,
+            "heads": 4,
+            "sectors": 16,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 8192,
+            "value_2": 512
+          }
+        ],
+        "driver": "mmcblk",
+        "drivers": ["mmcblk"]
+      },
+      {
+        "index": 32,
         "attached_to": 22,
         "class_list": ["disk", "usb", "scsi", "block_device"],
         "bus_type": {
@@ -783,27 +957,27 @@
         },
         "serial": "000000001532",
         "model": "Generic STORAGE DEVICE",
-        "sysfs_id": "/class/block/sdc",
+        "sysfs_id": "/class/block/sda",
         "sysfs_bus_id": "0:0:0:0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0/host0/target0:0:0/0:0:0:0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0/host0/target0:0:0/0:0:0:0",
-        "unix_device_name": "/dev/sdc",
+        "unix_device_name": "/dev/sda",
         "unix_device_number": {
           "type": 98,
           "major": 8,
-          "minor": 32,
+          "minor": 0,
           "range": 16
         },
         "unix_device_names": [
           "/dev/disk/by-id/usb-Generic_STORAGE_DEVICE_000000001532-0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:1:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:2:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:1:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:2:1.0-scsi-0:0:0:0",
-          "/dev/sdc"
+          "/dev/sda"
         ],
-        "unix_device_name2": "/dev/sg2",
+        "unix_device_name2": "/dev/sg0",
         "unix_device_number2": {
           "type": 99,
           "major": 21,
-          "minor": 2,
+          "minor": 0,
           "range": 1
         },
         "resources": [
@@ -835,90 +1009,6 @@
         "drivers": ["sd", "usb-storage"],
         "driver_modules": ["sd_mod", "usb_storage"],
         "module_alias": "usb:v05E3p0749d1532dc00dsc00dp00ic08isc06ip50in00"
-      },
-      {
-        "index": 30,
-        "attached_to": 22,
-        "class_list": ["disk", "usb", "scsi", "block_device"],
-        "bus_type": {
-          "hex": "0084",
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 1,
-          "number": 0
-        },
-        "base_class": {
-          "hex": "0106",
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "hex": "152d",
-          "value": 5421
-        },
-        "device": {
-          "hex": "0561",
-          "name": "0",
-          "value": 1377
-        },
-        "revision": {
-          "hex": "0000",
-          "name": "~",
-          "value": 0
-        },
-        "serial": "000000004EBF",
-        "model": "0",
-        "sysfs_id": "/class/block/sda",
-        "sysfs_bus_id": "1:0:0:0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:0",
-        "unix_device_name": "/dev/sda",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 0,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG",
-          "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:0",
-          "/dev/sda"
-        ],
-        "unix_device_name2": "/dev/sg0",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 0,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 19074048,
-            "heads": 64,
-            "sectors": 32,
-            "size": "0x0",
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 39063650304,
-            "value_2": 512
-          }
-        ],
-        "driver": "uas",
-        "driver_module": "uas",
-        "drivers": ["sd", "uas"],
-        "driver_modules": ["sd_mod", "uas"]
       }
     ],
     "graphics_card": [
@@ -1028,7 +1118,7 @@
     ],
     "hub": [
       {
-        "index": 33,
+        "index": 34,
         "attached_to": 22,
         "class_list": ["usb", "hub"],
         "bus_type": {
@@ -1178,7 +1268,7 @@
         "module_alias": "usb:v1D6Bp0003d0615dc09dsc00dp03ic09isc00ip00in00"
       },
       {
-        "index": 38,
+        "index": 39,
         "attached_to": 9,
         "class_list": ["usb", "hub"],
         "bus_type": {
@@ -1258,7 +1348,7 @@
         "module_alias": "usb:v1D6Bp0002d0615dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 40,
+        "index": 41,
         "attached_to": 9,
         "class_list": ["usb", "hub"],
         "bus_type": {
@@ -1330,8 +1420,8 @@
     ],
     "keyboard": [
       {
-        "index": 39,
+        "index": 38,
-        "attached_to": 33,
+        "attached_to": 34,
         "class_list": ["keyboard", "usb"],
         "bus_type": {
           "hex": "0086",
@@ -1368,8 +1458,8 @@
           "value": 0
         },
         "model": "Logitech USB Receiver",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-5/3-5:1.0",
-        "sysfs_bus_id": "3-2:1.0",
+        "sysfs_bus_id": "3-5:1.0",
         "resources": [
           {
             "type": "baud",
@@ -1439,7 +1529,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 8097124352,
+            "range": 8096096256,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -1628,8 +1718,8 @@
     ],
     "mouse": [
       {
-        "index": 32,
+        "index": 42,
-        "attached_to": 33,
+        "attached_to": 34,
         "class_list": ["mouse", "usb"],
         "bus_type": {
           "hex": "0086",
@@ -1668,8 +1758,8 @@
         "compat_vendor": "Unknown",
         "compat_device": "Generic USB Mouse",
         "model": "Logitech USB Receiver",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.1",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-5/3-5:1.1",
-        "sysfs_bus_id": "3-2:1.1",
+        "sysfs_bus_id": "3-5:1.1",
         "resources": [
           {
             "type": "baud",
@@ -1874,7 +1964,7 @@
         "resources": [
           {
             "type": "hwaddr",
-            "address": 54
+            "address": 48
           },
           {
             "type": "io",
@@ -1899,7 +1989,7 @@
           },
           {
             "type": "phwaddr",
-            "address": 53
+            "address": 54
           },
           {
             "type": "wlan",
@@ -1992,8 +2082,8 @@
     ],
     "network_interface": [
       {
-        "index": 41,
+        "index": 43,
-        "attached_to": 0,
+        "attached_to": 13,
         "class_list": ["network_interface"],
         "base_class": {
           "hex": "0107",
@@ -2001,17 +2091,32 @@
           "value": 263
         },
         "sub_class": {
-          "hex": "0000",
+          "hex": "000a",
-          "name": "Loopback",
+          "name": "WLAN",
-          "value": 0
+          "value": 10
         },
-        "model": "Loopback network interface",
+        "model": "WLAN network interface",
-        "sysfs_id": "/class/net/lo",
+        "sysfs_id": "/class/net/wlan0",
-        "unix_device_name": "lo",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0",
-        "unix_device_names": ["lo"]
+        "unix_device_name": "wlan0",
+        "unix_device_names": ["wlan0"],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 48
           },
           {
-        "index": 42,
+            "type": "phwaddr",
+            "address": 54
+          }
+        ],
+        "driver": "rtw89_8852be",
+        "driver_module": "rtw89_8852be",
+        "drivers": ["rtw89_8852be"],
+        "driver_modules": ["rtw89_8852be"]
+      },
+      {
+        "index": 44,
         "attached_to": 11,
         "class_list": ["network_interface"],
         "base_class": {
@@ -2045,8 +2150,8 @@
         "driver_modules": ["igc"]
       },
       {
-        "index": 43,
+        "index": 45,
-        "attached_to": 13,
+        "attached_to": 0,
         "class_list": ["network_interface"],
         "base_class": {
           "hex": "0107",
@@ -2054,29 +2159,14 @@
           "value": 263
         },
         "sub_class": {
-          "hex": "000a",
+          "hex": "0000",
-          "name": "WLAN",
+          "name": "Loopback",
-          "value": 10
+          "value": 0
         },
-        "model": "WLAN network interface",
+        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/wlan0",
+        "sysfs_id": "/class/net/lo",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0",
+        "unix_device_name": "lo",
-        "unix_device_name": "wlan0",
+        "unix_device_names": ["lo"]
-        "unix_device_names": ["wlan0"],
-        "resources": [
-          {
-            "type": "hwaddr",
-            "address": 54
-          },
-          {
-            "type": "phwaddr",
-            "address": 53
-          }
-        ],
-        "driver": "rtw89_8852be",
-        "driver_module": "rtw89_8852be",
-        "drivers": ["rtw89_8852be"],
-        "driver_modules": ["rtw89_8852be"]
       }
     ],
     "pci": [

machines/vega/services/nextcloud.nix

@@ -0,0 +1,34 @@
+{ config, pkgs, ... }:
+let
+  # ncDomain = "${config.clan.core.vars.generators.vega-nextcloud.files.subdomain.value}.${config.networking.fqdn}";
+  ncDomain = "${config.networking.fqdn}";
+in
+{
+  clan.core.vars.generators.vega-nextcloud = {
+    files.subdomain.secret = false;
+
+    prompts = {
+      subdomain = {
+        persist = true;
+        type = "line";
+        description = "Sub-domain for Nextcloud app. Default:(cloud)";
+      };
+    };
+
+    script = ''cat $prompts/subdomain || echo -n "cloud" > $out/subdomain'';
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  services.nextcloud = {
+    hostName = ncDomain;
+    package = pkgs.nextcloud31;
+  };
+  # services.nginx.virtualHosts."${ncDomain}" = {
+  #   # useACMEHost = "${config.networking.fqdn}";
+  #   # forceSSL = true;
+  # };
+}

machines/vega/services/samba.nix

@@ -1,93 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  sambaUser = lib.filterAttrs (
-    name: user: user.isNormalUser && builtins.elem "samba" user.extraGroups
-  ) config.users.users;
-
-  sharedFolders = {
-    GLOM.users = [
-      "w"
-      "kurogeek"
-      "berwn"
-    ];
-  };
-in
-{
-
-  services.samba = {
-    enable = true;
-    openFirewall = true;
-    settings = {
-      global = {
-        security = "user";
-        workgroup = "WORKGROUP";
-        "server string" = "Glom Vega";
-        interfaces = "eth* en*";
-        "max log size" = "50";
-        "dns proxy" = false;
-        "syslog only" = true;
-        "map to guest" = "Bad User";
-        "guest account" = "nobody";
-      };
-    }
-    // lib.mapAttrs (share: opts: {
-      path = "/mnt/hdd/samba/${share}";
-      comment = share;
-      "force user" = share;
-      "force group" = share;
-      public = "yes";
-      "guest ok" = "yes";
-      "create mask" = "0640";
-      "directory mask" = "0750";
-      writable = "no";
-      browseable = "yes";
-      printable = "no";
-      # TODO
-      # "valid users" = toString opts.users;
-    }) sharedFolders;
-  };
-
-  users.users = lib.mapAttrs (share: opts: {
-    isSystemUser = true;
-    group = share;
-  }) sharedFolders;
-
-  users.groups = lib.mapAttrs (share: opts: { }) sharedFolders;
-
-  systemd.services.samba-smbd.postStart =
-    lib.concatMapStrings (
-      user:
-      let
-        password = config.clan.core.vars.generators."${user}-smb-password".files.password.path;
-      in
-      ''
-        mkdir -p /mnt/hdd/samba/${user}
-        chown ${user}:users /mnt/hdd/samba/${user}
-        # if a password is unchanged, this will error
-        (echo $(<${password}); echo $(<${password})) | ${config.services.samba.package}/bin/smbpasswd -s -a ${user}
-      ''
-    ) (lib.attrNames sambaUser)
-    + lib.concatMapStrings (share: ''
-      mkdir -p /mnt/hdd/samba/${share}
-      chown ${share}:${share} /mnt/hdd/samba/${share}
-    '') (lib.attrNames sharedFolders);
-
-  services.samba-wsdd = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  services.avahi = {
-    publish.enable = true;
-    publish.userServices = true;
-    # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile`
-    nssmdns4 = true;
-    # ^^ Not one hundred percent sure if this is needed- if it aint broke, don't fix it
-    enable = true;
-    openFirewall = true;
-  };
-}

machines/vega/services/ups.nix

@@ -0,0 +1,33 @@
+{ config, ... }:
+{
+  clan.core.vars.generators.ups = {
+    dependencies = [ "root-password" ];
+    files.password = {
+      secret = true;
+      owner = "nutmon";
+      group = "nutmon";
+
+    };
+    script = ''
+      cat $in/root-password/password > $out/password
+    '';
+  };
+  power.ups = {
+    enable = true;
+    mode = "standalone";
+
+    ups."apc" = {
+      driver = "usbhid-ups";
+      port = "auto";
+    };
+    upsmon.monitor."test-monitor" = {
+      powerValue = 1;
+      user = "root";
+      type = "primary";
+      passwordFile = config.clan.core.vars.generators.ups.files.password.path;
+    };
+    upsmon.settings = {
+      RUN_AS_USER = "root";
+    };
+  };
+}

modules/clan/actual-budget/default.nix

@@ -3,11 +3,9 @@
   _class = "clan.service";
   manifest.name = "actual-budget";
   manifest.description = "A local-first personal finance app ";
-  manifest.readme = "A local-first personal finance app";
   manifest.categories = [ "System" ];
 
   roles.default = {
-    description = "A default server role.";
 
     perInstance.nixosModule =
       {

modules/clan/actual-budget/flake-module.nix

@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.service-actual-budget = {
+      clan.nixosTests.actual-budget = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/actual-budget" = module;

modules/clan/flake-module.nix

@@ -1,7 +1,4 @@
-{
+{ inputs, lib, ... }:
-  inputs,
-  ...
-}:
 {
   imports =
     let
@@ -19,7 +16,12 @@
 
       # Create import paths for each valid directory
       imports = (map (name: ./. + "/${name}/flake-module.nix") validModuleDirs) ++ [
-        inputs.clan-core.flakeModules.testModule
+        (import (inputs.clan-core + "/lib/flake-parts/clan-nixos-test.nix") {
+          inherit lib;
+          flake-parts-lib = inputs.flake-parts.lib;
+          self = inputs.clan-core;
+          inputs = inputs.clan-core.clan.self.inputs;
+        })
       ];
     in
     imports;

modules/clan/git-daemon/default.nix

@@ -1,174 +0,0 @@
-{ ... }:
-{
-  _class = "clan.service";
-  manifest.name = "git-daemon";
-  manifest.description = "a really simple server for git repositories";
-  manifest.readme = "a really simple server for git repositories";
-  manifest.categories = [ "System" ];
-
-  roles.default = {
-    description = "a default server role";
-    interface =
-      { lib, ... }:
-      {
-        options = with lib; {
-          directory = lib.mkOption {
-            type = types.str;
-            default = "/var/git";
-          };
-          repositories = lib.mkOption {
-            type =
-              with lib.types;
-              attrsOf (
-                submodule (
-                  { name, ... }:
-                  {
-                    options = {
-                      name = lib.mkOption {
-                        type = str;
-                        default = name;
-                      };
-                      read-access = lib.mkOption {
-                        type = listOf str;
-                        default = [ ];
-                      };
-                      write-access = lib.mkOption {
-                        type = listOf str;
-                        default = [ ];
-                      };
-                    };
-                  }
-                )
-              );
-            default = { };
-          };
-        };
-      };
-    perInstance =
-      {
-        settings,
-        ...
-      }:
-      {
-        nixosModule =
-          {
-            pkgs,
-            lib,
-            config,
-            ...
-          }:
-          {
-            systemd.services.git-init = {
-              serviceConfig = {
-                Type = "oneshot";
-                User = config.services.gitDaemon.user;
-                Group = config.services.gitDaemon.group;
-                ExecStartPre = toString [
-                  "+${pkgs.coreutils}/bin/install"
-                  "--directory"
-                  "--owner=${config.services.gitDaemon.user}"
-                  "--group=${config.services.gitDaemon.group}"
-                  "--mode=0750"
-                  settings.directory
-                ];
-                ExecStart =
-                  let
-                    git-template = pkgs.stdenv.mkDerivation {
-                      name = "git-template";
-                      buildCommand = ''
-                        cp --no-preserve=mode,ownership --recursive \
-                          ${pkgs.git}/share/git-core/templates $out
-                        install -m550 $out/hooks/post-update{.sample,}
-                      '';
-                    };
-                    init-script =
-                      { name, ... }:
-                      pkgs.writeShellScript "git-init-${name}" ''
-                        ${pkgs.git}/bin/git init \
-                          --bare --template=${git-template} --shared=0660 \
-                          ${settings.directory}/${name}.git
-                        ${pkgs.git}/bin/git \
-                          -C ${settings.directory}/${name}.git \
-                          config set receive.denyNonFastforwards false
-                      '';
-                  in
-                  map init-script (lib.attrValues settings.repositories);
-              };
-            };
-
-            services.gitDaemon = {
-              enable = true;
-              user = "git";
-              group = "git";
-              options =
-                let
-                  firewall = pkgs.writeText "git-daemon-firewall.json" (
-                    builtins.toJSON (builtins.attrValues settings.repositories)
-                  );
-                  hook = pkgs.writers.writePython3 "hook.py" { flakeIgnore = [ "E" ]; } ''
-                    import os, sys, enum, pathlib, ipaddress, json
-
-                    class Service(enum.Enum):
-                        UploadPack = enum.auto()
-                        ReceivePack = enum.auto()
-                        UploadArchive = enum.auto()
-
-                        @classmethod
-                        def parse(cls, string):
-                            return {
-                                'upload-pack': cls.UploadPack,
-                                'receive-pack': cls.ReceivePack,
-                                'upload-archive': cls.UploadArchive
-                            }[string]
-
-                        @property
-                        def service(self):
-                            return {
-                                UploadPack: 'read-access',
-                                ReceivePack: 'write-access'
-                            }[self]
-                    UploadPack = Service.UploadPack
-                    ReceivePack = Service.ReceivePack
-
-                    def parse_remote_addr(remote_addr):
-                        if remote_addr.startswith('[') and remote_addr.endswith(']'):
-                            return ipaddress.ip_address(remote_addr[1:-1])
-                        return ipaddress.ip_address(remote_addr)
-
-                    service = Service.parse(sys.argv[1])
-                    repo = pathlib.Path(sys.argv[2]).stem
-                    client = parse_remote_addr(os.environ['REMOTE_ADDR'])
-
-                    with open("${firewall}", 'r') as f:
-                        firewall = json.load(f)
-
-                    for rule in firewall:
-                        if rule["name"] == repo:
-                           for network in rule[service.service]:
-                               if client in ipaddress.ip_network(network):
-                                   sys.exit(0)
-                    print('stairway denied')
-                    sys.exit(1)
-                  '';
-                in
-                toString [
-                  "--enable=upload-pack"
-                  "--enable=receive-pack"
-                  "--disable=upload-archive"
-                  "--access-hook=${hook}"
-                  "--informative-errors"
-                ];
-              exportAll = true;
-              basePath = settings.directory;
-            };
-
-            systemd.services.git-daemon = {
-              requires = [ "git-init.service" ];
-              after = [ "git-init.service" ];
-            };
-
-            networking.firewall.allowedTCPPorts = [ 9418 ];
-          };
-      };
-  };
-}

modules/clan/git-daemon/flake-module.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-let
-  module = lib.modules.importApply ./default.nix { };
-in
-{
-  clan.modules = {
-    git-daemon = module;
-  };
-}

modules/clan/grafana/default.nix

@@ -3,11 +3,9 @@
   _class = "clan.service";
   manifest.name = "grafana";
   manifest.description = "Platform for data analytics and monitoring";
-  manifest.readme = "Platform for data analytics and monitoring";
   manifest.categories = [ "System" ];
 
   roles.default = {
-    description = "A default server role";
 
     perInstance.nixosModule =
       {

modules/clan/grafana/flake-module.nix

@@ -9,7 +9,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.service-grafana = {
+      clan.nixosTests.grafana = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/grafana" = module;

modules/clan/home-profiles/flake-module.nix

@@ -1,6 +0,0 @@
-{ lib, ... }:
-{
-  clan.modules = {
-    home-user = lib.modules.importApply ./home-user { };
-  };
-}

modules/clan/home-profiles/home-user/default.nix

@@ -1,64 +0,0 @@
-{ ... }:
-{
-  _class = "clan.service";
-  manifest.name = "common-user-home-manager";
-  manifest.description = "General users' home-manager profile generator";
-  manifest.readme = "General users' home-manager profile generator";
-  manifest.categories = [ "System" ];
-
-  roles.default = {
-    description = "a default role for the user";
-    interface =
-      { lib, ... }:
-      {
-        options = {
-          username = lib.mkOption {
-            type = lib.types.str;
-          };
-          kbLayout = lib.mkOption {
-            type = lib.types.str;
-            default = "us";
-          };
-          kbOptions = lib.mkOption {
-            type = lib.types.str;
-            default = "grp:win_space_toggle";
-          };
-        };
-      };
-    perInstance =
-      { settings, ... }:
-      {
-        nixosModule =
-          { inputs, ... }:
-          let
-            username = settings.username;
-          in
-          {
-            imports = [ inputs.home-manager.nixosModules.home-manager ];
-
-            users.users.${username} = {
-              initialPassword = "";
-              isNormalUser = true;
-              extraGroups = [
-                "audio"
-                "video"
-                "networkmanager"
-              ];
-            };
-
-            services.xserver = {
-              enable = true;
-              xkb.layout = settings.kbLayout;
-              xkb.options = settings.kbOptions;
-            };
-
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.${username} = ./home.nix;
-            home-manager.extraSpecialArgs = {
-              inherit inputs username;
-            };
-          };
-      };
-  };
-}

modules/clan/home-profiles/home-user/home.nix

@@ -1,24 +0,0 @@
-{
-  osConfig,
-  pkgs,
-  lib,
-  username,
-  ...
-}:
-{
-  home = {
-    inherit username;
-    homeDirectory = lib.mkForce "/home/${username}";
-    stateVersion = osConfig.system.stateVersion;
-    packages = with pkgs; [
-      libreoffice
-      element-desktop
-      brave
-      firefox
-      keepassxc
-      vlc
-      thunderbird
-    ];
-  };
-  programs.home-manager.enable = true;
-}

modules/clan/jukebox/default.nix

@@ -1,138 +0,0 @@
-{ ... }:
-{
-  _class = "clan.service";
-  manifest.name = "jukebox";
-  manifest.description = "mpd server, library on removable disks";
-  manifest.readme = "mpd server, library on removable disks";
-  manifest.categories = [ "System" ];
-
-  roles.default = {
-    description = "a default server role";
-    interface =
-      { lib, ... }:
-      {
-        options = {
-          baseDir = lib.mkOption {
-            type = lib.types.str;
-            default = "/mnt/jukebox";
-          };
-          binds = lib.mkOption {
-            type = with lib.types; listOf str;
-            default = [ ];
-          };
-          disks = lib.mkOption {
-            type =
-              with lib.types;
-              attrsOf (
-                submodule (
-                  { name, ... }:
-                  {
-                    options = {
-                      name = lib.mkOption {
-                        type = str;
-                        default = name;
-                      };
-                      uuid = lib.mkOption {
-                        type = str;
-                      };
-                      mountOptions = lib.mkOption {
-                        type = listOf str;
-                        default = [ ];
-                      };
-                    };
-                  }
-                )
-              );
-            default = { };
-            description = "disks comprising library";
-          };
-        };
-      };
-    perInstance =
-      {
-        settings,
-        ...
-      }:
-      {
-        nixosModule =
-          {
-            config,
-            lib,
-            pkgs,
-            ...
-          }:
-          {
-            services.pulseaudio.enable = true;
-
-            # workaround cookie permissions
-            services.pulseaudio.tcp.enable = true;
-            services.pulseaudio.tcp.anonymousClients = {
-              allowedIpRanges = [ "127.0.0.1" ];
-              allowAll = true;
-            };
-
-            systemd.tmpfiles.rules = [
-              "d ${settings.baseDir} 0755 root root"
-            ];
-
-            fileSystems =
-              let
-                disk2fs =
-                  {
-                    name,
-                    uuid,
-                    mountOptions,
-                    ...
-                  }:
-                  lib.nameValuePair "${settings.baseDir}/${name}" {
-                    device = "/dev/disk/by-uuid/${uuid}";
-                    fsType = "auto";
-                    options = [
-                      "noauto"
-                      "nofail"
-                    ]
-                    ++ mountOptions;
-                  };
-              in
-              lib.listToAttrs (lib.mapAttrsToList (_: disk2fs) settings.disks);
-
-            services.udev.extraRules =
-              let
-                translate-prefix = path: (lib.removePrefix "-" (lib.replaceStrings [ "/" ] [ "-" ] path));
-                mount-name = name: "${translate-prefix settings.baseDir}-${name}.mount";
-                disk2rule =
-                  { name, uuid, ... }:
-                  lib.concatStringsSep ", " [
-                    ''ACTION=="add"''
-                    ''SUBSYSTEM=="block"''
-                    ''ENV{DEVLINKS}=="*/dev/disk/by-uuid/${uuid}*"''
-                    ''ENV{SYSTEMD_WANTS}="${mount-name name}"''
-                  ];
-              in
-              lib.concatMapStringsSep "\n" disk2rule (lib.attrValues settings.disks);
-
-            services.mpd = {
-              enable = true;
-              openFirewall = true;
-              settings = {
-                bind_to_address = "any";
-                music_directory = settings.baseDir;
-                audio_output = [
-                  {
-                    type = "pulse";
-                    name = "jukebox";
-                    server = "localhost";
-                  }
-                ];
-              };
-            };
-
-            networking.firewall.interfaces = lib.genAttrs settings.binds (_: {
-              allowedTCPPorts = [ config.services.mpd.settings.port ];
-            });
-
-            environment.systemPackages = [ pkgs.mpc ];
-          };
-      };
-  };
-}

modules/clan/jukebox/flake-module.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-let
-  module = lib.modules.importApply ./default.nix { };
-in
-{
-  clan.modules = {
-    jukebox = module;
-  };
-}

modules/clan/nextcloud/default.nix

@@ -3,11 +3,9 @@
   _class = "clan.service";
   manifest.name = "nextcloud";
   manifest.description = "Nextcloud server, a safe home for all your data";
-  manifest.readme = "Nextcloud server, a safe home for all your data";
   manifest.categories = [ "System" ];
 
   roles.default = {
-    description = "a default server role";
 
     perInstance.nixosModule =
       {

modules/clan/nextcloud/flake-module.nix

@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.service-nextcloud = {
+      clan.nixosTests.nextcloud = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/nextcloud" = module;

modules/clan/paperless/default.nix

@@ -3,11 +3,9 @@
   _class = "clan.service";
   manifest.name = "paperless";
   manifest.description = "A community-supported supercharged document management system: scan, index and archive all your documents";
-  manifest.readme = "A community-supported supercharged document management system: scan, index and archive all your documents";
   manifest.categories = [ "System" ];
 
   roles.default = {
-    description = "a default server role";
 
     perInstance.nixosModule =
       {

modules/clan/paperless/flake-module.nix

@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.service-paperless = {
+      clan.nixosTests.paperless = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/paperless" = module;

modules/clan/personal-computer/automatic-timezone.nix

@@ -1,8 +0,0 @@
-{ lib, ... }:
-{
-  services.automatic-timezoned.enable = true;
-  services.geoclue2 = {
-    enableDemoAgent = lib.mkForce true;
-    geoProviderUrl = "https://beacondb.net/v1/geolocate";
-  };
-}

modules/clan/personal-computer/default.nix

@@ -1,21 +0,0 @@
-{ ... }:
-{
-  _class = "clan.service";
-  manifest.name = "personal-computer";
-  manifest.description = "A service for configuring personal computer such as printing, automatic-timezone, etc.";
-  manifest.readme = "A service for configuring personal computer such as printing, automatic-timezone, etc.";
-  manifest.categories = [ "System" ];
-
-  roles.default = {
-    description = "an only one default role";
-    perInstance.nixosModule =
-      { inputs, lib, ... }:
-      {
-        imports = [
-          (inputs.import-tree.initFilter (
-            p: !lib.hasSuffix "default.nix" p && !lib.hasSuffix "flake-module.nix" p
-          ) ./.)
-        ];
-      };
-  };
-}

modules/clan/personal-computer/desktop-environment.nix

@@ -1,4 +0,0 @@
-{ config, ... }:
-{
-  security.pam.services."sddm".kwallet.enable = config.services.desktopManager.plasma6.enable;
-}

modules/clan/personal-computer/flake-module.nix

@@ -1,6 +0,0 @@
-{ lib, ... }:
-{
-  clan.modules = {
-    personal-computer = lib.modules.importApply ./default.nix { };
-  };
-}

modules/clan/personal-computer/libinput.nix

@@ -1,11 +0,0 @@
-{
-  services = {
-    libinput = {
-      enable = true;
-      touchpad = {
-        disableWhileTyping = true;
-        naturalScrolling = true;
-      };
-    };
-  };
-}

modules/clan/personal-computer/printing.nix

@@ -1,62 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  allowManageGroups = [
-    "root"
-    "wheel"
-    "lpadmin"
-  ];
-  polkitAllowGroups = builtins.concatStringsSep "||" (
-    builtins.map (group: ''subject.isInGroup("${group}")'') allowManageGroups
-  );
-
-  printerMember = lib.map (user: user.name) (
-    lib.attrsets.attrsToList (
-      lib.attrsets.filterAttrs (name: value: value.isNormalUser) config.users.users
-    )
-  );
-
-in
-{
-  services.printing = {
-    enable = true;
-    drivers = [
-      pkgs.brlaser
-      pkgs.gutenprint
-    ];
-
-    extraFilesConf = ''
-      SystemGroup ${builtins.concatStringsSep " " allowManageGroups}
-    '';
-  };
-
-  security.polkit = {
-    enable = true;
-
-    extraConfig = ''
-      polkit.addRule(function(action, subject) {
-        var actionMatchs = (
-          action.id.indexOf('org.opensuse.cupspkhelper.mechanism.') === 0
-        );
-        if (actionMatchs) {
-          if (${polkitAllowGroups}) {
-            return polkit.Result.YES
-          }
-        }
-      });
-    '';
-  };
-
-  hardware.sane = {
-    enable = true;
-  };
-
-  users.groups.lpadmin.members = printerMember;
-  users.groups.lp.members = printerMember;
-  users.groups.scanner.members = printerMember;
-
-}

modules/clan/personal-computer/users.nix

@@ -1,11 +0,0 @@
-{ lib, ... }:
-{
-  users.mutableUsers = lib.mkForce true;
-  security.polkit.extraConfig = ''
-    polkit.addRule(function(action, subject) {
-      if ((action.id == "org.freedesktop.accounts.change-own-password")) {
-        return polkit.Result.AUTH_SELF;
-      }
-    });
-  '';
-}

modules/clan/personal-computer/wireless.nix

@@ -1,4 +0,0 @@
-{
-  networking.networkmanager.enable = true;
-  hardware.bluetooth.enable = true;
-}

modules/clan/phonebox/default.nix

@@ -1,455 +0,0 @@
-{
-  clanLib,
-  ...
-}:
-{
-  _class = "clan.service";
-  manifest.name = "phonebox";
-  manifest.description = "A peer to peer phone relay network built on top of yggdrasil.";
-  manifest.readme = "A peer to peer phone relay network built on top of yggdrasil.";
-  manifest.categories = [ "System" ];
-
-  roles.default = {
-    description = "a default server role";
-    interface =
-      { lib, ... }:
-      {
-        options.ata-ethernet-iface = lib.mkOption {
-          type = lib.types.str;
-          description = "An Ethernet interface that connect to ATA box.";
-          default = "enp2s0";
-        };
-        options.ownerName = lib.mkOption {
-          type = lib.types.str;
-          description = "";
-          default = "";
-        };
-      };
-    perInstance =
-      {
-        roles,
-        settings,
-        ...
-      }:
-      {
-
-        nixosModule =
-          {
-            lib,
-            config,
-            pkgs,
-            ...
-          }:
-          let
-            asterisk = pkgs.asterisk.overrideAttrs (old: {
-              propagatedNativeBuildInputs = [ pkgs.spandsp3 ];
-            });
-
-            machines = lib.attrNames roles.default.machines;
-
-            user = "asterisk";
-            faxDir = "/run/asterisk/fax";
-            rtpPortFrom = 10000;
-            rtpPortTo = 20000;
-            ata-interface = settings.ata-ethernet-iface;
-
-            contactList = builtins.map (machineName: {
-              name = "${clanLib.getPublicValue {
-                flake = config.clan.core.settings.directory;
-                machine = machineName;
-                generator = "phonebox";
-                file = "owner-name";
-                default = null;
-              }}";
-              number = "${
-                clanLib.getPublicValue {
-                  flake = config.clan.core.settings.directory;
-                  machine = machineName;
-                  generator = "phonebox";
-                  file = "server-prefix-number";
-                  default = null;
-                }
-              }${
-                clanLib.getPublicValue {
-                  flake = config.clan.core.settings.directory;
-                  machine = machineName;
-                  generator = "phonebox";
-                  file = "ata-local-number";
-                  default = null;
-                }
-              }";
-            }) machines;
-
-            createContactListTiff =
-              let
-                contactTXT = lib.concatStringsSep "\n" (
-                  builtins.map (contact: "${contact.number}\t\t: \t\t${contact.name}") contactList
-                );
-              in
-              pkgs.writeShellApplication {
-                name = "create-contact-tiff";
-                text = ''
-                  magick -background white -fill black -pointsize 20 -font DejaVu-Sans label:"${contactTXT}" "$1"
-                  magick "$1" -border 20x50 -bordercolor white "$1"
-                  magick "$1" -resize 1728x -units PixelsPerInch -compress Group4 -density 204x196 -monochrome -depth 1 "$1"
-                '';
-                runtimeInputs = [ pkgs.imagemagick ];
-              };
-
-            genServerSIPEndpoint =
-              { hostname, address }:
-              ''
-                [${hostname}](internal_endpoint)
-                aors=${hostname}
-
-                [${hostname}](ip_auth)
-                endpoint=${hostname}
-                match=[${address}]
-
-                [${hostname}](dynamiic_aor)
-                contact=sip:[${address}]
-              '';
-
-            genLocalSIPEndpoint =
-              { localNumber }:
-              ''
-                [${localNumber}](internal_endpoint)
-                aors=${localNumber}
-                auth=${localNumber}
-
-                [${localNumber}](userpass_auth)
-                username=${localNumber}
-                password=${localNumber}
-
-                [${localNumber}](dynamiic_aor)
-                max_contacts=1
-              '';
-
-            genLocalExtenConf =
-              { localNumber }:
-              ''
-                exten => ${localNumber},1,Dial(PJSIP/${localNumber},20)
-              '';
-            genExtentConf =
-              {
-                prefixNumber,
-                hostname,
-                localNumber,
-              }:
-              let
-                replaceWithX =
-                  ln: builtins.concatStringsSep "" (builtins.genList (_: "X") (builtins.stringLength ln));
-              in
-              ''
-                exten => _${prefixNumber}${replaceWithX localNumber},1,Dial(PJSIP/''${EXTEN:${builtins.toString (builtins.stringLength prefixNumber)}}@${hostname},30)
-              '';
-
-            getYggdrasilIP =
-              machineName:
-              if config.clan.core.vars.generators.yggdrasil.files.address ? value then
-                clanLib.getPublicValue {
-                  flake = config.clan.core.settings.directory;
-                  machine = machineName;
-                  generator = "yggdrasil";
-                  file = "address";
-                  default = null;
-                }
-              else
-                throw "clanService/yggdrasil is required";
-          in
-          {
-            clan.core.vars.generators.phonebox = builtins.break {
-              files = {
-                server-prefix-number.secret = false;
-                ata-local-number.secret = false;
-                owner-name.secret = false;
-              };
-
-              prompts = {
-                server-prefix-number = {
-                  type = "line";
-                  persist = true;
-                  description = "Server prefix number: indicate server to connect to [10XX]";
-                };
-                ata-local-number = {
-                  persist = true;
-                  type = "line";
-                  description = "Local suffix number: indicate local number on the server [XX00]";
-                };
-                owner-name = {
-                  persist = true;
-                  type = "line";
-                  description = "The owner's name for this unit";
-                };
-              };
-
-              script = ''
-                cat $prompts/server-prefix-number > $out/server-prefix-number
-                cat $prompts/ata-local-number > $out/ata-local-number
-                cat $prompts/owner-name > $out/owner-name
-              '';
-            };
-
-            networking.interfaces = {
-              ${ata-interface} = {
-                useDHCP = false;
-                ipv4.addresses = [
-                  {
-                    address = "192.168.254.1";
-                    prefixLength = 24;
-                  }
-                ];
-              };
-            };
-
-            services.dnsmasq = {
-              enable = true;
-
-              settings = {
-                bind-dynamic = true;
-                listen-address = "192.168.254.1";
-                # enable-ra = true;
-                domain-needed = true;
-                domain = "localhost";
-                dhcp-range = [
-                  "192.168.254.100,192.168.254.100,255.255.255.0,3m"
-                ];
-                dhcp-leasefile = "/dev/null";
-                dhcp-option = [
-                  "3,192.168.254.1"
-                ];
-                interface = [ ata-interface ];
-              };
-            };
-
-            services.nginx = {
-              enable = true;
-              virtualHosts = {
-                "_" = {
-                  locations."/" = {
-                    proxyPass = "http://192.168.254.100";
-                    extraConfig = ''
-                      client_max_body_size 100M;
-                    '';
-                  };
-                };
-              };
-            };
-
-            networking.firewall.allowedUDPPortRanges = [
-              {
-                from = rtpPortFrom;
-                to = rtpPortTo;
-              }
-            ];
-
-            networking.firewall.allowedUDPPorts = [
-              53
-              67
-              5060
-            ];
-            networking.firewall.allowedTCPPorts = [
-              53
-            ];
-            networking.firewall.interfaces =
-              let
-                matchAll = if !config.networking.nftables.enable then "zt+" else "zt*";
-              in
-              {
-                "${matchAll}".allowedTCPPorts = [ 80 ];
-              };
-
-            services.asterisk = {
-              enable = lib.mkDefault true;
-              package = lib.mkDefault asterisk;
-              confFiles =
-                let
-                  nodes = builtins.foldl' (
-                    nodes: name:
-                    nodes
-                    ++ [
-                      {
-                        hostname = name;
-                        address = getYggdrasilIP name;
-                        prefixNumber = clanLib.getPublicValue {
-                          flake = config.clan.core.settings.directory;
-                          machine = name;
-                          generator = "phonebox";
-                          file = "server-prefix-number";
-                          default = null;
-                        };
-
-                        localNumber = clanLib.getPublicValue {
-                          flake = config.clan.core.settings.directory;
-                          machine = name;
-                          generator = "phonebox";
-                          file = "ata-local-number";
-                          default = null;
-                        };
-                      }
-                    ]
-                  ) [ ] machines;
-                in
-                {
-                  "logger.conf" = ''
-                    [general]
-                    dateformat = %F %T.%3q ; ISO 8601 date format with milliseconds
-                    use_callids = yes
-                    appendhostname = no
-                    queue_log = yes
-                    queue_log_to_file = no
-                    queue_log_name = queue_log
-                    queue_log_realtime_use_gmt = no
-                    rotatestrategy = rotate
-                    exec_after_rotate=gzip -9 $\{filename\}.2
-                    [logfiles]
-                    console => notice,warning,error
-                    security => security
-                    messages => notice,warning,error
-                    full => notice,warning,error,verbose,dtmf,fax
-                    syslog.local0 => notice,warning,error
-                  '';
-
-                  "modules.conf" = ''
-                    [modules]
-                    autoload=yes
-
-                    load => res_fax_spandsp.so
-                  '';
-
-                  # Dial plan config
-                  "extensions.conf" =
-                    let
-                      serverConf = builtins.foldl' (
-                        config: node:
-                        config
-                        + (genExtentConf {
-                          inherit (node) prefixNumber hostname localNumber;
-                        })
-                      ) "" nodes;
-                    in
-                    ''
-                      [from-internal]
-                      exten => 999,1,Answer()
-                      same  =>     n,Playback(hello-world)
-                      same  =>     n,Hangup()
-
-                      exten => 000,1,Answer()
-                      same => n,ReceiveFAX(${faxDir}/echo-''${UNIQUEID}.tiff)
-                      same => n,Set(FAXFILE=${faxDir}/echo-''${UNIQUEID}.tiff)
-                      same => n,Set(FAXECHO=true)
-
-                      exten => 888,1,Answer()
-                      same => n,Set(FAXFILE=${faxDir}/contact.tiff)
-                      same => n,System(${lib.getExe createContactListTiff} ''${FAXFILE})
-                      same => n,Set(FAXECHO=true)
-                      same => n,Playback(vm-goodbye)
-                      same => n,Wait(3)
-
-                      exten => h,1,GotoIf($[''${FAXECHO}]?sendfax)
-                      same => n,Hangup()
-                      same => n(sendfax),Originate(PJSIP/00,app,SendFAX,''${FAXFILE})
-                      same => n,Set(FAXECHO=false)
-
-                    ''
-                    + (genLocalExtenConf {
-                      localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
-                    })
-                    + serverConf;
-
-                  "rtp.conf" = ''
-                    [general]
-                    rtpstart=${builtins.toString rtpPortFrom}
-                    rtpend=${builtins.toString rtpPortTo}
-                  '';
-
-                  "pjsip.conf" =
-                    let
-                      serverConf = builtins.foldl' (
-                        conf: node:
-                        conf
-                        + (genServerSIPEndpoint {
-                          hostname = node.hostname;
-                          address = node.address;
-                        })
-                      ) "" nodes;
-                    in
-                    ''
-                      [transport-udp]
-                      type=transport
-                      protocol=udp
-                      bind=0.0.0.0
-                      [transport-udp6]
-                      type=transport
-                      protocol=udp
-                      bind=::
-
-                      [base_endpoint](!)
-                      type=endpoint
-                      disallow=all
-                      allow=ulaw,alaw,g722,gsm
-                      direct_media=no
-
-                      [internal_endpoint](!,base_endpoint)
-                      context=from-internal
-
-                      [userpass_auth](!)
-                      type=auth
-                      auth_type=userpass
-
-                      [ip_auth](!)
-                      type=identify
-                      endpoint=external
-
-                      [dynamiic_aor](!)
-                      type=aor
-
-                    ''
-                    + (genLocalSIPEndpoint {
-                      localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
-                    })
-                    + serverConf;
-                };
-            };
-
-            environment.systemPackages = [
-              createContactListTiff
-            ];
-
-            systemd.tmpfiles.rules = [
-              "d ${faxDir}                            0755 ${user} ${user} - -"
-            ];
-
-            systemd.services.asterisk-watcher = {
-              enable = true;
-              description = "Asterisk Configuration files watcher";
-
-              requires = [ "asterisk.service" ];
-              after = [ "network.target" ];
-              wantedBy = [ "multi-user.target" ];
-              path = with pkgs; [
-                inotify-tools
-                asterisk
-              ];
-              script = ''
-                inotifywait -m -e move /etc/asterisk |
-                while read path action file; do
-                  case "$file" in
-                    pjsip.conf)
-                      echo "restarting pjsip"
-                      asterisk -rx "pjsip reload"
-                      ;;
-                  esac
-                  case "$file" in
-                    extensions.conf)
-                      echo "restarting core"
-                      asterisk -rx "core restart now"
-                      ;;
-                  esac
-                done
-              '';
-            };
-          };
-      };
-  };
-}

modules/clan/phonebox/flake-module.nix

@@ -1,23 +0,0 @@
-{
-  inputs,
-  self,
-  ...
-}:
-let
-  module = ./default.nix;
-in
-{
-  clan.modules = {
-    phonebox = module;
-  };
-  perSystem =
-    { ... }:
-    {
-      clan.nixosTests.service-phonebox = {
-        imports = [ ./tests/vm/default.nix ];
-        _module.args = { inherit self inputs; };
-
-        clan.modules."@clan/phonebox" = module;
-      };
-    };
-}

modules/clan/phonebox/tests/vm/default.nix

@@ -1,59 +0,0 @@
-{
-  self,
-  hostPkgs,
-  config,
-  inputs,
-  lib,
-  ...
-}:
-{
-  name = "service-phonebox";
-  result.update-vars =
-    let
-      relativeDir = lib.removePrefix "${self}/" (toString config.clan.directory);
-    in
-    hostPkgs.writeShellScriptBin "update-vars" ''
-      set -x
-      export PRJ_ROOT=$(git rev-parse --show-toplevel)
-      ${
-        self.inputs.clan-core.packages.${hostPkgs.system}.clan-cli
-      }/bin/clan-generate-test-vars $PRJ_ROOT/${relativeDir} ${config.name}
-    '';
-
-  clan = {
-    directory = ./.;
-    inventory = {
-      machines.server = { };
-
-      instances = {
-        yggdrasil = {
-          module.name = "yggdrasil";
-          roles.default.machines.server = { };
-        };
-        phonebox-test = {
-          module.name = "@clan/phonebox";
-          module.input = "self";
-          roles.default.machines."server".settings = {
-            ata-ethernet-iface = "enp2s0";
-          };
-        };
-      };
-    };
-  };
-
-  nodes = {
-    server = {
-      services.asterisk = {
-      };
-    };
-  };
-
-  testScript = ''
-    start_all()
-
-    server.wait_for_unit("asterisk")
-
-    server.succeed("systemctl status asterisk")
-
-  '';
-}

modules/clan/phonebox/tests/vm/sops/machines/server/key.json

@@ -1,6 +0,0 @@
-[
-  {
-    "publickey": "age1fdkan6n20swmut0sa86g5a6gxrj8qj2sgqe8hxtw32c0u9rr4drqlyr5mf",
-    "type": "age"
-  }
-]

modules/clan/phonebox/tests/vm/sops/secrets/server-age.key/secret

@@ -1,14 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:t+zYfcA2f1sdUNBAl+bRGyhPEl5HZFIu+au6heH3+SoHf0zy+Deh25gaVay/oswIg2q806ozjEnTw9q2eaq0VXwMSAWOoTWteI0=,iv:sXoOmfzoCv6GHe21n2Elxr/GTdViI5vfLzMwOLvf1F4=,tag:Fmo9MjEaKV3BehR/bYRdVw==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzVlo0YjZFVFF2VkFlSzBL\ndHp4YTQ5RlNxV2FWNnNScTh5d0hXR05RL0NVCnBVUENNNjg0dTFVcmx3N3djZ25l\ncmxYTVVrNGhGSkdwVThoaC9UVTQ3L2sKLS0tIG1uREdFcXNubGxzUUQ1Rkh5Wnlx\nRG5OZmJwaGh2dkt6RSttb0gxZ3FBaEkKZzwUuQmOeBk5kfRfVVdqgNvsTU1Ssb/I\nx9Iv9w/YKHDmmcFLcAbGAHbS0/Js0YqBKZonxEMDdWP/+/F+Pv8LqQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-10-31T07:08:30Z",
-		"mac": "ENC[AES256_GCM,data:CBuTnVIta0eFqlB7ZpDkzPOEGbIQbb5oCpksI4umscB3uE0HM3j4N5r6bCPEcYpehB3qWXuCxlj4NfH7zmp6CDq6Be6bfpB1f8MCwTlPvQUho2f31so3U/g99q6ZyWI2rJO50dzn77bdma3JXo9VQb3uRqJ0mk72IYXFwdHvO9s=,iv:9uwjtGYpqsLcXRoBFmjJjfHUq7R47ZqkrKEXMulw4OY=,tag:4Auq3mnhlusogyW44SJfqg==,type:str]",
-		"version": "3.11.0"
-	}
-}

modules/clan/phonebox/tests/vm/sops/secrets/server-age.key/users/admin

@@ -1 +0,0 @@
-../../../users/admin

modules/clan/phonebox/tests/vm/sops/users/admin/key.json

@@ -1,4 +0,0 @@
-{
-  "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
-  "type": "age"
-}

modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/ata-local-number/value

@@ -1 +0,0 @@
-fake_line_value

modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/ata-password/machines/server

@@ -1 +0,0 @@
-../../../../../../sops/machines/server

modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/ata-password/secret

@@ -1,18 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:L4fWAVQdQP2tgYPzUnDY5X0=,iv:fWeTc1buW/JI/8qngZwzDp+wq2OTZPGdItqG0Up5eZ8=,tag:RJt6PQdCisDhtbr3ph3fWA==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1fdkan6n20swmut0sa86g5a6gxrj8qj2sgqe8hxtw32c0u9rr4drqlyr5mf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFK2x0SkcxK2RxTDRvOEpZ\nTS9QNGJxbmZIL2xtUWxyNjA2VDNVWEQzQVc4CkkxeEZDQm1mQVdUUzVIQThDVkV3\nU2lWbnlnb3lqWDZ0NWRqa2RJV0pVK1UKLS0tIHc5eUJBUUtiL0NwZDRnN004UEtr\nYnU2SWlFOGlucTdydGVmZCtGK3NjS28KkNAxwz9MesicLWtViL302AwZYdiTHmd5\nppbwelisNVlsYHSa5ybVDYER4IUz1d8AKO0jtS7qEDfT53R36swSAA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArbEpzdk0xQTFkM2V0K2xz\nRFhDak0ybkhZUjJJdVI4YTl3cStXT2hTZDBFCmRvQ3ZXYkQ1NktCb004ZE1FS1FF\naSt4RlVXSlRhYWdlQ3htTkdkb2dyVDAKLS0tIG16VFNQM0dnaGVSRmlFRFB0WWtW\nN0dPL08rV01sY3ovRnEvUnNMaWVhd2sKvQIZIo5pPMXKh9Ea3ZgHj99Dn1X3JkmB\noscG8S7HOJh/cw+uITmkuv00TyIA9pid6L1kXvfcfv+tcuY9H1Vg4w==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-10-31T07:08:30Z",
-		"mac": "ENC[AES256_GCM,data:bmvshL97XNvNYYg0EjkUAQViHpKJ/+A+CGE90/uSM2WXooJF5yzvVJSHLAuYxWM295awN8ygTRUZ2VJ0SyfjzjAyUIH4SxqlrgywqMouyVsiFDAB6R4AmMmbvvC6rSs/TSMOwYC5pchrISbpsE2kmJnAXCqcev6Q0fl8Sa1PSxo=,iv:BuBQCFb3EWfG+bPzgaRDseDq6MJQ/Fs8okvksvEj1bA=,tag:n14VDbQk+zl+XbJPkTRAGg==,type:str]",
-		"version": "3.11.0"
-	}
-}

modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/ata-password/users/admin

@@ -1 +0,0 @@
-../../../../../../sops/users/admin

modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/owner-name/value

@@ -1 +0,0 @@
-fake_line_value

modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/server-prefix-number/value

@@ -1 +0,0 @@
-fake_line_value

modules/clan/phonebox/tests/vm/vars/per-machine/server/state-version/version/value

@@ -1 +0,0 @@
-25.11

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/address/value

@@ -1 +0,0 @@
-202:fe87:1ca6:3cfd:e095:c2b1:321c:c391

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/machines/server

@@ -1 +0,0 @@
-../../../../../../sops/machines/server

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/secret

@@ -1,18 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:0LwQxArH6fpIYpGIEzPtjh8elyKSaed7L+KqgnIlPVneR0UbsbOM6p5kVGTRPh5LWH6jmkURCqc2c5oT5CNLBePLQcgvtfLDSFWyyPrD9WtBSPu+YGF7K51JUUIkX07//LqTQQaM5Uu/STQRIoL1BD0Tofk2woA=,iv:3rSDqBj8N9RsSLijZm7mUUjUhiLHc2yidGkil8NvCD8=,tag:F8zlw9pfMjZdJSObDePLsQ==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1fdkan6n20swmut0sa86g5a6gxrj8qj2sgqe8hxtw32c0u9rr4drqlyr5mf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0NnVzT0lOWnFTUU85c0d5\nZ0Q1b0xkS1NWbWVsc0o1emxLOW5NRU52REFZCjRkUGJHaDhyazdFdkxWaW1XVW53\nb25pUXlDRmhrTHlIWGl6RDJBZ2hTOW8KLS0tIGsxQmlQejkvQk9wTmtMQzZJa2dB\na0piOGlyMzVrTmNOUEhtaDNTWHdwTDAKroQG8KlnWZ6gwu1y0mr0gGezDF1jsS0Y\nC1LUAarHl+lY51sw+HJT88Y9mDfLjvYIMHKS33zdJuBXbNpoIfWyzA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqQVJhYkI1eEFYL0d5OE1F\nSStqV0xPb0pybyt2QWd4SEpiaDhlNDJicTA0CkgrVU9FcThuQktaMThTaXBmWHNV\nd2tpMVVYT21TWUFvMS9wakl4RyszTGsKLS0tIHVVeDdoMUJQaURMOGFkM3dNa3ZG\nMmVPdEg3bmdZZHgwaGpnbFFKUTdvcUUKTaxEfp19+9AJihqx51m0cLz6IuR5pvnT\nt90kZxq+BH3/6gjiDlhwzqztnMbdqQYcVuCDVp/1aVWfThABUZ92aQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-12-05T04:42:06Z",
-		"mac": "ENC[AES256_GCM,data:1/u3c/wf2Gh6PPeVTKKGBxG1FWvN7hyuzx3Qa7yU3yKCD7LDHrrzTbQkFHDo1ZrXixK5NICCw48BWA0Jao0kItu6aU1Dbk5PexZI9ls1eyaDS7nwtZuHKDSEtDYu/kx5kZgQKH9tsokLqKlcoeocS0Mp1tjvUSQsiZFaYsuKaM4=,iv:gCPqFgpwjSONn/JN3dpJOk1BXtdd9cvIAz/NKPuAdKg=,tag:j8upk9sgDiYj5lmfU4V+OQ==,type:str]",
-		"version": "3.11.0"
-	}
-}

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/users/admin

@@ -1 +0,0 @@
-../../../../../../sops/users/admin

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/publicKey/value

@@ -1,3 +0,0 @@
------BEGIN PUBLIC KEY-----
-MCowBQYDK2VwAyEAIC8cazhgQ+1Hqdm8Z43J5ooymP2ytrBEvdfXYz0ryp8=
------END PUBLIC KEY-----

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/yggdrasil-ip/value

@@ -1 +0,0 @@
-201:b9d:4329:71c2:79ca:3648:e86d:4236

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/yggdrasil-secret/machines/server

@@ -1 +0,0 @@
-../../../../../../sops/machines/server

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/yggdrasil-secret/secret

@@ -1,18 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:bAJv40t1hkgMBz4boOEIw9GIY/4UFYI2WZidRrU88ky0JDBwSmHDnxuBFRpdjfAx7sO9d6vSHxAmaf45NlTKwnkUJnaIW0NK+979lXbLV+AG0suc4Vci6fsdbAHofR//3DfTYs03HoALkRUgRemTl7kQtdMB6E6LN02OE19HSVuFjMiEipwosmFfMoR69ZZuPSzNg1uVnw==,iv:LbZZGbwkXc71PAKgjD2CvXJVtyiqgi+cNsBzbulPyIk=,tag:VPESc2Y8SdU5CovQinZleA==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1fdkan6n20swmut0sa86g5a6gxrj8qj2sgqe8hxtw32c0u9rr4drqlyr5mf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2L3FzSkh3UTkvdTR6eEVE\nNnYrcnAydUl4QnJSbWJRbFFQODFmSld1YkJZCnNFUHp6YjQ3WW0vVHh5dXZBMzFJ\nYWRnZWNHN2dkL1JBWHNrZTcvTHI5S3MKLS0tIGpnekxneURuMWFkQ1RLTEszTFhi\nUUkzR2ljTXFhb1c2RDhpeFJXaXpYakUK/fLOqjNR2LML7uN3fiB9GdhWTDcr0wn4\n37ESeS1kx0EobRMaDVu8GPZovcdypFOOPiuUpEu6hIEdwvl736oDSA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjQWE2L3F1RW9oNlQzR0I3\nZDJoZ1hIM2N0Mm1aQ1IrN1gweWZxeWVGdUdzCmlIZXdKYm8rUGkvVVpiY1BJZmlD\nN0MwRHN3dUNrRU9McjNFMXpranJGU1UKLS0tIG1yMmJGaEp1cU1iZGdqdzRUTWZW\nZzZrVkRuOTBTcnFuaTE1Um1ISUxBaTQKf842rL3N7Gl1QfrIURWiu26LwO0ERkP4\nvfXN2HH1jjp2pblQF9qb+5vmUsaX1pPSY1R+YMvUK7wIwOb9zyIfmQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-10-31T07:50:02Z",
-		"mac": "ENC[AES256_GCM,data:/c1jqMSLd9/fxm1PxtRITr3qkjtrlJ/5wJgEVkraAqU6XTuzSyseMhdeWLL2Fy2OunT/+alM6VpaliBmcZqRkSSGngbuvMsujDiJLgUXQ8wNhMcK7ln/dqFMcA+RYGxihGEMwuPKs3yOVKj9PDzFYnm6TUCFkU/heotI/hQ1lQI=,iv:EsWsi4r4DctMLvi4WmqKe0D1NTHwYVKCcxKQ+6grzYg=,tag:28dmpzF/6dbvGIriaBVKPw==,type:str]",
-		"version": "3.11.0"
-	}
-}

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/yggdrasil-secret/users/admin

@@ -1 +0,0 @@
-../../../../../../sops/users/admin

modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/yggdrasil-subnet/value

@@ -1 +0,0 @@
-301:b9d:4329:71c2::/64

modules/clan/pingvin/default.nix

@@ -0,0 +1,23 @@
+{ ... }:
+{
+  _class = "clan.service";
+  manifest.name = "pingvin";
+  manifest.description = "A self-hosted file sharing platform that combines lightness and beauty, perfect for seamless and efficient file sharing.";
+  manifest.categories = [ "System" ];
+
+  roles.default = {
+
+    perInstance.nixosModule =
+      {
+        config,
+        ...
+      }:
+      {
+        services.pingvin-share = {
+          enable = true;
+        };
+
+        clan.core.state.pingvin-share.folders = [ config.services.pingvin-share.dataDir ];
+      };
+  };
+}

modules/clan/pingvin/flake-module.nix

@@ -0,0 +1,19 @@
+{ lib, ... }:
+let
+  module = lib.modules.importApply ./default.nix { };
+in
+{
+  clan.modules = {
+    pingvin = module;
+  };
+
+  perSystem =
+    { ... }:
+    {
+      clan.nixosTests.pingvin = {
+        imports = [ ./tests/vm/default.nix ];
+
+        clan.modules."@clan/pingvin" = module;
+      };
+    };
+}

modules/clan/pingvin/tests/vm/default.nix

@@ -0,0 +1,42 @@
+{
+  ...
+}:
+{
+  name = "service-pingvin";
+
+  clan = {
+    directory = ./.;
+    inventory = {
+      machines.server = { };
+
+      instances = {
+        pingvin-test = {
+          module.name = "@clan/pingvin";
+          module.input = "self";
+          roles.default.machines."server".settings = { };
+        };
+      };
+    };
+  };
+
+  nodes = {
+    server = {
+      services.pingvin-share = {
+        hostname = "share.localhost";
+        frontend.port = 3000;
+        backend.port = 8000;
+      };
+    };
+  };
+
+  testScript = ''
+    start_all()
+
+    server.wait_for_unit("pingvin-share-frontend")
+
+    server.succeed("systemctl status pingvin-share-frontend")
+    server.wait_for_open_port(3000)
+    server.wait_for_open_port(8000)
+    server.succeed("curl -H \"Host: share.localhost\" http://127.0.0.1:3000 ")
+  '';
+}

modules/clan/pocket-id/default.nix

@@ -3,11 +3,9 @@
   _class = "clan.service";
   manifest.name = "pocket-id";
   manifest.description = "A simple and easy-to-use OIDC provider that allows users to authenticate with their passkeys to your services.";
-  manifest.readme = "A simple and easy-to-use OIDC provider that allows users to authenticate with their passkeys to your services.";
   manifest.categories = [ "System" ];
 
   roles.default = {
-    description = "a default server role";
 
     perInstance.nixosModule =
       {

modules/clan/pocket-id/flake-module.nix

@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.service-pocket-id = {
+      clan.nixosTests.pocket-id = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/pocket-id" = module;

modules/clan/pulse-stream/default.nix

@@ -1,44 +0,0 @@
-{ ... }:
-{
-  _class = "clan.service";
-  manifest.name = "pulse-stream";
-  manifest.description = "stream audio to attached speakers";
-  manifest.readme = "stream audio to attached speakers";
-  manifest.categories = [ "System" ];
-
-  roles.default = {
-    description = "a default role";
-    interface =
-      { lib, ... }:
-      {
-        options.client-ip-ranges = lib.mkOption {
-          type = lib.types.listOf lib.types.str;
-          description = "ip subnets permitted to stream to the server";
-          default = [ ];
-        };
-      };
-    perInstance =
-      {
-        roles,
-        settings,
-        ...
-      }:
-      {
-        nixosModule =
-          { ... }:
-          {
-            services.pulseaudio = {
-              enable = true;
-              systemWide = true;
-              tcp = {
-                enable = true;
-                anonymousClients.allowedIpRanges = settings.client-ip-ranges;
-                anonymousClients.allowAll = true;
-              };
-              zeroconf.publish.enable = true;
-            };
-            networking.firewall.allowedTCPPorts = [ 4713 ];
-          };
-      };
-  };
-}

modules/clan/pulse-stream/flake-module.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-let
-  module = lib.modules.importApply ./default.nix { };
-in
-{
-  clan.modules = {
-    pulse-stream = module;
-  };
-}