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

lastFile:modules/clan/phonebox/default.nix
Update vars via generator yggdrasil for machine rigel
2025-12-05 11:30:00 +07:00 · 2025-12-05 11:29:35 +07:00 · 2025-12-05 11:29:34 +07:00 · 2025-12-05 11:28:57 +07:00
257 changed files with 273 additions and 15808 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766984802,
-        "narHash": "sha256-SYZ/MXVtJEb3sRWxvPL/2HtpSL1CzQgu1o8ASXqCO98=",
+        "lastModified": 1764792743,
+        "narHash": "sha256-MbbiNG/bhqe+4z7ml8TefIs4swSonmiV0CimCntXuCg=",
        "ref": "refs/heads/main",
-        "rev": "052b66d8dc724c3e519b9003281c2f9a210fc380",
-        "revCount": 11770,
+        "rev": "ddc0f9fabf33ad000676a33e97be6b5df12a4560",
+        "revCount": 11417,
        "type": "git",
        "url": "https://git.clan.lol/clan/clan-core"
      },
@@ -49,11 +49,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766977667,
-        "narHash": "sha256-LUALgG4ZpsA0k7pGYzMDto/r6T8aIPlYTok3lGlojjA=",
-        "rev": "3f852546b5d8bd2e9659a81c6b2cc14922e63a94",
+        "lastModified": 1762942435,
+        "narHash": "sha256-zIWGs5FIytTtJN+dhDb8Yx+q4TQI/yczuL539yVcyPE=",
+        "rev": "0ee328404b12c65e8106bde9e9fab8abf4ecada4",
        "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/0ee328404b12c65e8106bde9e9fab8abf4ecada4.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -88,11 +88,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766150702,
-        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+        "lastModified": 1764627417,
+        "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+        "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",
        "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,
@@ -182,11 +162,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766784396,
-        "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
+        "lastModified": 1764161084,
+        "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55",
+        "rev": "e95de00a471d07435e0527ff4db092c84998698e",
        "type": "github"
      },
      "original": {
@@ -210,11 +190,11 @@
    },
    "nixos-facter-modules": {
      "locked": {
-        "lastModified": 1766558141,
-        "narHash": "sha256-Ud9v49ZPsoDBFuyJSQ2Mpw1ZgAH/aMwUwwzrVoetNus=",
+        "lastModified": 1764252389,
+        "narHash": "sha256-3bbuneTKZBkYXlm0bE36kUjiDsasoIC1GWBw/UEJ9T4=",
        "owner": "nix-community",
        "repo": "nixos-facter-modules",
-        "rev": "e796d536e3d83de74267069e179dc620a608ed7d",
+        "rev": "5ea68886d95218646d11d3551a476d458df00778",
        "type": "github"
      },
      "original": {
@@ -225,11 +205,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1768395095,
-        "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=",
+        "lastModified": 1761656231,
+        "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5",
+        "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
        "type": "github"
      },
      "original": {
@@ -244,7 +224,6 @@
        "clan-core": "clan-core",
        "devshell": "devshell",
        "flake-parts": "flake-parts",
-        "home-manager": "home-manager",
        "import-tree": "import-tree",
        "liminix": "liminix",
        "nixpkgs": "nixpkgs",
@@ -259,11 +238,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766894905,
-        "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=",
+        "lastModified": 1764483358,
+        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7",
+        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -15,10 +15,6 @@
      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 = {
@@ -45,30 +41,12 @@
          ./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;
-          };
      }
    );
 }
--- a/inventories/default.nix
+++ b/inventories/default.nix
@@ -1,5 +1,4 @@
 {
-  imports = [ ./personal-computer.nix ];
  clan = {
    inventory = {

@@ -12,16 +11,10 @@
        b4l = [
          "rigel"
          "neptune"
-          "rana"
        ];
        phonebox = [
          "neptune"
          "rigel"
-          "almach"
-          "alpheratz"
-          "mirach"
-          "adhil"
-          "buna"
        ];
      };

@@ -108,8 +101,11 @@
            input = "self";
          };
          roles.default.tags."phonebox" = { };
-          roles.default.machines."adhil".settings = {
-            ata-ethernet-iface = "end0";
+          roles.default.machines.rigel.settings = {
+            ata-ethernet-iface = "enp2s0";
+          };
+          roles.default.machines.neptune.settings = {
+            ata-ethernet-iface = "enp2s0";
          };
        };

@@ -162,6 +158,13 @@
          };
          roles.default.machines.b4l = { };
        };
+        pingvin = {
+          module = {
+            name = "pingvin";
+            input = "self";
+          };
+          roles.default.machines.b4l = { };
+        };
        paperless = {
          module = {
            name = "paperless";
@@ -169,80 +172,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 = { };
-              };
-          };
-        };
      };
    };
  };
--- a/inventories/personal-computer.nix
+++ b/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" = { };
-      };
-    };
-  };
-}
--- a/inventory.json
+++ b/inventory.json
@@ -14,15 +14,6 @@
    },
    "neptune": {
      "installedAt": 1762147067
-    },
-    "adhil": {
-      "installedAt": 1765277591
-    },
-    "buna": {
-      "installedAt": 1765343708
-    },
-    "rana": {
-      "installedAt": 1768294839
    }
  }
-}
+}
--- a/machines/adhil/configuration.nix
+++ b/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)";
-
-}
--- a/machines/adhil/disko.nix
+++ b/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"
-                ];
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/machines/adhil/facter.json
+++ b/machines/adhil/facter.json
--- a/machines/almach/configuration.nix
+++ b/machines/almach/configuration.nix
@@ -7,7 +7,7 @@
  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.";
+  clan.meta.name = "almach";
+  clan.meta.description = "Radxa X4 SBC board for one of w phone network.";

 }
--- a/machines/alpheratz/configuration.nix
+++ b/machines/alpheratz/configuration.nix
@@ -7,7 +7,7 @@
  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.";
+  clan.meta.name = "alpheratz";
+  clan.meta.description = "Radxa X4 SBC board for one of w phone network.";

 }
--- a/machines/b4l/configuration.nix
+++ b/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
-    '';
-  };
 }
--- a/machines/b4l/services/nextcloud.nix
+++ b/machines/b4l/services/nextcloud.nix
@@ -19,7 +19,7 @@ in

  services.nextcloud = {
    hostName = ncDomain;
-    package = pkgs.nextcloud32;
+    package = pkgs.nextcloud31;

    settings = {

--- a/machines/b4l/services/pingvin.nix
+++ b/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;
+  };
+}
--- a/machines/buna/configuration.nix
+++ b/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)";
-
-}
--- a/machines/buna/disko.nix
+++ b/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"
-                ];
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/machines/buna/facter.json
+++ b/machines/buna/facter.json
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  self,
-  ...
-}:
+{ inputs, self, ... }:
 {
  imports = [
    inputs.clan-core.flakeModules.default
--- a/machines/mirach/configuration.nix
+++ b/machines/mirach/configuration.nix
@@ -7,7 +7,7 @@
  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.";
+  clan.meta.name = "mirach";
+  clan.meta.description = "Radxa X4 SBC board for one of w phone network.";

 }
--- a/machines/neptune/configuration.nix
+++ b/machines/neptune/configuration.nix
@@ -1,9 +1,4 @@
-{
-  inputs,
-  config,
-  lib,
-  ...
-}:
+{ inputs, config, ... }:
 {
  nixpkgs.hostPlatform = {
    system = "x86_64-linux";
@@ -12,51 +7,7 @@
  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)";
+  clan.meta.name = "neptune";
+  clan.meta.description = "Radxa SBC board for testing.";

 }
--- a/machines/ramus/configuration.nix
+++ b/machines/ramus/configuration.nix
@@ -1,35 +1,15 @@
-{ self, config, ... }:
+{ 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.meta.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 ];
 }
--- a/machines/ramus/think-greater-chiangmai.nix
+++ b/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;
-  };
-}
--- a/machines/rana/configuration.nix
+++ b/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" ];
-}
--- a/machines/rana/disko.nix
+++ b/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";
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/machines/rana/facter.json
+++ b/machines/rana/facter.json
--- a/machines/rigel/configuration.nix
+++ b/machines/rigel/configuration.nix
@@ -1,9 +1,4 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}:
+{ config, ... }:
 {
  imports = [
    (import ../../lib/auto-accept-zerotier-members.nix {
@@ -13,54 +8,8 @@
        "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}]";
--- a/machines/sirius/configuration.nix
+++ b/machines/sirius/configuration.nix
@@ -19,6 +19,7 @@
    system = "x86_64-linux";
  };

+  networking.fqdn = config.clan.core.vars.generators.vega-internal-domain.files.name.value;
  system.stateVersion = "25.11";

 }
--- a/modules/clan/actual-budget/default.nix
+++ b/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 =
      {
--- a/modules/clan/git-daemon/default.nix
+++ b/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 ];
-          };
-      };
-  };
-}
--- a/modules/clan/git-daemon/flake-module.nix
+++ b/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;
-  };
-}
--- a/modules/clan/grafana/default.nix
+++ b/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 =
      {
--- a/modules/clan/home-profiles/flake-module.nix
+++ b/modules/clan/home-profiles/flake-module.nix
@@ -1,6 +0,0 @@
-{ lib, ... }:
-{
-  clan.modules = {
-    home-user = lib.modules.importApply ./home-user { };
-  };
-}
--- a/modules/clan/home-profiles/home-user/default.nix
+++ b/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;
-            };
-          };
-      };
-  };
-}
--- a/modules/clan/home-profiles/home-user/home.nix
+++ b/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;
-}
--- a/modules/clan/jukebox/default.nix
+++ b/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 ];
-          };
-      };
-  };
-}
--- a/modules/clan/jukebox/flake-module.nix
+++ b/modules/clan/jukebox/flake-module.nix
@@ -1,9 +0,0 @@
-{ lib, ... }:
-let
-  module = lib.modules.importApply ./default.nix { };
-in
-{
-  clan.modules = {
-    jukebox = module;
-  };
-}
--- a/modules/clan/nextcloud/default.nix
+++ b/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 =
      {
--- a/modules/clan/paperless/default.nix
+++ b/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 =
      {
--- a/modules/clan/personal-computer/automatic-timezone.nix
+++ b/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";
-  };
-}
--- a/modules/clan/personal-computer/default.nix
+++ b/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
-          ) ./.)
-        ];
-      };
-  };
-}
--- a/modules/clan/personal-computer/desktop-environment.nix
+++ b/modules/clan/personal-computer/desktop-environment.nix
@@ -1,4 +0,0 @@
-{ config, ... }:
-{
-  security.pam.services."sddm".kwallet.enable = config.services.desktopManager.plasma6.enable;
-}
--- a/modules/clan/personal-computer/flake-module.nix
+++ b/modules/clan/personal-computer/flake-module.nix
@@ -1,6 +0,0 @@
-{ lib, ... }:
-{
-  clan.modules = {
-    personal-computer = lib.modules.importApply ./default.nix { };
-  };
-}
--- a/modules/clan/personal-computer/libinput.nix
+++ b/modules/clan/personal-computer/libinput.nix
@@ -1,11 +0,0 @@
-{
-  services = {
-    libinput = {
-      enable = true;
-      touchpad = {
-        disableWhileTyping = true;
-        naturalScrolling = true;
-      };
-    };
-  };
-}
--- a/modules/clan/personal-computer/printing.nix
+++ b/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;
-
-}
--- a/modules/clan/personal-computer/users.nix
+++ b/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;
-      }
-    });
-  '';
-}
--- a/modules/clan/personal-computer/wireless.nix
+++ b/modules/clan/personal-computer/wireless.nix
@@ -1,4 +0,0 @@
-{
-  networking.networkmanager.enable = true;
-  hardware.bluetooth.enable = true;
-}
--- a/modules/clan/phonebox/default.nix
+++ b/modules/clan/phonebox/default.nix
@@ -1,28 +1,17 @@
-{
-  clanLib,
-  ...
-}:
+{ 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.description = "";
  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 =
@@ -32,70 +21,18 @@
        ...
      }:
      {
-
        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 }:
              ''
@@ -131,17 +68,9 @@
                exten => ${localNumber},1,Dial(PJSIP/${localNumber},20)
              '';
            genExtentConf =
-              {
-                prefixNumber,
-                hostname,
-                localNumber,
-              }:
-              let
-                replaceWithX =
-                  ln: builtins.concatStringsSep "" (builtins.genList (_: "X") (builtins.stringLength ln));
-              in
+              { prefixNumber, hostname }:
              ''
-                exten => _${prefixNumber}${replaceWithX localNumber},1,Dial(PJSIP/''${EXTEN:${builtins.toString (builtins.stringLength prefixNumber)}}@${hostname},30)
+                exten => _${prefixNumber}XXX,1,Dial(PJSIP/''${EXTEN:1}@${hostname},30)
              '';

            getYggdrasilIP =
@@ -158,38 +87,52 @@
                throw "clanService/yggdrasil is required";
          in
          {
-            clan.core.vars.generators.phonebox = builtins.break {
+            clan.core.vars.generators.phonebox = {
              files = {
                server-prefix-number.secret = false;
                ata-local-number.secret = false;
-                owner-name.secret = false;
+                ata-password = {
+                  owner = user;
+                  group = user;
+                  secret = true;
+                };
              };

              prompts = {
                server-prefix-number = {
-                  type = "line";
                  persist = true;
-                  description = "Server prefix number: indicate server to connect to [10XX]";
+                  type = "line";
+                  description = "Server prefix number: the first number of [X000]";
                };
                ata-local-number = {
                  persist = true;
                  type = "line";
-                  description = "Local suffix number: indicate local number on the server [XX00]";
+                  description = "Local suffix number: 3 last number of [0XXX]";
                };
-                owner-name = {
+                ata-password = {
                  persist = true;
-                  type = "line";
-                  description = "The owner's name for this unit";
+                  type = "hidden";
+                  description = "Password for SIP registration.";
                };
              };

              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
+                cat $prompts/ata-password > $out/ata-password
              '';
            };

+            systemd.services.asterisk.serviceConfig = {
+              LoadCredential = [
+                "sip_password_filepath:${config.clan.core.vars.generators.phonebox.files.ata-password.path}"
+              ];
+
+              Environment = [
+                "SIP_PASSWORD=%d/sip_password_filepath"
+              ];
+            };
+
            networking.interfaces = {
              ${ata-interface} = {
                useDHCP = false;
@@ -212,9 +155,8 @@
                domain-needed = true;
                domain = "localhost";
                dhcp-range = [
-                  "192.168.254.100,192.168.254.100,255.255.255.0,3m"
+                  "192.168.254.100,192.168.254.100,255.255.255.0,24h"
                ];
-                dhcp-leasefile = "/dev/null";
                dhcp-option = [
                  "3,192.168.254.1"
                ];
@@ -261,9 +203,9 @@

            services.asterisk = {
              enable = lib.mkDefault true;
-              package = lib.mkDefault asterisk;
              confFiles =
                let
+                  machines = lib.attrNames roles.default.machines;
                  nodes = builtins.foldl' (
                    nodes: name:
                    nodes
@@ -301,7 +243,7 @@
                    queue_log_name = queue_log
                    queue_log_realtime_use_gmt = no
                    rotatestrategy = rotate
-                    exec_after_rotate=gzip -9 $\{filename\}.2
+                    exec_after_rotate=gzip -9 $\{filename\}.2 
                    [logfiles]
                    console => notice,warning,error
                    security => security
@@ -310,13 +252,6 @@
                    syslog.local0 => notice,warning,error
                  '';

-                  "modules.conf" = ''
-                    [modules]
-                    autoload=yes
-
-                    load => res_fax_spandsp.so
-                  '';
-
                  # Dial plan config
                  "extensions.conf" =
                    let
@@ -324,33 +259,17 @@
                        config: node:
                        config
                        + (genExtentConf {
-                          inherit (node) prefixNumber hostname localNumber;
+                          prefixNumber = node.prefixNumber;
+                          hostname = node.hostname;
                        })
                      ) "" nodes;
                    in
                    ''
                      [from-internal]
-                      exten => 999,1,Answer()
+                      exten => 100,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;
@@ -411,44 +330,6 @@
                    + 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
-              '';
-            };
          };
      };
  };
--- a/modules/clan/phonebox/flake-module.nix
+++ b/modules/clan/phonebox/flake-module.nix
@@ -18,6 +18,7 @@ in
        _module.args = { inherit self inputs; };

        clan.modules."@clan/phonebox" = module;
+        clan.modules."@clan/yggdrasil" = ../yggdrasil/default.nix;
      };
    };
 }
--- a/modules/clan/phonebox/tests/vm/default.nix
+++ b/modules/clan/phonebox/tests/vm/default.nix
@@ -27,7 +27,8 @@

      instances = {
        yggdrasil = {
-          module.name = "yggdrasil";
+          module.name = "@clan/yggdrasil";
+          module.input = "self";
          roles.default.machines.server = { };
        };
        phonebox-test = {
--- a/modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/owner-name/value
+++ b/modules/clan/phonebox/tests/vm/vars/per-machine/server/phonebox/owner-name/value
@@ -1 +0,0 @@
-fake_line_value
--- a/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/address/value
+++ b/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/address/value
@@ -1 +0,0 @@
-202:fe87:1ca6:3cfd:e095:c2b1:321c:c391
--- a/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/machines/server
+++ b/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/machines/server
@@ -1 +0,0 @@
-../../../../../../sops/machines/server
--- a/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/secret
+++ b/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"
-	}
-}
--- a/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/users/admin
+++ b/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/privateKey/users/admin
@@ -1 +0,0 @@
-../../../../../../sops/users/admin
--- a/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/publicKey/value
+++ b/modules/clan/phonebox/tests/vm/vars/per-machine/server/yggdrasil/publicKey/value
@@ -1,3 +0,0 @@
-----BEGIN PUBLIC KEY-----
-MCowBQYDK2VwAyEAIC8cazhgQ+1Hqdm8Z43J5ooymP2ytrBEvdfXYz0ryp8=
-----END PUBLIC KEY-----
--- a/modules/clan/pingvin/default.nix
+++ b/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 ];
+      };
+  };
+}
--- a/modules/clan/pingvin/flake-module.nix
+++ b/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.service-pingvin = {
+        imports = [ ./tests/vm/default.nix ];
+
+        clan.modules."@clan/pingvin" = module;
+      };
+    };
+}
--- a/modules/clan/pingvin/tests/vm/default.nix
+++ b/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 ")
+  '';
+}
--- a/modules/clan/pocket-id/default.nix
+++ b/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 =
      {
--- a/modules/clan/pulse-stream/default.nix
+++ b/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 ];
-          };
-      };
-  };
-}
--- a/modules/clan/pulse-stream/flake-module.nix
+++ b/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;
-  };
-}
--- a/modules/clan/stirling-pdf/default.nix
+++ b/modules/clan/stirling-pdf/default.nix
@@ -3,11 +3,9 @@
  _class = "clan.service";
  manifest.name = "stirling-pdf";
  manifest.description = "Your locally hosted one-stop-shop for all your PDF needs.";
-  manifest.readme = "Your locally hosted one-stop-shop for all your PDF needs.";
  manifest.categories = [ "System" ];

  roles.default = {
-    description = "a default server role";
    perInstance.nixosModule =
      {
        lib,
--- a/modules/clan/victoriametrics/default.nix
+++ b/modules/clan/victoriametrics/default.nix
@@ -3,11 +3,9 @@
  _class = "clan.service";
  manifest.name = "Victoria Metrics";
  manifest.description = "VictoriaMetrics: fast, cost-effective monitoring solution and time series database";
-  manifest.readme = "VictoriaMetrics: fast, cost-effective monitoring solution and time series database";
  manifest.categories = [ "System" ];

  roles.default = {
-    description = "a default server role";
    perInstance.nixosModule =
      {
        config,
--- a/modules/clan/vikunja/default.nix
+++ b/modules/clan/vikunja/default.nix
@@ -3,11 +3,9 @@
  _class = "clan.service";
  manifest.name = "vikunja";
  manifest.description = "The to-do app to organize your life.";
-  manifest.readme = "The to-do app to organize your life.";
  manifest.categories = [ "System" ];

  roles.default = {
-    description = "a default server role";
    perInstance.nixosModule =
      {
        lib,
--- a/modules/clan/yggdrasil/default.nix
+++ b/modules/clan/yggdrasil/default.nix
@@ -3,11 +3,9 @@
  _class = "clan.service";
  manifest.name = "yggdrasil";
  manifest.description = "An in scalable routing as an encrypted IPv6 overlay network";
-  manifest.readme = "An in scalable routing as an encrypted IPv6 overlay network";
  manifest.categories = [ "System" ];

  roles.default = {
-    description = "a default peer role";
    perInstance.nixosModule =
      {
        lib,
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,5 +0,0 @@
-{
-  flake.nixosModules = {
-    inventree = import ../nixos/inventree;
-  };
-}
--- a/modules/nixos/flake-module.nix
+++ b/modules/nixos/flake-module.nix
@@ -3,11 +3,5 @@
    common = {
      imports = [ ./common.nix ];
    };
-    think-gtcm = {
-      imports = [ ./think-gtcm.nix ];
-    };
-    think-backend-gtcm = {
-      imports = [ ./think-backend-gtcm.nix ];
-    };
  };
 }
--- a/modules/nixos/inventree/default.nix
+++ b/modules/nixos/inventree/default.nix
@@ -1,386 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib)
-    mkEnableOption
-    mkOption
-    types
-    mkIf
-    ;
-
-  configFormat = pkgs.formats.json { };
-  cfg = config.services.inventree;
-  pkg = cfg.package;
-  configFile = "${cfg.dataDir}/config.json";
-
-  inventree-invoke = pkgs.writeShellApplication {
-    name = "inventree-invoke";
-    text = ''
-      export INVENTREE_CONFIG_FILE=${configFile}
-      export INVENTREE_SECRET_KEY_FILE=${cfg.secretKeyFile}
-      export PYTHONPATH=${pkg.pythonPath}
-
-      exec -a "$0" ${pkgs.python3Packages.invoke}/bin/invoke -r ${cfg.package}/opt/inventree "$@"
-    '';
-  };
-in
-{
-  options.services.inventree = {
-    enable = mkEnableOption "InvenTree parts manager";
-
-    package = lib.mkOption {
-      type = types.package;
-      default = pkgs.inventree;
-      description = ''
-        InvenTree package to use
-      '';
-    };
-
-    hostName = mkOption {
-      type = types.str;
-      description = "FQDN for the InvenTree instance.";
-    };
-
-    dataDir = mkOption {
-      type = types.path;
-      default = "/var/lib/inventree";
-      example = "/var/lib/inventree";
-      description = ''
-        The default path for all inventree data.
-      '';
-    };
-
-    secretKeyFile = mkOption {
-      type = types.path;
-      default = "${cfg.dataDir}/secret_key.txt";
-      description = ''
-        Path to a file containing the secret key
-      '';
-    };
-
-    config = mkOption {
-      type = types.submodule ({
-        freeformType = configFormat.type;
-        options = {
-          adminUser = mkOption {
-            type = types.str;
-            default = "admin";
-          };
-          adminPasswordFile = mkOption {
-            type = types.path;
-            description = "Path to password file for user `admin`";
-          };
-          site_url = mkOption {
-            type = types.str;
-            default = "https://${cfg.hostName}";
-          };
-          static_root = mkOption {
-            type = types.path;
-            default = "${cfg.dataDir}/static";
-            description = ''
-              Static file storage
-            '';
-          };
-          media_root = mkOption {
-            type = types.path;
-            default = "${cfg.dataDir}/media_root";
-            description = "Media root directory";
-          };
-          backup_dir = mkOption {
-            type = types.path;
-            default = "${cfg.dataDir}/backups";
-            description = "Backup directory";
-          };
-          oidc_private_key_file = mkOption {
-            type = types.path;
-            default = "${cfg.dataDir}/oidc.key";
-          };
-        };
-      });
-      default = { };
-      description = ''
-        Config options, see https://docs.inventree.org/en/stable/start/config/
-        for details
-      '';
-    };
-
-    serverStartTimeout = mkOption {
-      type = types.str;
-      default = "10min";
-      description = ''
-        TimeoutStartSec for the server systemd service.
-        See https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#TimeoutStartSec=
-        for more details
-      '';
-    };
-
-    serverStopTimeout = mkOption {
-      type = types.str;
-      default = "5min";
-      description = ''
-        TimeoutStopSec for the server systemd service.
-        See https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#TimeoutStopSec=
-        for more details
-      '';
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ inventree-invoke ];
-
-    systemd.tmpfiles.rules = (
-      map (dir: "d ${dir} 0755 inventree inventree") [
-        "${cfg.dataDir}"
-        "${cfg.dataDir}/static"
-        "${cfg.dataDir}/media_root"
-        "${cfg.dataDir}/backups"
-      ]
-    );
-
-    services.inventree.config = {
-      plugins_enabled = false;
-      plugin_file = "${cfg.dataDir}/plugins.txt";
-      plugin_dir = "${cfg.dataDir}/plugins";
-      database = {
-        ENGINE = "postgresql";
-        NAME = "inventree";
-        HOST = "/run/postgresql";
-      };
-    };
-
-    services.postgresql = {
-      enable = true;
-      ensureDatabases = [ "inventree" ];
-      ensureUsers = [
-        {
-          name = "inventree";
-          ensureDBOwnership = true;
-        }
-      ];
-    };
-
-    users.users.inventree = {
-      group = "inventree";
-      isSystemUser = true;
-      description = "InvenTree daemon user";
-    };
-
-    users.groups.inventree = { };
-
-    services.nginx.enable = true;
-
-    services.nginx.virtualHosts.${cfg.hostName} = {
-      locations =
-        let
-          unixPath = config.systemd.sockets.inventree-gunicorn.socketConfig.ListenStream;
-        in
-        {
-          "/" = {
-            extraConfig = ''
-              client_max_body_size 100M;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            '';
-            proxyPass = "http://unix:${unixPath}";
-          };
-          "/static/" = {
-            alias = "${cfg.config.static_root}/";
-            extraConfig = ''
-              expires 30d;
-            '';
-          };
-          "/media/" = {
-            alias = "${cfg.config.media_root}/";
-            extraConfig = ''
-              auth_request /auth;
-            '';
-          };
-          "/auth" = {
-            extraConfig = ''
-              internal;
-            '';
-            proxyPass = "http://unix:${unixPath}:/auth/";
-          };
-        };
-    };
-
-    systemd.targets.inventree = {
-      description = "Target for all InvenTree services";
-      wantedBy = [ "multi-user.target" ];
-      wants = [ "network-online.target" ];
-      after = [ "network-online.target" ];
-    };
-
-    systemd.services.inventree-config = {
-      description = "Inventree config generation";
-      wantedBy = [ "inventree.target" ];
-      partOf = [ "inventree.target" ];
-      before = [
-        "inventree-static.service"
-        "inventree-gunicorn.service"
-        "inventree-qcluster.service"
-      ];
-      serviceConfig = {
-        # User = "root";
-        # Group = "root";
-        User = "inventree";
-        Group = "inventree";
-        Type = "oneshot";
-        RemainAfterExit = true;
-        PrivateTmp = true;
-      };
-      environment = {
-        INVENTREE_CONFIG_FILE = configFile;
-        INVENTREE_SECRET_KEY_FILE = cfg.secretKeyFile;
-        INVENTREE_AUTO_UPDATE = "1";
-        INVENTREE_PLUGINS_ENABLED = "1";
-        INVENTREE_PLUGIN_NOINSTALL = "1";
-        INVENTREE_STATIC_ROOT = cfg.config.static_root;
-        INVENTREE_MEDIA_ROOT = cfg.config.media_root;
-        INVENTREE_BACKUP_DIR = cfg.config.backup_dir;
-        INVENTREE_OIDC_PRIVATE_KEY_FILE = cfg.config.oidc_private_key_file;
-        INVENTREE_DB_ENGINE = cfg.config.database.ENGINE;
-        INVENTREE_DB_NAME = cfg.config.database.NAME;
-        INVENTREE_DB_HOST = cfg.config.database.HOST;
-        INVENTREE_DB_USER = "inventree";
-        INVENTREE_ADMIN_USER = cfg.config.adminUser;
-        INVENTREE_ADMIN_PASSWORD_FILE = cfg.config.adminPasswordFile;
-
-        INVENTREE_SITE_URL = cfg.config.site_url;
-
-        PYTHONPATH = pkg.pythonPath;
-      };
-      script = ''
-        set -euo pipefail
-
-        umask u=rwx,g=,o=
-
-        # chown inventree:inventree ${configFile}
-
-        ${pkg}/opt/inventree/src/backend/InvenTree/manage.py migrate
-      '';
-    };
-
-    systemd.services.inventree-static = {
-      description = "InvenTree static migration";
-      wantedBy = [ "inventree.target" ];
-      partOf = [ "inventree.target" ];
-      before = [ "inventree-gunicorn.service" ];
-      environment = {
-        INVENTREE_CONFIG_FILE = configFile;
-        INVENTREE_SECRET_KEY_FILE = cfg.secretKeyFile;
-        INVENTREE_AUTO_UPDATE = "1";
-        INVENTREE_PLUGINS_ENABLED = "1";
-        INVENTREE_PLUGIN_NOINSTALL = "1";
-        INVENTREE_STATIC_ROOT = cfg.config.static_root;
-        INVENTREE_MEDIA_ROOT = cfg.config.media_root;
-        INVENTREE_BACKUP_DIR = cfg.config.backup_dir;
-        INVENTREE_OIDC_PRIVATE_KEY_FILE = cfg.config.oidc_private_key_file;
-        INVENTREE_DB_ENGINE = cfg.config.database.ENGINE;
-        INVENTREE_DB_NAME = cfg.config.database.NAME;
-        INVENTREE_DB_HOST = cfg.config.database.HOST;
-        INVENTREE_DB_USER = "inventree";
-        INVENTREE_ADMIN_USER = cfg.config.adminUser;
-        INVENTREE_ADMIN_PASSWORD_FILE = cfg.config.adminPasswordFile;
-        INVENTREE_SITE_URL = cfg.config.site_url;
-
-        PYTHONPATH = pkg.pythonPath;
-      };
-      serviceConfig = {
-        User = "inventree";
-        Group = "inventree";
-        StateDirectory = "inventree";
-        #RuntimeDirectory = "inventree";
-        PrivateTmp = true;
-        ExecStart = ''
-          ${pkg}/opt/inventree/src/backend/InvenTree/manage.py collectstatic  --no-input
-        '';
-      };
-    };
-
-    systemd.services.inventree-gunicorn = {
-      description = "InvenTree Gunicorn server";
-      requiredBy = [ "inventree.target" ];
-      partOf = [ "inventree.target" ];
-      #wantedBy = [ "inventree.target" ];
-      environment = {
-        INVENTREE_CONFIG_FILE = configFile;
-        INVENTREE_SECRET_KEY_FILE = cfg.secretKeyFile;
-        INVENTREE_AUTO_UPDATE = "1";
-        INVENTREE_PLUGINS_ENABLED = "1";
-        INVENTREE_PLUGIN_NOINSTALL = "1";
-        INVENTREE_STATIC_ROOT = cfg.config.static_root;
-        INVENTREE_MEDIA_ROOT = cfg.config.media_root;
-        INVENTREE_BACKUP_DIR = cfg.config.backup_dir;
-        INVENTREE_OIDC_PRIVATE_KEY_FILE = cfg.config.oidc_private_key_file;
-        INVENTREE_DB_ENGINE = cfg.config.database.ENGINE;
-        INVENTREE_DB_NAME = cfg.config.database.NAME;
-        INVENTREE_DB_HOST = cfg.config.database.HOST;
-        INVENTREE_DB_USER = "inventree";
-        INVENTREE_ADMIN_USER = cfg.config.adminUser;
-        INVENTREE_ADMIN_PASSWORD_FILE = cfg.config.adminPasswordFile;
-        INVENTREE_SITE_URL = cfg.config.site_url;
-
-        PYTHONPATH = pkg.pythonPath;
-      };
-      serviceConfig = {
-        User = "inventree";
-        Group = "inventree";
-        StateDirectory = "inventree";
-        #RuntimeDirectory = "inventree";
-        PrivateTmp = true;
-        ExecStart = ''
-          ${pkg.gunicorn}/bin/gunicorn InvenTree.wsgi \
-            --pythonpath ${pkg}/opt/inventree/src/backend/InvenTree
-        '';
-      };
-    };
-
-    systemd.sockets.inventree-gunicorn = {
-      wantedBy = [ "sockets.target" ];
-      partOf = [ "inventree.target" ];
-      socketConfig.ListenStream = "/run/inventree/gunicorn.socket";
-    };
-
-    systemd.services.inventree-qcluster = {
-      description = "InvenTree qcluster server";
-      requiredBy = [ "inventree.target" ];
-      wantedBy = [ "inventree.target" ];
-      partOf = [ "inventree.target" ];
-      environment = {
-        INVENTREE_CONFIG_FILE = configFile;
-        INVENTREE_SECRET_KEY_FILE = cfg.secretKeyFile;
-        INVENTREE_AUTO_UPDATE = "1";
-        INVENTREE_PLUGINS_ENABLED = "0";
-        INVENTREE_PLUGIN_NOINSTALL = "1";
-        INVENTREE_STATIC_ROOT = cfg.config.static_root;
-        INVENTREE_MEDIA_ROOT = cfg.config.media_root;
-        INVENTREE_BACKUP_DIR = cfg.config.backup_dir;
-        INVENTREE_OIDC_PRIVATE_KEY_FILE = cfg.config.oidc_private_key_file;
-        INVENTREE_DB_ENGINE = cfg.config.database.ENGINE;
-        INVENTREE_DB_NAME = cfg.config.database.NAME;
-        INVENTREE_DB_HOST = cfg.config.database.HOST;
-        INVENTREE_DB_USER = "inventree";
-        INVENTREE_ADMIN_USER = cfg.config.adminUser;
-        INVENTREE_ADMIN_PASSWORD_FILE = cfg.config.adminPasswordFile;
-        INVENTREE_SITE_URL = cfg.config.site_url;
-
-        PYTHONPATH = pkg.pythonPath;
-      };
-      serviceConfig = {
-        User = "inventree";
-        Group = "inventree";
-        StateDirectory = "inventree";
-        #RuntimeDirectory = "inventree";
-        PrivateTmp = true;
-        ExecStart = ''
-          ${pkg}/opt/inventree/src/backend/InvenTree/manage.py qcluster
-        '';
-      };
-    };
-  };
-}
--- a/modules/nixos/think-backend-gtcm.nix
+++ b/modules/nixos/think-backend-gtcm.nix
@@ -1,348 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  cfg = config.services.think-backend-greaterchiangmai;
-  think-backend-gtcm = pkgs.think-backend-gtcm.override { dataDir = cfg.dataDir; };
-  file-uploader = pkgs.gtcm-file-uploader.override { dataDir = cfg.dataDir; };
-
-  nginxNodeProxyConfig = ''
-    proxy_pass http://127.0.0.1:3000;
-
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $host;
-    proxy_set_header x-webobjects-server-protocol HTTP/1.0;
-    proxy_set_header x-webobjects-remote-host 127.0.0.1;
-    proxy_set_header x-webobjects-server-port $server_port;
-    proxy_set_header x-webobjects-server-name $server_name;
-    proxy_set_header x-webobjects-server-url $scheme://$host;
-    proxy_connect_timeout 90;
-    proxy_send_timeout 90;
-    proxy_read_timeout 90;
-    proxy_buffer_size 64k;
-    proxy_buffers 8 64k;
-    proxy_busy_buffers_size 64k;
-    proxy_temp_file_write_size 64k;
-    client_max_body_size 50m;
-    client_body_buffer_size 128k;
-  '';
-
-  defaultUser = "gtcm";
-  defaultGroup = "gtcm";
-
-  php = pkgs.php83;
-
-  artisan-be = pkgs.writeScriptBin "gtcm-be" ''
-    #! ${pkgs.runtimeShell}
-    cd ${think-backend-gtcm}
-    sudo() {
-      if [[ "$USER" != ${cfg.user} ]]; then
-        exec /run/wrappers/bin/sudo -u ${cfg.user} "$@"
-      else
-        exec "$@"
-      fi
-    }
-    sudo ${lib.getExe php} artisan "$@"
-  '';
-
-in
-{
-  options.services.think-backend-greaterchiangmai = {
-    enable = lib.mkEnableOption "To enable think.greaterchiangmai.com";
-
-    dataDir = lib.mkOption {
-      type = lib.types.path;
-      default = "/var/lib/think-backend.greaterchiangmai.com";
-      description = "A place where to store states";
-    };
-
-    user = lib.mkOption {
-      type = lib.types.str;
-      default = defaultUser;
-      description = "User account under which this runs.";
-    };
-
-    group = lib.mkOption {
-      type = lib.types.str;
-      default = defaultGroup;
-      defaultText = "${defaultGroup}";
-      description = "Group under which the website runs.";
-    };
-
-    package = lib.mkPackageOption pkgs "think-backend-gtcm" { };
-
-    domain = lib.mkOption {
-      type = lib.types.str;
-      default = "think-backend.greaterchiangmai.com";
-      example = "forum.example.com";
-      description = "Domain to serve on.";
-    };
-
-    settings = lib.mkOption {
-      type =
-        with lib.types;
-        attrsOf (
-          nullOr (
-            either
-              (oneOf [
-                bool
-                int
-                port
-                path
-                str
-              ])
-              (submodule {
-                options = {
-                  _secret = lib.mkOption {
-                    type = nullOr str;
-                    description = ''
-                      The path to a file containing the value the
-                      option should be set to in the final
-                      configuration file.
-                    '';
-                  };
-                };
-              })
-          )
-        );
-      default = { };
-      description = ''
-        Options for settings environment variables
-      '';
-      example = lib.literalExpression ''
-        {
-          APP_NAME = "Laravel";
-          APP_ENV = "local";
-          APP_KEY = "key";
-          APP_DEBUG = true;
-          APP_URL = "http://localhost";
-
-          LOG_CHANNEL = "stack";
-          LOG_DEPRECATIONS_CHANNEL = "null";
-          LOG_LEVEL = "debug";
-
-          DB_CONNECTION = "mysql";
-          DB_HOST = "127.0.0.1";
-          DB_PORT = "3306";
-          DB_DATABASE = "laravel";
-          DB_USERNAME = "root";
-          DB_PASSWORD = "";
-        }
-      '';
-    };
-
-  };
-  config = lib.mkIf cfg.enable {
-    users.users.${cfg.user} = lib.mkForce {
-      isSystemUser = true;
-      home = cfg.dataDir;
-      createHome = true;
-      homeMode = "755";
-      group = cfg.group;
-    };
-    users.groups.${cfg.group} = { };
-
-    services.phpfpm.pools.think-backend-gtcm = {
-      inherit (cfg) user group;
-      phpPackage = php;
-      settings = {
-        "listen.owner" = config.services.nginx.user;
-        "listen.group" = config.services.nginx.group;
-        "listen.mode" = "0600";
-        "pm" = lib.mkDefault "dynamic";
-        "pm.max_children" = lib.mkDefault 10;
-        "pm.max_requests" = lib.mkDefault 500;
-        "pm.start_servers" = lib.mkDefault 2;
-        "pm.min_spare_servers" = lib.mkDefault 1;
-        "pm.max_spare_servers" = lib.mkDefault 3;
-      };
-      phpOptions = ''
-        error_log = syslog
-        log_errors = on
-      '';
-    };
-
-    systemd.services.gtcm-file-uploader = {
-      description = "File upload service for think-backend.greaterchiangmai.com";
-      requiredBy = [ "phpfpm-think-backend-gtcm.service" ];
-      before = [ "phpfpm-think-backend-gtcm.service" ];
-      serviceConfig = {
-        User = cfg.user;
-        WorkingDirectory = "${file-uploader}";
-        ExecStart = "${lib.getExe pkgs.nodejs_20} ${file-uploader}/src/be/index.js";
-        Restart = "on-failure";
-      };
-      path = [ pkgs.nodejs_20 ];
-    };
-
-    environment.systemPackages = [
-      artisan-be
-    ];
-
-    services.think-backend-greaterchiangmai.settings = {
-      APP_SERVICES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/services.php";
-      APP_PACKAGES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/packages.php";
-      APP_CONFIG_CACHE = lib.mkDefault "${cfg.dataDir}/cache/config.php";
-      APP_ROUTES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/routes-v7.php";
-      APP_EVENTS_CACHE = lib.mkDefault "${cfg.dataDir}/cache/events.php";
-    };
-
-    systemd.services.think-backend-gtcm-setup = {
-      description = "think-backend.greaterchiangmai installation";
-      requiredBy = [ "phpfpm-think-backend-gtcm.service" ];
-      before = [ "phpfpm-think-backend-gtcm.service" ];
-      requires = [ "mysql.service" ];
-      after = [ "mysql.service" ];
-      serviceConfig = {
-        type = "oneshot";
-        RemainAfterExit = true;
-        User = cfg.user;
-        UMask = 77;
-        WorkingDirectory = "${think-backend-gtcm}";
-        RuntimeDirectory = "think-backend-gtcm/cache";
-        RuntimeDirectoryMode = 700;
-      };
-      path = [ pkgs.replace-secret ];
-      script =
-        let
-          isSecret = v: lib.isAttrs v && v ? _secret && lib.isString v._secret;
-          gtcmEnvVars = lib.generators.toKeyValue {
-            mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" {
-              mkValueString =
-                v:
-                with builtins;
-                if isInt v then
-                  toString v
-                else if isString v then
-                  v
-                else if true == v then
-                  "true"
-                else if false == v then
-                  "false"
-                else if isSecret v then
-                  hashString "sha256" v._secret
-                else
-                  throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty { }) v}";
-            };
-          };
-          secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.settings);
-          mkSecretReplacement = file: ''
-            replace-secret ${
-              lib.escapeShellArgs [
-                (builtins.hashString "sha256" file)
-                file
-                "${cfg.dataDir}/.env"
-              ]
-            }
-          '';
-          secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths;
-          filteredConfig = lib.converge (lib.filterAttrsRecursive (
-            _: v:
-            !lib.elem v [
-              { }
-              null
-            ]
-          )) cfg.settings;
-          gtcmEnv = pkgs.writeText "gtcm-be.env" (gtcmEnvVars filteredConfig);
-        in
-        ''
-          # error handling
-          set -euo pipefail
-
-          # create .env file
-          install -T -m 0600 -o ${cfg.user} ${gtcmEnv} "${cfg.dataDir}/.env"
-          ${secretReplacements}
-          if ! grep 'APP_KEY=base64:' "${cfg.dataDir}/.env" >/dev/null; then
-            sed -i 's/APP_KEY=/APP_KEY=base64:/' "${cfg.dataDir}/.env"
-          fi
-
-          # migrate & seed db
-          ${lib.getExe php} artisan key:generate --force
-          ${lib.getExe php} artisan migrate --force
-          ${lib.getExe php} artisan storage:link
-          ${lib.getExe php} artisan config:cache
-        '';
-    };
-
-    systemd.tmpfiles.rules = [
-      "d ${cfg.dataDir}                            0710 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/cache                      0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/public                     0755 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/public/uploads             0755 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage                    0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/app                0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/fonts              0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework          0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework/cache    0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework/sessions 0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework/views    0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/logs               0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/uploads            0700 ${cfg.user} ${cfg.group} - -"
-
-      "d ${cfg.dataDir}/gtcm-file-uploader/uploads      0700 ${cfg.user} ${cfg.group} - -"
-    ];
-
-    networking.firewall.allowedTCPPorts = [
-      80
-      443
-    ];
-
-    services.nginx = {
-      enable = true;
-      recommendedTlsSettings = true;
-      recommendedOptimisation = true;
-      recommendedGzipSettings = true;
-      recommendedBrotliSettings = true;
-      recommendedProxySettings = true;
-      virtualHosts."${cfg.domain}" = {
-        root = "${think-backend-gtcm}/public";
-        locations = {
-          "/" = {
-            index = "index.php";
-            tryFiles = "$uri $uri/ /index.php?$query_string";
-          };
-          "/uploads" = {
-            root = "${cfg.dataDir}/public/uploads";
-            index = "index.php index.html";
-            tryFiles = "$uri $uri/ /index.php";
-          };
-          "/storage" = {
-            root = "${cfg.dataDir}/public/storage";
-            index = "index.php index.html";
-            tryFiles = "$uri $uri/ /index.php";
-          };
-          "~ \\.php$".extraConfig = ''
-            fastcgi_pass unix:${config.services.phpfpm.pools."think-backend-gtcm".socket};
-          '';
-          "~ \\.(js|css|gif|png|ico|jpg|jpeg)$" = {
-            extraConfig = "expires 365d;";
-          };
-          "^~ /initiate-multipart-upload".extraConfig = nginxNodeProxyConfig;
-          "^~ /get-presigned-url".extraConfig = nginxNodeProxyConfig;
-          "^~ /complete-multipart-upload".extraConfig = nginxNodeProxyConfig;
-          "^~ /generate-presigned-url".extraConfig = nginxNodeProxyConfig;
-          "^~ /enable-bucket-cors".extraConfig = nginxNodeProxyConfig;
-          "^~ /upload".extraConfig = nginxNodeProxyConfig;
-        };
-      };
-    };
-
-    services.mysql = {
-      enable = true;
-      package = lib.mkForce pkgs.mariadb;
-      ensureDatabases = [ cfg.settings.DB_DATABASE ];
-      ensureUsers = [
-        {
-          name = cfg.settings.DB_USERNAME;
-          ensurePermissions = {
-            "${cfg.settings.DB_DATABASE}.*" = "ALL PRIVILEGES";
-          };
-        }
-      ];
-    };
-  };
-}
--- a/modules/nixos/think-gtcm.nix
+++ b/modules/nixos/think-gtcm.nix
@@ -1,305 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  cfg = config.services.think-greaterchiangmai;
-  think-gtcm = pkgs.think-gtcm.override { dataDir = cfg.dataDir; };
-  defaultUser = "gtcm";
-  defaultGroup = "gtcm";
-
-  php = pkgs.php83;
-
-  artisan = pkgs.writeScriptBin "gtcm" ''
-    #! ${pkgs.runtimeShell}
-    cd ${think-gtcm}
-    sudo() {
-      if [[ "$USER" != ${cfg.user} ]]; then
-        exec /run/wrappers/bin/sudo -u ${cfg.user} "$@"
-      else
-        exec "$@"
-      fi
-    }
-    sudo ${lib.getExe php} artisan "$@"
-  '';
-
-in
-{
-  options.services.think-greaterchiangmai = {
-    enable = lib.mkEnableOption "To enable think.greaterchiangmai.com";
-
-    dataDir = lib.mkOption {
-      type = lib.types.path;
-      default = "/var/lib/think.greaterchiangmai.com";
-      description = "A place where to store states";
-    };
-
-    user = lib.mkOption {
-      type = lib.types.str;
-      default = defaultUser;
-      description = "User account under which this runs.";
-    };
-
-    group = lib.mkOption {
-      type = lib.types.str;
-      default = defaultGroup;
-      defaultText = "${defaultGroup}";
-      description = "Group under which the website runs.";
-    };
-
-    package = lib.mkPackageOption pkgs "think-gtcm" { };
-
-    packageBackend = lib.mkPackageOption pkgs "think-backend-gtcm" { };
-
-    domain = lib.mkOption {
-      type = lib.types.str;
-      default = "think.greaterchiangmai.com";
-      example = "forum.example.com";
-      description = "Domain to serve on.";
-    };
-
-    settings = lib.mkOption {
-      type =
-        with lib.types;
-        attrsOf (
-          nullOr (
-            either
-              (oneOf [
-                bool
-                int
-                port
-                path
-                str
-              ])
-              (submodule {
-                options = {
-                  _secret = lib.mkOption {
-                    type = nullOr str;
-                    description = ''
-                      The path to a file containing the value the
-                      option should be set to in the final
-                      configuration file.
-                    '';
-                  };
-                };
-              })
-          )
-        );
-      default = { };
-      description = ''
-        Options for settings environment variables
-      '';
-      example = lib.literalExpression ''
-        {
-          APP_NAME = "Laravel";
-          APP_ENV = "local";
-          APP_KEY = "key";
-          APP_DEBUG = true;
-          APP_URL = "http://localhost";
-
-          LOG_CHANNEL = "stack";
-          LOG_DEPRECATIONS_CHANNEL = "null";
-          LOG_LEVEL = "debug";
-
-          DB_CONNECTION = "mysql";
-          DB_HOST = "127.0.0.1";
-          DB_PORT = "3306";
-          DB_DATABASE = "laravel";
-          DB_USERNAME = "root";
-          DB_PASSWORD = "";
-        }
-      '';
-    };
-
-  };
-  config = lib.mkIf cfg.enable {
-    users.users.${cfg.user} = {
-      isSystemUser = true;
-      home = cfg.dataDir;
-      createHome = true;
-      homeMode = "755";
-      group = cfg.group;
-    };
-    users.groups.${cfg.group} = { };
-
-    services.phpfpm.pools.think-gtcm = {
-      inherit (cfg) user group;
-      phpPackage = php;
-      settings = {
-        "listen.owner" = config.services.nginx.user;
-        "listen.group" = config.services.nginx.group;
-        "listen.mode" = "0600";
-        "pm" = lib.mkDefault "dynamic";
-        "pm.max_children" = lib.mkDefault 10;
-        "pm.max_requests" = lib.mkDefault 500;
-        "pm.start_servers" = lib.mkDefault 2;
-        "pm.min_spare_servers" = lib.mkDefault 1;
-        "pm.max_spare_servers" = lib.mkDefault 3;
-      };
-      phpOptions = ''
-        error_log = syslog
-        log_errors = on
-      '';
-    };
-
-    environment.systemPackages = [
-      artisan
-    ];
-
-    services.think-greaterchiangmai.settings = {
-      APP_SERVICES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/services.php";
-      APP_PACKAGES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/packages.php";
-      APP_CONFIG_CACHE = lib.mkDefault "${cfg.dataDir}/cache/config.php";
-      APP_ROUTES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/routes-v7.php";
-      APP_EVENTS_CACHE = lib.mkDefault "${cfg.dataDir}/cache/events.php";
-    };
-
-    systemd.services.think-gtcm-setup = {
-      description = "think.greaterchiangmai installation";
-      requiredBy = [ "phpfpm-think-gtcm.service" ];
-      before = [ "phpfpm-think-gtcm.service" ];
-      requires = [ "mysql.service" ];
-      after = [ "mysql.service" ];
-      serviceConfig = {
-        type = "oneshot";
-        RemainAfterExit = true;
-        User = cfg.user;
-        UMask = 77;
-        WorkingDirectory = "${think-gtcm}";
-        RuntimeDirectory = "think-gtcm/cache";
-        RuntimeDirectoryMode = 700;
-      };
-      path = [ pkgs.replace-secret ];
-      script =
-        let
-          isSecret = v: lib.isAttrs v && v ? _secret && lib.isString v._secret;
-          gtcmEnvVars = lib.generators.toKeyValue {
-            mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" {
-              mkValueString =
-                v:
-                with builtins;
-                if isInt v then
-                  toString v
-                else if isString v then
-                  v
-                else if true == v then
-                  "true"
-                else if false == v then
-                  "false"
-                else if isSecret v then
-                  hashString "sha256" v._secret
-                else
-                  throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty { }) v}";
-            };
-          };
-          secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.settings);
-          mkSecretReplacement = file: ''
-            replace-secret ${
-              lib.escapeShellArgs [
-                (builtins.hashString "sha256" file)
-                file
-                "${cfg.dataDir}/.env"
-              ]
-            }
-          '';
-          secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths;
-          filteredConfig = lib.converge (lib.filterAttrsRecursive (
-            _: v:
-            !lib.elem v [
-              { }
-              null
-            ]
-          )) cfg.settings;
-          gtcmEnv = pkgs.writeText "gtcm.env" (gtcmEnvVars filteredConfig);
-        in
-        ''
-          # error handling
-          set -euo pipefail
-
-          # create .env file
-          install -T -m 0600 -o ${cfg.user} ${gtcmEnv} "${cfg.dataDir}/.env"
-          ${secretReplacements}
-          if ! grep 'APP_KEY=base64:' "${cfg.dataDir}/.env" >/dev/null; then
-            sed -i 's/APP_KEY=/APP_KEY=base64:/' "${cfg.dataDir}/.env"
-          fi
-
-          # migrate & seed db
-          ${lib.getExe php} artisan key:generate --force
-          ${lib.getExe php} artisan migrate --force
-          ${lib.getExe php} artisan storage:link
-          ${lib.getExe php} artisan config:cache
-        '';
-    };
-
-    systemd.tmpfiles.rules = [
-      "d ${cfg.dataDir}                            0710 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/cache                      0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/public                     0750 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/public/uploads             0750 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage                    0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/app                0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/fonts              0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework          0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework/cache    0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework/sessions 0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/framework/views    0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/logs               0700 ${cfg.user} ${cfg.group} - -"
-      "d ${cfg.dataDir}/storage/uploads            0700 ${cfg.user} ${cfg.group} - -"
-    ];
-
-    networking.firewall.allowedTCPPorts = [
-      80
-      443
-    ];
-
-    services.nginx = {
-      enable = true;
-      recommendedTlsSettings = true;
-      recommendedOptimisation = true;
-      recommendedGzipSettings = true;
-      recommendedBrotliSettings = true;
-      recommendedProxySettings = true;
-      virtualHosts."${cfg.domain}" = {
-        root = "${think-gtcm}/public";
-        locations = {
-          "/" = {
-            index = "index.php";
-            tryFiles = "$uri $uri/ /index.php?$query_string";
-          };
-          "/uploads" = {
-            root = "${cfg.dataDir}/public/uploads";
-            index = "index.php index.html";
-            tryFiles = "$uri $uri/ /index.php";
-          };
-          "/storage" = {
-            root = "${cfg.dataDir}/public/storage";
-            index = "index.php index.html";
-            tryFiles = "$uri $uri/ /index.php";
-          };
-          "~ \\.php$".extraConfig = ''
-            fastcgi_pass unix:${config.services.phpfpm.pools."think-gtcm".socket};
-          '';
-          "~ \\.(js|css|gif|png|ico|jpg|jpeg)$" = {
-            extraConfig = "expires 365d;";
-          };
-        };
-      };
-    };
-
-    services.mysql = {
-      enable = true;
-      package = pkgs.mariadb;
-      ensureDatabases = [ cfg.settings.DB_DATABASE ];
-      ensureUsers = [
-        {
-          name = cfg.settings.DB_USERNAME;
-          ensurePermissions = {
-            "${cfg.settings.DB_DATABASE}.*" = "ALL PRIVILEGES";
-          };
-        }
-      ];
-    };
-  };
-}
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,8 +0,0 @@
-{ inputs,... }:
-{
-  flake.overlays = {
-    packagesOverlay = import ../pkgs/overlay.nix;
-    default = final: prev: import (../pkgs/overlay.nix) inputs final prev;
-  };
-
-}
--- a/pkgs/gtcm-file-uploader.nix
+++ b/pkgs/gtcm-file-uploader.nix
@@ -1,40 +0,0 @@
-{
-  fetchgit,
-  buildNpmPackage,
-  pkgs,
-  dataDir ? "/var/lib/gtcm-file-uploader",
-}:
-let
-  repoSrc = fetchgit {
-    url = "https://git.b4l.co.th/newedge/think-greaterchiangmai";
-    rev = "6f8c8d7dfaf5a0c1eb2077de1d6fb35ceaf3d4ec";
-    hash = "sha256-2mCdn8xGjWZrANclctGTmxQhkNc43VzlzMTVwVIFJcM=";
-  };
-  src = "${repoSrc}/upload-large-file";
-in
-buildNpmPackage {
-  pname = "gtcm-file-uploader";
-  version = "1.0.0";
-
-  nativeBuildInputs = with pkgs; [
-    nodejs_20
-    breakpointHook
-  ];
-
-  inherit src;
-
-  npmDepsHash = "sha256-JEp2F1CQfuV9fSYZRdRO+BiOE9dy1ReK6doJcqCuxu4=";
-
-  buildPhase = ''
-    npm install
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out
-    cp -r * $out
-    ln -s ${dataDir}/.env $out/.env
-    ln -s ${dataDir}/gtcm-file-uploader/uploads $out/src/be/uploads
-    runHook postInstall
-  '';
-}
--- a/pkgs/inventree/default.nix
+++ b/pkgs/inventree/default.nix
@@ -1,145 +0,0 @@
-{
-  stdenvNoCC,
-  python3,
-  fetchFromGitHub,
-  fetchYarnDeps,
-  yarnConfigHook,
-  nodejs,
-}:
-let
-  version = "unstable-2025-05-09";
-
-  src = fetchFromGitHub {
-    owner = "inventree";
-    repo = "InvenTree";
-    rev = "e0acfaa762da0dd7b2822b567202210ca8b7dbd3";
-    hash = "sha256-K+cqErDUmgPO7625P3jp7+7BOYEfyJ1nElae6RlJvvI=";
-  };
-
-  frontend = stdenvNoCC.mkDerivation {
-    name = "inventree-frontend";
-    inherit version src;
-
-    yarnOfflineCache = fetchYarnDeps {
-      yarnLock = "${src}/src/frontend/yarn.lock";
-      hash = "sha256-KpWuYCrkGN+4UnwV1STEbTL0FWcLZ7Wq8a8ST55OpGM=";
-    };
-
-    nativeBuildInputs = [
-      yarnConfigHook
-      nodejs
-    ];
-
-    patchPhase = ''
-      runHook prePatch
-      cd src/frontend
-      runHook postPatch
-    '';
-
-    buildPhase = ''
-      echo "Running lingui"
-      ./node_modules/.bin/lingui compile --typescript
-      echo building lib
-      ./node_modules/.bin/tsc --p ./tsconfig.lib.json
-      ./node_modules/.bin/vite --config vite.lib.config.ts build
-      echo "Running tsc"
-      ./node_modules/.bin/tsc
-      echo "Running vite"
-      ./node_modules/.bin/vite build --emptyOutDir --outDir $out
-    '';
-  };
-
-in
-python3.pkgs.buildPythonApplication rec {
-  pname = "InvenTree";
-  inherit version src;
-
-  format = "other";
-
-  dependencies = with python3.pkgs; [
-    coreapi
-    cryptography
-    distutils
-    dj-rest-auth
-    django_4
-    django-allauth
-    django-allauth.optional-dependencies.openid
-    django-allauth.optional-dependencies.mfa
-    django-allauth.optional-dependencies.socialaccount
-    django-cleanup
-    django-cors-headers
-    django-dbbackup
-    django-error-report-2
-    django-filter
-    django-flags
-    django-formtools
-    django-ical
-    django-js-asset
-    django-maintenance-mode
-    django-markdownify
-    django-money
-    django-mptt
-    django-redis
-    django-oauth-toolkit
-    django-otp
-    django-q-sentry
-    django-q2
-    django-redis
-    django-sesame
-    django-sql-utils
-    django-structlog
-    django-stdimage
-    django-taggit
-    django-user-sessions
-    django-weasyprint
-    djangorestframework
-    djangorestframework-simplejwt
-    djangorestframework-simplejwt.optional-dependencies.crypto
-    django-xforwardedfor-middleware
-    drf-spectacular
-    dulwich
-    feedparser
-    gunicorn
-    pdf2image
-    pillow
-    pint
-    pip-licenses
-    pypdf
-    python-barcode
-    python-barcode.optional-dependencies.images
-    python-dotenv
-    pyyaml
-    qrcode
-    qrcode.optional-dependencies.pil
-    rapidfuzz
-    sentry-sdk
-    tablib
-    tablib.optional-dependencies.xls
-    tablib.optional-dependencies.xlsx
-    tablib.optional-dependencies.yaml
-    weasyprint
-    whitenoise
-
-    psycopg2
-    fido2
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [ django-slowtests ];
-
-  installPhase = ''
-    mkdir -p $out/opt/inventree
-    cp -r . $out/opt/inventree
-
-    echo "Installing frontend"
-
-    mkdir -p $out/opt/inventree/src/backend/InvenTree/web/static/web
-    cp -r ${frontend}/* $out/opt/inventree/src/backend/InvenTree/web/static/web/
-    cp -r ${frontend}/.* $out/opt/inventree/src/backend/InvenTree/web/static/web/
-  '';
-
-  passthru = {
-    pythonPath = python3.pkgs.makePythonPath dependencies;
-    gunicorn = python3.pkgs.gunicorn;
-    inherit frontend;
-  };
-}
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -1,29 +0,0 @@
-final: prev: {
-  think-gtcm = final.callPackage ./think-gtcm.nix { };
-  think-backend-gtcm = final.callPackage ./think-backend-gtcm.nix { php = final.php83; };
-  gtcm-file-uploader = final.callPackage ./gtcm-file-uploader.nix { };
-
-  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-    (py-final: py-prev: {
-      django-dbbackup = py-final.callPackage ./python/django-dbbackup { };
-      django-error-report-2 = py-final.callPackage ./python/django-error-report-2 { };
-      django-flags = py-final.callPackage ./python/django-flags { };
-      django-ical = py-final.callPackage ./python/django-ical { };
-      django-markdownify = py-final.callPackage ./python/django-markdownify { };
-      django-money = py-final.callPackage ./python/django-money { };
-      django-q-sentry = py-final.callPackage ./python/django-q-sentry { };
-      django-recurrence = py-final.callPackage ./python/django-recurrence { };
-      django-slowtests = py-final.callPackage ./python/django-slowtests { };
-      django-structlog = py-final.callPackage ./python/django-structlog { };
-      django-stdimage = py-final.callPackage ./python/django-stdimage { };
-      django-user-sessions = py-final.callPackage ./python/django-user-sessions { };
-      django-weasyprint = py-final.callPackage ./python/django-weasyprint { };
-      django-xforwardedfor-middleware = py-final.callPackage ./python/django-xforwardedfor-middleware { };
-      pip-licenses = py-final.callPackage ./python/pip-licenses { };
-      py-moneyed = py-final.callPackage ./python/py-moneyed { };
-      pytest-pycodestyle = py-final.callPackage ./python/pytest-codestyle { };
-      sentry-sdk = py-final.callPackage ./python/sentry-sdk { };
-    })
-  ];
-  inventree = final.callPackage ./inventree { python3 = final.python312; };
-}
--- a/pkgs/python/django-dbbackup/default.nix
+++ b/pkgs/python/django-dbbackup/default.nix
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django_4,
-  pytz,
-}:
-
-buildPythonPackage rec {
-  pname = "django-dbbackup";
-  version = "4.2.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = "django-dbbackup";
-    rev = version;
-    hash = "sha256-GD+f9mbImGPQ6MOUK3ftHqiGv7TT39jNQsFvd0dnnWU=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [
-    django_4
-    pytz
-  ];
-
-  pythonImportsCheck = [ "dbbackup" ];
-
-  meta = {
-    description = "Management commands to help backup and restore your project database and media files";
-    homepage = "https://github.com/jazzband/django-dbbackup";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
-    mainProgram = "django-dbbackup";
-  };
-}
--- a/pkgs/python/django-error-report-2/default.nix
+++ b/pkgs/python/django-error-report-2/default.nix
@@ -1,37 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django,
-}:
-
-buildPythonPackage rec {
-  pname = "django-error-report-2";
-  version = "0.4.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "matmair";
-    repo = "django-error-report-2";
-    rev = version;
-    hash = "sha256-ZCaslqgruJxM8345/jSlZGruM+27H9hvwL0wtPkUzc0=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [ django ];
-
-  pythonImportsCheck = [ "error_report" ];
-
-  meta = {
-    description = "Log/View Django server errors";
-    homepage = "https://github.com/matmair/django-error-report-2";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-flags/default.nix
+++ b/pkgs/python/django-flags/default.nix
@@ -1,37 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django,
-}:
-
-buildPythonPackage rec {
-  pname = "django-flags";
-  version = "5.0.13";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "cfpb";
-    repo = "django-flags";
-    rev = version;
-    hash = "sha256-WPMfFYoP6WaVzZmVtqAz4LlY761aCRyPhd5npc8bOOI=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [ django ];
-
-  pythonImportsCheck = [ "flags" ];
-
-  meta = {
-    description = "Feature flags for Django projects";
-    homepage = "https://github.com/cfpb/django-flags";
-    license = lib.licenses.cc0;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-ical/default.nix
+++ b/pkgs/python/django-ical/default.nix
@@ -1,46 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  django,
-  django-recurrence,
-  icalendar,
-}:
-
-buildPythonPackage rec {
-  pname = "django-ical";
-  version = "1.9.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = "django-ical";
-    rev = version;
-    hash = "sha256-DUe0loayGcUS7MTyLn+g0KBxbIY7VsaoQNHGSMbMI3U=";
-  };
-
-  build-system = [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  dependencies = [
-    django
-    django-recurrence
-    icalendar
-  ];
-
-  pythonImportsCheck = [ "django_ical" ];
-
-  meta = {
-    description = "ICal feeds for Django based on Django's syndication feed framework";
-    homepage = "https://github.com/jazzband/django-ical";
-    changelog = "https://github.com/jazzband/django-ical/blob/${src.rev}/CHANGES.rst";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-markdownify/default.nix
+++ b/pkgs/python/django-markdownify/default.nix
@@ -1,39 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  bleach,
-  django,
-  markdown,
-}:
-
-buildPythonPackage rec {
-  pname = "django-markdownify";
-  version = "0.9.5";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "erwinmatijsen";
-    repo = "django-markdownify";
-    rev = version;
-    hash = "sha256-KYU8p8NRD4EIS/KhOk9nvmXCf0RWEc+IFZ57YtsDSWE=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    bleach
-    django
-    markdown
-  ];
-
-  pythonImportsCheck = [ "markdownify" ];
-
-  meta = {
-    description = "Markdown template filter for Django";
-    homepage = "https://github.com/erwinmatijsen/django-markdownify";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-money/default.nix
+++ b/pkgs/python/django-money/default.nix
@@ -1,41 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django,
-  py-moneyed,
-}:
-
-buildPythonPackage rec {
-  pname = "django-money";
-  version = "3.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "django-money";
-    repo = "django-money";
-    rev = version;
-    hash = "sha256-eL26NsreUqtMJ26TmvmB53EJI4Sjs7qjFDnnt4N0vdI=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [
-    django
-    py-moneyed
-  ];
-
-  pythonImportsCheck = [ "djmoney" ];
-
-  meta = {
-    description = "Money fields for Django forms and models";
-    homepage = "https://github.com/django-money/django-money";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-q-sentry/default.nix
+++ b/pkgs/python/django-q-sentry/default.nix
@@ -1,37 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  poetry-core,
-  setuptools,
-  sentry-sdk,
-}:
-
-buildPythonPackage rec {
-  pname = "django-q-sentry";
-  version = "0.1.6";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "danielwelch";
-    repo = "django-q-sentry";
-    rev = "d3a43a90c82734244d5ebf3295652223053f1354";
-    hash = "sha256-3C7A+X18c7p19HWD/uPRtAMf29VjmrfXXh2z5PPOREY=";
-  };
-
-  build-system = [
-    poetry-core
-    setuptools
-  ];
-
-  dependencies = [ sentry-sdk ];
-
-  pythonImportsCheck = [ "django_q_sentry" ];
-
-  meta = {
-    description = "Bringing Sentry error tracking to Django Q";
-    homepage = "https://github.com/danielwelch/django-q-sentry";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-recurrence/default.nix
+++ b/pkgs/python/django-recurrence/default.nix
@@ -1,56 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pdm-backend,
-  django,
-  flake8,
-  pytest,
-  pytest-cov,
-  pytest-django,
-  pytest-sugar,
-  python-dateutil,
-  sphinx,
-  sphinx-rtd-theme,
-  tox,
-}:
-
-buildPythonPackage rec {
-  pname = "django-recurrence";
-  version = "1.12.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = "django-recurrence";
-    rev = version;
-    hash = "sha256-Q33zyMa1wI13RNLxynGAJHlagahpnFHCmZbHp0aPC/w=";
-  };
-
-  build-system = [ pdm-backend ];
-
-  dependencies = [
-    django
-    flake8
-    pytest
-    pytest-cov
-    pytest-django
-    pytest-sugar
-    python-dateutil
-    sphinx
-    sphinx-rtd-theme
-    tox
-  ];
-
-  pythonRelaxDeps = true;
-
-  pythonImportsCheck = [ "recurrence" ];
-
-  meta = {
-    description = "Utility for working with recurring dates in Django";
-    homepage = "https://github.com/django-recurrence/django-recurrence";
-    changelog = "https://github.com/django-recurrence/django-recurrence/blob/${src.rev}/CHANGES.rst";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-slowtests/default.nix
+++ b/pkgs/python/django-slowtests/default.nix
@@ -1,38 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django_4,
-}:
-
-buildPythonPackage rec {
-  pname = "django-slowtests";
-  version = "1.1.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "realpython";
-    repo = "django-slow-tests";
-    rev = version;
-    hash = "sha256-gW9AZiMpXJp1m2X1cbm6GdZ9cH+TFqjNLQJFmsvGjB0=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [ django_4 ];
-
-  pythonImportsCheck = [ "django_slowtests" ];
-
-  meta = {
-    description = "Locate your slowest tests";
-    homepage = "https://github.com/realpython/django-slow-tests";
-    changelog = "https://github.com/realpython/django-slow-tests/blob/${src.rev}/CHANGELOG.rst";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-stdimage/default.nix
+++ b/pkgs/python/django-stdimage/default.nix
@@ -1,51 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  django,
-  pillow,
-  gettext,
-}:
-
-buildPythonPackage rec {
-  pname = "django-stdimage";
-  version = "6.0.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "codingjoe";
-    repo = "django-stdimage";
-    rev = version;
-    hash = "sha256-uwVU3Huc5fitAweShJjcMW//GBeIpJcxqKKLGo/EdIs=";
-  };
-
-  build-system = [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  dependencies = [
-    django
-    pillow
-  ];
-
-  nativeBuildInputs = [ gettext ];
-
-  preBuild = ''
-    echo "bla bla"
-    echo $PATH
-  '';
-
-  pythonImportsCheck = [ "stdimage" ];
-
-  meta = {
-    description = "";
-    homepage = "https://github.com/codingjoe/django-stdimage";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-structlog/default.nix
+++ b/pkgs/python/django-structlog/default.nix
@@ -1,48 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  asgiref,
-  django,
-  django-ipware,
-  structlog,
-  celery,
-  django-extensions,
-}:
-
-buildPythonPackage rec {
-  pname = "django-structlog";
-  version = "9.1.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "jrobichaud";
-    repo = "django-structlog";
-    rev = version;
-    hash = "sha256-SEigOdlXZtfLAgRgGkv/eDNDAiiHd7YthRJ/H6e1v5U=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    asgiref
-    django
-    django-ipware
-    structlog
-  ];
-
-  optional-dependencies = {
-    celery = [ celery ];
-    commands = [ django-extensions ];
-  };
-
-  pythonImportsCheck = [ "django_structlog" ];
-
-  meta = {
-    description = "";
-    homepage = "https://github.com/jrobichaud/django-structlog";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-user-sessions/default.nix
+++ b/pkgs/python/django-user-sessions/default.nix
@@ -1,39 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  django,
-}:
-
-buildPythonPackage rec {
-  pname = "django-user-sessions";
-  version = "2.0.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = "django-user-sessions";
-    rev = version;
-    hash = "sha256-Wexy6G2pZ8LTnqtJkBZIePV7qhQW8gu/mKiQfZtgf/o=";
-  };
-
-  build-system = [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  dependencies = [ django ];
-
-  pythonImportsCheck = [ "user_sessions" ];
-
-  meta = {
-    description = "Extend Django sessions with a foreign key back to the user, allowing enumerating all user's sessions";
-    homepage = "http://github.com/jazzband/django-user-sessions";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-weasyprint/default.nix
+++ b/pkgs/python/django-weasyprint/default.nix
@@ -1,38 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  django,
-  weasyprint,
-}:
-
-buildPythonPackage rec {
-  pname = "django-weasyprint";
-  version = "2.4.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "fdemmer";
-    repo = "django-weasyprint";
-    rev = "v${version}";
-    hash = "sha256-eSh1p+5MyYb6GIEgSdlFxPzVCenlkwSCTkTzgKjezIg=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    django
-    weasyprint
-  ];
-
-  pythonImportsCheck = [ "django_weasyprint" ];
-
-  meta = {
-    description = "A Django class-based view generating PDF resposes using WeasyPrint";
-    homepage = "https://github.com/fdemmer/django-weasyprint";
-    changelog = "https://github.com/fdemmer/django-weasyprint/blob/${src.rev}/CHANGELOG.md";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/django-xforwardedfor-middleware/default.nix
+++ b/pkgs/python/django-xforwardedfor-middleware/default.nix
@@ -1,37 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django,
-}:
-
-buildPythonPackage rec {
-  pname = "django-xforwardedfor-middleware";
-  version = "2.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "allo-";
-    repo = "django-xforwardedfor-middleware";
-    rev = "v${version}";
-    hash = "sha256-dDXSb17kXOSeIgY6wid1QFHhUjrapasWgCEb/El51eA=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [ django ];
-
-  pythonImportsCheck = [ "x_forwarded_for" ];
-
-  meta = {
-    description = "Use the X-Forwarded-For header to get the real ip of a request";
-    homepage = "https://github.com/allo-/django-xforwardedfor-middleware";
-    license = lib.licenses.publicDomain;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/pip-licenses/default.nix
+++ b/pkgs/python/pip-licenses/default.nix
@@ -1,74 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  prettytable,
-  tomli,
-  autopep8,
-  black,
-  docutils,
-  isort,
-  mypy,
-  pip-tools,
-  pypandoc,
-  pytest-cov,
-  pytest-pycodestyle,
-  pytest-runner,
-  tomli-w,
-  twine,
-}:
-
-buildPythonPackage rec {
-  pname = "pip-licenses";
-  version = "5.0.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "raimon49";
-    repo = "pip-licenses";
-    rev = "v-${version}";
-    hash = "sha256-6xw6BCuXSzNcwkpHaEFC5UPpubPUwhx/pg6vZq2er7A=";
-  };
-
-  build-system = [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  dependencies = [
-    prettytable
-    tomli
-  ];
-
-  optional-dependencies = {
-    dev = [
-      autopep8
-      black
-      docutils
-      isort
-      mypy
-      pip-tools
-      pypandoc
-      pytest-cov
-      pytest-pycodestyle
-      pytest-runner
-      tomli-w
-      twine
-      wheel
-    ];
-  };
-
-  pythonImportsCheck = [ "piplicenses" ];
-
-  meta = {
-    description = "Dump the license list of packages installed with pip";
-    homepage = "https://github.com/raimon49/pip-licenses";
-    changelog = "https://github.com/raimon49/pip-licenses/blob/${src.rev}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/py-moneyed/default.nix
+++ b/pkgs/python/py-moneyed/default.nix
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  babel,
-  typing-extensions,
-}:
-
-buildPythonPackage rec {
-  pname = "py-moneyed";
-  version = "3.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "py-moneyed";
-    repo = "py-moneyed";
-    rev = "v${version}";
-    hash = "sha256-k0ZbLwog6TYxKDLZV7eH1Br8buMPfpOkgp+pMN/qdB8=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [
-    babel
-    typing-extensions
-  ];
-
-  pythonImportsCheck = [ "moneyed" ];
-
-  meta = {
-    description = "Provides Currency and Money classes for use in your Python code";
-    homepage = "http://github.com/py-moneyed/py-moneyed";
-    changelog = "https://github.com/py-moneyed/py-moneyed/blob/${src.rev}/CHANGES.rst";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/python/sentry-sdk/default.nix
+++ b/pkgs/python/sentry-sdk/default.nix
@@ -1,43 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  certifi,
-  urllib3,
-}:
-
-buildPythonPackage rec {
-  pname = "sentry-sdk";
-  version = "2.26.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "getsentry";
-    repo = "sentry-python";
-    rev = version;
-    hash = "sha256-Wl8yq2X9GuPcqaS93hkKXs2cDzz282Xceaai4NjbVZY=";
-    fetchSubmodules = true;
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [
-    certifi
-    urllib3
-  ];
-
-  pythonImportsCheck = [ "sentry_sdk" ];
-
-  meta = {
-    description = "The official Python SDK for Sentry.io";
-    homepage = "https://github.com/getsentry/sentry-python";
-    changelog = "https://github.com/getsentry/sentry-python/blob/${src.rev}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
--- a/pkgs/think-backend-gtcm.nix
+++ b/pkgs/think-backend-gtcm.nix
@@ -1,36 +0,0 @@
-{
-  fetchgit,
-  php,
-  dataDir ? "/var/lib/think-backend-gtcm",
-}:
-let
-  repoSrc = fetchgit {
-    url = "https://git.b4l.co.th/newedge/think-greaterchiangmai";
-    rev = "7c17aa78436538241c09fc7d633904d3c063011e";
-    hash = "sha256-GDx0+PmuCXC+UPtsvsocCZQiTPcnOZEzJI17sxrVv7Q=";
-  };
-  src = "${repoSrc}/think-backend.greaterchiangmai.com";
-in
-php.buildComposerProject2 (finalAttrs: {
-  pname = "think-backend-gtcm";
-  version = "1.0.0";
-
-  inherit src;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out
-    cp -R * $out
-
-    rm -rf $out/storage
-
-    ln -s ${dataDir}/.env $out/.env
-    ln -s ${dataDir}/storage $out/storage
-    ln -s ${dataDir}/public/storage $out/public/storage
-    ln -s ${dataDir}/public/uploads $out/public/uploads
-    runHook postInstall
-  '';
-
-  composerStrictValidation = false;
-  vendorHash = "sha256-wGfbprSDULBje1s5y3+ZiU/nCwYGDEULobZzyzGZ9bQ=";
-})
--- a/pkgs/think-gtcm.nix
+++ b/pkgs/think-gtcm.nix
@@ -1,36 +0,0 @@
-{
-  fetchgit,
-  php,
-  dataDir ? "/var/lib/think-gtcm",
-}:
-let
-  repoSrc = fetchgit {
-    url = "https://git.b4l.co.th/newedge/think-greaterchiangmai";
-    rev = "7c17aa78436538241c09fc7d633904d3c063011e";
-    hash = "sha256-GDx0+PmuCXC+UPtsvsocCZQiTPcnOZEzJI17sxrVv7Q=";
-  };
-  src = "${repoSrc}/think.greaterchiangmai.com";
-in
-php.buildComposerProject2 (finalAttrs: {
-  pname = "think-gtcm";
-  version = "1.0.0";
-
-  inherit src;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out
-    cp -R * $out
-
-    rm -rf $out/storage
-
-    ln -s ${dataDir}/.env $out/.env
-    ln -s ${dataDir}/storage $out/storage
-    ln -s ${dataDir}/public/storage $out/public/storage
-    ln -s ${dataDir}/public/uploads $out/public/uploads
-    runHook postInstall
-  '';
-
-  composerStrictValidation = false;
-  vendorHash = "sha256-b8+AKUmjQiOdV8UC9GYfJzAHFs9+FRSH91YsxKt0rDA=";
-})
--- a/sops/machines/adhil/key.json
+++ b/sops/machines/adhil/key.json
@@ -1,6 +0,0 @@
-[
-  {
-    "publickey": "age1dytdeqtct0jy3vvmqvapgqjf3v9p486jjcpx60gfxwgrptgyyqrs0lj9vc",
-    "type": "age"
-  }
-]
--- a/sops/machines/buna/key.json
+++ b/sops/machines/buna/key.json
@@ -1,6 +0,0 @@
-[
-  {
-    "publickey": "age1pgxgvwck2vr3va6c4c3utj7w2rfg2st9qvm76nc92vhfmplqmu4qs928lm",
-    "type": "age"
-  }
-]
--- a/sops/machines/rana/key.json
+++ b/sops/machines/rana/key.json
@@ -1,6 +0,0 @@
-[
-  {
-    "publickey": "age14l00770djurg4uycw5988nklpeha2wxy35t5jx7x8yp2d6uv7y6s47nskp",
-    "type": "age"
-  }
-]
--- a/sops/secrets/adhil-age.key/groups/admins
+++ b/sops/secrets/adhil-age.key/groups/admins
@@ -1 +0,0 @@
-../../../groups/admins
--- a/sops/secrets/adhil-age.key/secret
+++ b/sops/secrets/adhil-age.key/secret
@@ -1,46 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:DXK8BjWBriLUvOP2jz+48QP87iolYrob32o2D13EID/wiRoJDzz4Txr1AobrHa1NU791coXU2r7gteWA5KjYudXEgQW2opDjPFw=,iv:jLBLq3KqTvuntbLLCCMB8cVTGejetM7oGYV2j9rRlrw=,tag:0h3UtQ4tTDgGxksKmRoSVw==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age134vt63pjqpd0m7702fyn8vhdlzyj2deqc2q78sp9uw9052kxsgwq6d25ez",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBET3d5UTJRNExVRkppSE5I\ncG02V0lDcGZnTmdLRVBkWUlWS3hUaWVaa1NJCkV3V2pseDFQV3RvR0N4cjNqaEk4\naGRkaDBMQnJIc1BlMCtvVW94M0dkYTAKLS0tIHRySkpXMzJiMzFrUU1UekdPUmVi\nMmZiRXBSc3FXMndVNjRqc2xTSlU3RTAK/erwb450pgiQAdYQlrVe32BEiaFIthl2\nUVQTCHQILnxyfC19ZOmlAnSuhXXrj7XdAQmK40DLb0A52QpFC2EP9w==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age17d4qt0n9edq57tgcqyk8eu5mrendl59yt6z2y3a4vkq7el8krqtq6lq28g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxN0dFdWFOdGgrR0hsemYr\nOGpFV1VqQS8vRHA3UURXMEQ2ZDJHcWNCVzBZCitvZTZYdDYzYm8xQzlYNHNVYmRt\nMWNzbitjaUxMSXN5WHp2SVhPY29XY0EKLS0tIGJOSUFBOU1RMHBnQWJsQkg0cFlp\nZ2c5QU5aeDlUMG1KTlMzQ1FPMldTeEUKxyt4xdySOfB8Fa8KjPytjjq0oGgeFBlo\n+uT97/DvDbiBfGaZPaSyJPRP+Mca0yQz9nltCOm7qz68BEjboFKUEw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1fido2-hmac1qqpf43tgcfjm048lsqskvq34w2t4uvrm5qy6m2eg6zjj82ctca8wctgpczxvj0q4y6337uhvsxdh5j86k9h9ymautpvv2759ucwnef75ez7pa7fpkddklp40mxk2tedsp74359g0kefn5rsq0x0yss6cu4yd0h06up0rp08t6yc4l0hfa9y8jn5fkx6nk0hjhz06ykwv0fyxe7z42q683jy0",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIGU1YU05Y1Zm\nZ0Q4RDB5ZFc4cndmaTVTRXc1MXNmdllocGdVa2xrREQwa1kgQVEgd0l6SlBCVW1v\neDl5N0lHYmVrajZzVzVTYjd4WVdNVjZoZVlkUEtmVXlMdyBIdmtoczF0dmhxL1py\nS1hsc0ErckdoVVB0bE02RGdCNW5raERXT1ZJMTkzNjRGNHd2T3ZSTVYrKzZlbEll\nVTZKc2JVN1B2SzRuNkpaekhwSWJQaFZVQQpPNEJKRkdxc1RkRWJ5d3diQzhuTjBy\nV1VNYXRKV2JXMGpPbWEycUlJSUh3Ci0tLSB2Y2dMV0M2OWwyUVRzZVNCZm91a3FL\nQnlFTjV0dnFhZWkxd2tNOWZScUMwCri3NvW7zXusWvELSRNc4kLfAc6JTbR8q4KS\nqu8E80e4gwng53PpHkmK0pBRYnJbZUf5DPITOy1mrbnNGMh6Nbs=\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1fido2-hmac1qqprw0vfpc8wzsu78quc777kmee54ln6nnsjrnrhl7nr33eh4kvkksqp05qqxj4kgfzrmrugrsvg7skx6ghh3q9xc0x0agthtkvy25d9eq7eklta5wf7s30hexkuyl5546rdz9ffa5tawlp5yweqkgccntw0ny540n2am3cqw3luhxkfmrp63kwr6mwplhr9u26wll48x0n3k5f60c7hg9a3",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIEI3YWUzWWxp\nUSszSGNybG9oMitaUXludExlKzVOVFNNVkJteFpadWhtMDggQVEgZlFBRFNyWkNS\nRDJQaUJ3WWowTEcwaTk0Z0tiRHpQNmhkMTJZUlZHbHlEMCBtMzE5bzVQb1JmZkpy\nY0orbEs2RzBSVXA3UmZYZkRRanNnc2pHSnJjK1pLVmZOWGR4d0IwZjh1YXlkakRx\nTm5EMXR3ZjNHWGl0Ty8rcHpQbkcxRTZmZwpiTDJ2VGI5VjZZU0xKdTY4czhiT0RP\nbmZtU1ZQZERLNzk0MHpQM2gzdTVNCi0tLSBheWw4OVk5SzJYbW5ZZWl6SFRraXVK\nKzgrODM2alJON1FqTXczOW5JaWN3CpdplHYscbileaUWp0wSuirTOZUefZNUkbyh\nCqwS2/3JZ2IMhAYLfLoeVRbp7OrncmQF7L3KuvPPaE7WjAYwYug=\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1fido2-hmac1qqpyewum3q8dfcumfgec8nn958aec9f4q9aqy0k06kw5kq27d6fdqdgp0p7y4ru3n5xk90u747xevxa2af3v37e85j9g3axrmw5hdwdfh0wz22hut5vrafxsx26a7vh8fjwkymz3ramfgvvu4detztu075kmpr8l9ydqda0rnjwatdwmfgswg849p37astvld98s3nleeq575azlwc2hhpuh",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIFRMU0NKM2Fh\nQm9uYzYwQnNSWUdReGV1QXFXaXRORUJobURKOTFBbFoxRm8gQVEgZUh4S2o1R2RE\nV0svbnErTmxodXE2bUxJK3lla2lvajB3OXVwZHJtcHU5dyBKU3I4WFJnK3BOQXl0\nZDh5NTB5ZFlteFJIM2FVTVp5cmNyRXZqL1V0c0l6L0tSb0c5ZU9jbmRXMTIwb2c1\nQjZsREgzWUxaOXBUd2pQK2NncDZuUmZkZwpSVVgrL3RicHh2OEgvbC9xSzhjKzNz\nYnRIa0Qyc1I1cUhVZmJkSGk5YU1nCi0tLSBPb3Nud0Q3TjZMMkJvRGZNWklQSlFZ\nNHVndHNjZmljVExmNzNYdzRrZmJRCgwWFdIGjZJfugyk8GSk9zPE/cgERs9E48S9\nVjUEetmVvRPj3jOsseyrF8KF4ZAppo7u10WXKvTZOBTDISpCW0U=\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1hlzrpqqgndcthq5m5yj9egfgyet2fzrxwa6ynjzwx2r22uy6m3hqr3rd06",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuMUoyTlhwOWVSNG1vbGdz\ncDJwc3ZTUjI4OUpLN3lnQWJvME0vbzkyTVJJCkJMbXUwbnVDMG5oNjVJR25wSVZw\nYjEyMWk2Y2pCa2N5ZTlka2tNTFVybXMKLS0tIE45akZVUWdsQmRUWFhuVmdhYTR5\nZ1hKVytCb2pvM0c5UDJlVVBUdXNxS2MKnQXRfa5eXzos/rAa3KUNtzKwXWuyqvU4\naMSGMpzI62JYrzv51od2sJVOPog0jrUsaIFx8rp6nuYsqRZ1fmDzKg==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1sg0rvgyetdcqw7j2x983fh69kdkvqsngpe5x36e5920qa7fze3cqhj4wgx",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpUmdlRldqaFFrZWp5eU5y\nSTRPeTVHdVFOYldkYVdKcFl6dklRMXpVWTE4Ci9KWUhJcnREMzJyNExZSFk0TFJl\nYmlVK1E5ZlFGWlJRZWwreVY3MWtHUzQKLS0tIElDNEl4UXFFNTJyODB6UnhaT3gw\nK1ViUzFLYjFTemcweERlaDNnR0FsaEkKJjG/XkynVLGQVdywXn0cM0db7X7aYrpP\nxYAUaS5SM7Ny0x3sEyP0+KdsWjBuHfi/CVsiTdBJ8CDpwkYSrpw5Lg==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1swlyyk2rzvevqawyeekv75nx2dz34zpe3xqhkqme26gcgeavy4dqrfpcd8",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXVnNpbUV3Z25weGFmTVg5\nOFV6cjl1eHJXemYzbitQNW9tSmNwaWdtQTA4Ci9ueHRSMndKVnJjVTFDQ044NEhs\nUEpuNnpSZDJjZzJuNjFMQ2ZVQWZ2b28KLS0tIE9LMjhPUndWNVBMR3QxQ041Qnc2\nbXR1U1VOWUxPd1ZBMzBxbGEvS2tFK2sKGnpSdS9f3sNFLstp8ONYTRqZVU7ujFAE\nqwTq4BJUlffEc9JXnvS/ZaC7O1yKmz8V5coKSHlbn+IyrZPbx9scaQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vphy2sr6uw4ptsua3gh9khrm2cqyt65t46tusmt44z98qa7q6ymq6prrdl",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFOGd1emMzZkxPRjU1Ylcr\nRlVXbHBnTVV3eU9QU3NxYzBKYUJ5cVg1SXpjClNOYUZBNXMwdHJEVlNoRjdRZWVC\ndTluVVdtdkZDVDcwaGFGZUM4MEE3WUUKLS0tIGlHVVprTjhYQmJva1dQT0ZrdkE0\nNHZZTnhnWi94eURxR3ZCczlCeWxZVmsKOKXVYQAMftId6wXOsI+G/1/xPuVCLZOh\nrDzvaUbipkBTdZ/DXXvXf2f1fDcIqXXtPJyBD7Yh/6+KIPxf8wjVVA==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-12-09T04:18:54Z",
-		"mac": "ENC[AES256_GCM,data:VpfhhVlfPQB94009yErF8NJl+BbhBgc/dAPNyvqQzqORpXsPa9DXjae+giPkRXhTS+263NIglUbPiNqZedj0d9ep78gj/rCupmYcGSsX0gqwFfwj50xX0qWDgs6Z5b7QytDlDPiNOCYM287Q7XLob7CcvAM46Ulo3vx/QKD76Qc=,iv:SBwlzN4PIEPo/iZl/VpkcgNtxqlyNOjqi5y9UGzWQgI=,tag:0/0mKGEQtGOrXYSsn+inmw==,type:str]",
-		"version": "3.11.0"
-	}
-}
--- a/sops/secrets/adhil-age.key/users/kurogeek
+++ b/sops/secrets/adhil-age.key/users/kurogeek
@@ -1 +0,0 @@
-../../../users/kurogeek
--- a/sops/secrets/buna-age.key/groups/admins
+++ b/sops/secrets/buna-age.key/groups/admins
@@ -1 +0,0 @@
-../../../groups/admins
--- a/sops/secrets/buna-age.key/secret
+++ b/sops/secrets/buna-age.key/secret
@@ -1,46 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:j5R4ApBy0c5t6wGmT0kRBT8g/G3HY2yVxR3/U1JqQrm6P/mzqJC5JDigGBWAZcdWv7wxQDXlkGi/ipEEhJsk8/if9S1atlMazF4=,iv:g6VPTjS5I+f7lVLcraBGXkI7cvyPgs3wgrfa14iGdvE=,tag:iz+/QqEBPD9EkRE9EL1mLA==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age134vt63pjqpd0m7702fyn8vhdlzyj2deqc2q78sp9uw9052kxsgwq6d25ez",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBac01oOTRpQWFRaEhqM3FK\ndlpQNmU3d09pVHhxTktCeXRPRWVpZ3dzRGx3CnVLckkzQzlzOFdwc2FvTWF5ODVl\nSXJ4di9CcU9wcHhvNmdJczhDSTZMMWsKLS0tIGRrWHNINjRzeFNPZVBtcm52bmZv\nZVFJT3doVi8rY0RyOENRVEdVNjNoOVEKBwhAaM9nRfShEF2B2N4LBaY3WA0Jzib3\nZRXnpnaSVlbnCqJIXU9bYMA/UIQ7b8bRR2xQ0Y+gMabBI0Dzf6TmoQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age17d4qt0n9edq57tgcqyk8eu5mrendl59yt6z2y3a4vkq7el8krqtq6lq28g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWc2p2NEFFM1NrUllYM0lN\nRUJhQzJXZ3N1ZlpsWmo0L2VneFdnc25KQVUwCkQvdm9leXlMVitQNXN1OHpWM0RI\nZG16bHZVZlZlNHl0UERhWTVpUithalEKLS0tIHo3ZEdtZWo4QmM1SUpuMW8xczg4\nSWFtN2pWS05wdGlQWDZHcFRoWHJUR2sKzy85bPbem51i3FUzhTgk7eEVDbOF3vgR\npbINpu0LikVOrYOgop8cxU94QBWbS1VQd/kCIAYot1jMZs5Xvf9L3A==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1fido2-hmac1qqpf43tgcfjm048lsqskvq34w2t4uvrm5qy6m2eg6zjj82ctca8wctgpczxvj0q4y6337uhvsxdh5j86k9h9ymautpvv2759ucwnef75ez7pa7fpkddklp40mxk2tedsp74359g0kefn5rsq0x0yss6cu4yd0h06up0rp08t6yc4l0hfa9y8jn5fkx6nk0hjhz06ykwv0fyxe7z42q683jy0",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIHNFT3h4K21F\nam5aMStNRHg3b0dFZm5tYmplSmxFRjBiakJJMExjS2poVEkgQVEgd0l6SlBCVW1v\neDl5N0lHYmVrajZzVzVTYjd4WVdNVjZoZVlkUEtmVXlMdyBIdmtoczF0dmhxL1py\nS1hsc0ErckdoVVB0bE02RGdCNW5raERXT1ZJMTkzNjRGNHd2T3ZSTVYrKzZlbEll\nVTZKc2JVN1B2SzRuNkpaekhwSWJQaFZVQQprMG5MSzk0YmlGaHpySzZFYk00eFpr\nbllMYmxkMkU1UlNGVWVYWHB2L3VNCi0tLSBCcUdaem9VYStjRmlsOWx3ckFnd3Nq\nR3BRTE9SaE9TQWs4VUZCRmQ3UmgwCj/4vmhRs9W6U9ay6mYFxPd6SvOTvxvYn/Oo\nuY7/N3PVpXxRK/UwovEGqY97AG/dEQk+I0/5AowFGmfPURpqKjo=\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1fido2-hmac1qqprw0vfpc8wzsu78quc777kmee54ln6nnsjrnrhl7nr33eh4kvkksqp05qqxj4kgfzrmrugrsvg7skx6ghh3q9xc0x0agthtkvy25d9eq7eklta5wf7s30hexkuyl5546rdz9ffa5tawlp5yweqkgccntw0ny540n2am3cqw3luhxkfmrp63kwr6mwplhr9u26wll48x0n3k5f60c7hg9a3",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIGRvMUlHeVhn\nU3BhcEV1bU5uZjZqa25ydHhDOFUyNUQ2SzRadzk2ek9YbjggQVEgZlFBRFNyWkNS\nRDJQaUJ3WWowTEcwaTk0Z0tiRHpQNmhkMTJZUlZHbHlEMCBtMzE5bzVQb1JmZkpy\nY0orbEs2RzBSVXA3UmZYZkRRanNnc2pHSnJjK1pLVmZOWGR4d0IwZjh1YXlkakRx\nTm5EMXR3ZjNHWGl0Ty8rcHpQbkcxRTZmZwpYS0Rrb1poMTRDNmd2eW5QSWJvU1hB\nYVpTYnF1NmQ0SkNsa0xCNTh4bEYwCi0tLSBZZDhMZ0JsQ0dPQ2VWYXpMZE9Fb2FY\nY25qNFdFbVo0dURyUHd1MDl6NFlvCjFQKnkAmGuTioiY11oEgdD4Ctcw1gFF7xR1\nk9RV6JRXe8YeuWYpQjS17vQVR65TpJukYWm9UYy3NPP4Xu72toc=\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1fido2-hmac1qqpyewum3q8dfcumfgec8nn958aec9f4q9aqy0k06kw5kq27d6fdqdgp0p7y4ru3n5xk90u747xevxa2af3v37e85j9g3axrmw5hdwdfh0wz22hut5vrafxsx26a7vh8fjwkymz3ramfgvvu4detztu075kmpr8l9ydqda0rnjwatdwmfgswg849p37astvld98s3nleeq575azlwc2hhpuh",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIE5HdTZDY3VH\nVnNvNHE2blFqM2pma001OGRWdGYxOHY2UkVhVW44bDdGUVEgQVEgZUh4S2o1R2RE\nV0svbnErTmxodXE2bUxJK3lla2lvajB3OXVwZHJtcHU5dyBKU3I4WFJnK3BOQXl0\nZDh5NTB5ZFlteFJIM2FVTVp5cmNyRXZqL1V0c0l6L0tSb0c5ZU9jbmRXMTIwb2c1\nQjZsREgzWUxaOXBUd2pQK2NncDZuUmZkZwpjNkdSYlppQU51Wk40QzBlQ2lzaFBR\naWE1NDNOa21uNUNNWFBZWTVtKzJBCi0tLSBOWE1vUDZtVzRLMVdOMXBsNVpwMEc0\nTmwvZGVHd1Z0akJhempkZEdVSmpFCsnAxyLUrUbyMSBvak3VXBSdR5RmmL7eBjnM\nrw+kRLE8NFVwFiCZXgZDBlB2FkVKYvaL/hxsn4LYi3k53U9+vD0=\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1hlzrpqqgndcthq5m5yj9egfgyet2fzrxwa6ynjzwx2r22uy6m3hqr3rd06",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmOUVPQ0RoSG95RUVnK3hC\nTHFEUHA2VWdadlBoNVRFNUl3Z0hOcjVXaVRzCkRXRTczZWRmenVZeHFWVVBEK2Z3\nVXFPWkpDak84akhEaTdkMjFUcmpnVTAKLS0tIGJLZFQ0UUVYeHkrTCsyYjVHcDQw\nUisxV3RVSEEycGhoSkttaEVXaTV0cFkKKo+lqTI+k6WDdPbMNo1owWH4/RoBt9e6\nmGO+sjziFzrZWUXx4RilR2F/3afRA/CdjzPab9I1sut3I6Z7FXNjYQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1sg0rvgyetdcqw7j2x983fh69kdkvqsngpe5x36e5920qa7fze3cqhj4wgx",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBscXI3NGV1R3lNQjE4U3Nj\nb0ZTNndORXlIY3d4bWVWYzRVTzZHWC9sV3owClRWc2tRaytsQkxFazlyOFU4V2RS\nYTEvY2swdDRnMGowdzZESTVVeTNkN2sKLS0tIFk2alJHUkwrMTVsdG1LQ2pReHA5\nTllyMFhML1JJdWQ1NXJkb2U5K3F4K1UKn6OPUfym5f9aacaHq962347dNeTjBfK/\nAMXPZXs6DawU8vko1RqIgzX/7StrITcXGcFfTutmpSa3KjMzuzeb+Q==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1swlyyk2rzvevqawyeekv75nx2dz34zpe3xqhkqme26gcgeavy4dqrfpcd8",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1eXVNcklwZnI2dEtRaFdD\nOUVON1Nxd2l4L2xtYUtRSHlXVlc0VzVhZkZVCitxYjJTbDZDQjNHc2JrWmFaaEp0\nR1NMUEllalZxeHRndGxGRTZGSzV4TkEKLS0tIDhNZ2x0amhKdk1IdG16S0RLbWMz\nQSs0eTZ5YVBGdkdxYkhweUdMVVR3QVkKmau0k5SxJD/EURq6Lp4aDMYCoCFLOo/I\nRj5mAP4YGIVTU47HJYNcPcwzgwA6YVqVOiKaG6yyU7u1DsddaZHdiw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vphy2sr6uw4ptsua3gh9khrm2cqyt65t46tusmt44z98qa7q6ymq6prrdl",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaHdMdC9jeDFWdktiV1JC\neDlFbW5QbmxVSStMZTYvak16K255TnZzMFdNCnFuOFlHVlYvQStmYWhITWl6NUN1\nOTdFdjg0OWZhUVd3NjQrcXQrNm9CWFkKLS0tIG9VWGZhUDJGWDNjTVg1bFMvVE5u\nYnkzV3QyczIrK1hLbUV1Q2twaDkxNm8KpHCL8htFz8UeMLsXmDUz/nAdTYsRSka1\nuq+bFkrVexExxqXJVyIXf20ceziFG8t5on8OGHDCOQsst4HEgRqyWg==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-12-10T05:04:15Z",
-		"mac": "ENC[AES256_GCM,data:wJ646ZAfUOSwXnkIUDkvm4wz7uaW4U7bCkC/8uFuoTwY16F5+1N7AxaSE453w2cOCJE5qOAXORYj5M7J8o84LjLWYN4+PYjCcU2ulL9rug29fNblqFHG8G1OdHwURep6sGKfvsSCTGgpnA5fYmXucYWIqc27cQ9HDtiHw3Bojas=,iv:L6xUGwjihD08Ahc/3WoA3tZDXvllmNWK90RpK7m+4Pw=,tag:pMynp2rs42lenOYbLQ0c0A==,type:str]",
-		"version": "3.11.0"
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kurogeek	126e3062e9	mob next [ci-skip] [ci skip] [skip ci] lastFile:modules/clan/phonebox/default.nix	2025-12-05 11:30:00 +07:00
kurogeek	df56dba1a1	Update vars via generator yggdrasil for machine rigel	2025-12-05 11:29:35 +07:00
kurogeek	120e2cc616	Update vars via generator yggdrasil for machine neptune	2025-12-05 11:29:34 +07:00
kurogeek	a5adf09f1f	mob next [ci-skip] [ci skip] [skip ci] lastFile:inventories/default.nix	2025-12-05 11:28:57 +07:00