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

lastFile:modules/clan/phonebox/default.nix

flake.lock

@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772411144,
+        "lastModified": 1781517972,
-        "narHash": "sha256-WhXudztwPNnKXaqGX4DOqNfHzHdBSiGCvKGHM20pscw=",
+        "narHash": "sha256-G8bIXFqifs/y62GNPwg20Ksf71raYwzmyN99gf1tXak=",
         "ref": "refs/heads/main",
-        "rev": "92cc85bc24eb31ce5725e1e72753129810ce3fe9",
+        "rev": "7fc62d0c25c7a97d7027a9c248e21c97c9b3acc1",
-        "revCount": 13201,
+        "revCount": 14604,
         "type": "git",
         "url": "https://git.clan.lol/clan/clan-core"
       },
@@ -101,11 +101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772273147,
+        "lastModified": 1778718524,
-        "narHash": "sha256-Wzhoc6ifjTDZi8aVRH3fuLJPdd4ouNTTwwVhgoMcMek=",
+        "narHash": "sha256-pXLoI6Ax0EnUK6r34UM1vibVC7CfTu6j72R2692ZzPs=",
-        "rev": "d5de7a8d9e5726e678c94e62fe8ac3a809fee5da",
+        "rev": "12c552ad547d87254f33f33bddd1a2cdbeac754d",
         "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/d5de7a8d9e5726e678c94e62fe8ac3a809fee5da.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/12c552ad547d87254f33f33bddd1a2cdbeac754d.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -140,11 +140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771881364,
+        "lastModified": 1781152676,
-        "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=",
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -294,11 +294,11 @@
         "std": "std"
       },
       "locked": {
-        "lastModified": 1779175997,
+        "lastModified": 1780907315,
-        "narHash": "sha256-Ps/4s3jwaZdLVEpO+1cRs54VbPbgMeXJUqa4CWSPJSY=",
+        "narHash": "sha256-MR859lKVKeItsC5wnd1oniBar2lBTA+FJ7Bx4xN1Wpk=",
         "owner": "kurogeek",
         "repo": "frappix",
-        "rev": "0f1b4bcfb8c3b976e808a57e491d10857a1a45ac",
+        "rev": "9c2bc4152bce6d91305bcf0563a8a715860c405d",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768068402,
+        "lastModified": 1781557312,
-        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
+        "narHash": "sha256-QOIRYSUFSq7L5mY3dZymaVhcnne3tPgoR9riB0WocjA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
+        "rev": "c03e4752899e55705dfa63979abd885c582a5c48",
         "type": "github"
       },
       "original": {
@@ -484,11 +484,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772379624,
+        "lastModified": 1781242433,
-        "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=",
+        "narHash": "sha256-bchLZZ3sRn740zyvD2icZSnNoTaanN0nw7l6fjVXO+E=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "52d061516108769656a8bd9c6e811c677ec5b462",
+        "rev": "aabb2037edfc0f210723b72cd5f528aab5dd3f0b",
         "type": "github"
       },
       "original": {
@@ -522,11 +522,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714086354,
+        "lastModified": 1746801636,
-        "narHash": "sha256-yKVQMxL9p7zCWUhnGhDzRVT8sDgHoI3V595lBK0C2YA=",
+        "narHash": "sha256-dlcKfIXp/eqFHzFm+DzseXAWWlpVwyk9cTvCKGtVKkw=",
         "owner": "nix-community",
         "repo": "nixago",
-        "rev": "5133633e9fe6b144c8e00e3b212cdbd5a173b63d",
+        "rev": "8cc33f973ab3a891d8a41391e73ef451a783960b",
         "type": "github"
       },
       "original": {
@@ -552,11 +552,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1778458615,
+        "lastModified": 1781359544,
-        "narHash": "sha256-cY07EsdhBJ8tFXPzDYevgqxRev9ZLxFonuq9wmq5kwg=",
+        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c6e5ca3c836a5f4dd9af9f2c1fc1c38f0fac988a",
+        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
         "type": "github"
       },
       "original": {
@@ -673,11 +673,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772340640,
+        "lastModified": 1780547341,
-        "narHash": "sha256-1nq7+Kt5IUBD8Hu3nptVPbMf+22rNJoHT0t9L1X+GKA=",
+        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "dec4d8eac700dcd2fe3c020857d3ee220ec147f1",
+        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
         "type": "github"
       },
       "original": {
@@ -764,15 +764,16 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1774449309,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
+        "ref": "future-26.11",
         "repo": "default",
         "type": "github"
       }

flake.nix

@@ -56,7 +56,6 @@
           ./shell.nix
 
           ./overlays
-          ./modules/nixos
           ./machines
           ./routers
           ./inventories

inventories/default.nix

@@ -102,7 +102,13 @@
             name = "zerotier";
             input = "clan-core";
           };
-          roles.controller.machines."vega" = { };
+          roles.controller.machines."vega" = {
+            settings.allowedIds = [
+              "dbe44c0287" # Alex-gateway
+              "b0e0b84fd3" # Alex
+              "2bd36db8cc" # kurogeek-thinkpad
+            ];
+          };
           roles.peer.tags.glom = { };
         };
 
@@ -111,7 +117,13 @@
             name = "zerotier";
             input = "clan-core";
           };
-          roles.controller.machines."rigel" = { };
+          roles.controller.machines."rigel" = {
+            settings.allowedIds = [
+              "dbe44c0287" # Alex-gateway
+              "b0e0b84fd3" # Alex
+              "2bd36db8cc" # kurogeek-thinkpad
+            ];
+          };
           roles.peer.tags.b4l = { };
         };
 
@@ -166,6 +178,7 @@
             input = "clan-core";
           };
           roles.default.tags."phonebox" = { };
+          roles.default.settings.extraYggdrasilIPs = [ "200:c806:c13b:b855:723f:473:55:7904" ];
           roles.default.settings.extraPeers = [
             "tls://ygg.jjolly.dev:3443"
             "tls://[2602:fc24:18:7a42::1]:993"
@@ -183,6 +196,12 @@
           roles.default.machines."adhil".settings = {
             ata-ethernet-iface = "end0";
           };
+          roles.default.machines."rigel".settings = {
+            extraClientNumbers = [
+              "01"
+              "02"
+            ];
+          };
         };
 
         pulse-stream = {
@@ -287,6 +306,16 @@
             tenants = [
               "poyfestival.com"
             ];
+            phpfpmOptions = ''
+              upload_max_filesize=64M
+              post_max_size=128M
+            '';
+            wpExtraConfig = ''
+              define('WP_MEMORY_LIMIT', '256M');
+              define('WP_DEBUG', false);
+              define('WP_DEBUG_DISPLAY', false);
+              define('WP_DEBUG_LOG', false);
+            '';
           };
         };
       };

machines/bosona/facter.json

@@ -25,10 +25,7 @@
       {
         "index": 8,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "bridge"],
-          "pci",
-          "bridge"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -76,10 +73,7 @@
       {
         "index": 9,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "bridge"],
-          "pci",
-          "bridge"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -131,10 +125,7 @@
       {
         "index": 10,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "bridge"],
-          "pci",
-          "bridge"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -182,10 +173,7 @@
       {
         "index": 11,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "bridge"],
-          "pci",
-          "bridge"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -241,10 +229,7 @@
       {
         "index": 12,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "bridge"],
-          "pci",
-          "bridge"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -297,21 +282,14 @@
         },
         "driver": "piix4_smbus",
         "driver_module": "i2c_piix4",
-        "drivers": [
+        "drivers": ["piix4_smbus"],
-          "piix4_smbus"
+        "driver_modules": ["i2c_piix4"],
-        ],
-        "driver_modules": [
-          "i2c_piix4"
-        ],
         "module_alias": "pci:v00008086d00007113sv00001AF4sd00001100bc06sc80i00"
       },
       {
         "index": 17,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "bridge"],
-          "pci",
-          "bridge"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -361,11 +339,7 @@
       {
         "index": 22,
         "attached_to": 15,
-        "class_list": [
+        "class_list": ["cdrom", "scsi", "block_device"],
-          "cdrom",
-          "scsi",
-          "block_device"
-        ],
         "bus_type": {
           "hex": "0084",
           "name": "SCSI",
@@ -422,14 +396,8 @@
         "unix_device_name2": "/dev/sg1",
         "driver": "ata_piix",
         "driver_module": "ata_piix",
-        "drivers": [
+        "drivers": ["ata_piix", "sr"],
-          "ata_piix",
+        "driver_modules": ["ata_piix", "sr_mod"]
-          "sr"
-        ],
-        "driver_modules": [
-          "ata_piix",
-          "sr_mod"
-        ]
       }
     ],
     "cpu": [
@@ -496,9 +464,7 @@
           "spectre_v2_user",
           "its"
         ],
-        "power_management": [
+        "power_management": [""],
-          ""
-        ],
         "bogo": 4224,
         "cache": 16384,
         "page_size": 4096,
@@ -580,9 +546,7 @@
           "spectre_v2_user",
           "its"
         ],
-        "power_management": [
+        "power_management": [""],
-          ""
-        ],
         "bogo": 4224,
         "cache": 16384,
         "page_size": 4096,
@@ -606,11 +570,7 @@
       {
         "index": 23,
         "attached_to": 19,
-        "class_list": [
+        "class_list": ["disk", "scsi", "block_device"],
-          "disk",
-          "scsi",
-          "block_device"
-        ],
         "bus_type": {
           "hex": "0084",
           "name": "SCSI",
@@ -674,24 +634,15 @@
         ],
         "driver": "virtio_scsi",
         "driver_module": "virtio_scsi",
-        "drivers": [
+        "drivers": ["sd", "virtio_scsi"],
-          "sd",
+        "driver_modules": ["sd_mod", "virtio_scsi"]
-          "virtio_scsi"
-        ],
-        "driver_modules": [
-          "sd_mod",
-          "virtio_scsi"
-        ]
       }
     ],
     "graphics_card": [
       {
         "index": 16,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["graphics_card", "pci"],
-          "graphics_card",
-          "pci"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -748,12 +699,8 @@
         },
         "driver": "bochs-drm",
         "driver_module": "bochs",
-        "drivers": [
+        "drivers": ["bochs-drm"],
-          "bochs-drm"
+        "driver_modules": ["bochs"],
-        ],
-        "driver_modules": [
-          "bochs"
-        ],
         "module_alias": "pci:v00001234d00001111sv00001AF4sd00001100bc03sc00i00"
       }
     ],
@@ -761,10 +708,7 @@
       {
         "index": 24,
         "attached_to": 7,
-        "class_list": [
+        "class_list": ["usb", "hub"],
-          "usb",
-          "hub"
-        ],
         "bus_type": {
           "hex": "0086",
           "name": "USB",
@@ -837,12 +781,8 @@
         "hotplug": "usb",
         "driver": "hub",
         "driver_module": "usbcore",
-        "drivers": [
+        "drivers": ["hub"],
-          "hub"
+        "driver_modules": ["usbcore"],
-        ],
-        "driver_modules": [
-          "usbcore"
-        ],
         "module_alias": "usb:v1D6Bp0001d0618dc09dsc00dp00ic09isc00ip00in00"
       }
     ],
@@ -850,9 +790,7 @@
       {
         "index": 5,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["memory"],
-          "memory"
-        ],
         "base_class": {
           "hex": "0101",
           "name": "Internally Used Class",
@@ -876,9 +814,7 @@
       {
         "index": 21,
         "attached_to": 16,
-        "class_list": [
+        "class_list": ["monitor"],
-          "monitor"
-        ],
         "base_class": {
           "hex": "0100",
           "name": "Monitor",
@@ -1024,10 +960,7 @@
       {
         "index": 25,
         "attached_to": 24,
-        "class_list": [
+        "class_list": ["mouse", "usb"],
-          "mouse",
-          "usb"
-        ],
         "bus_type": {
           "hex": "0086",
           "name": "USB",
@@ -1063,9 +996,7 @@
         "model": "QEMU USB Tablet",
         "sysfs_id": "/devices/pci0000:00/0000:00:01.2/usb1/1-1/1-1:1.0",
         "sysfs_bus_id": "1-1:1.0",
-        "unix_device_names": [
+        "unix_device_names": ["/dev/input/mice"],
-          "/dev/input/mice"
-        ],
         "unix_device_name2": "/dev/input/mouse0",
         "resources": [
           {
@@ -1106,18 +1037,11 @@
         "hotplug": "usb",
         "driver": "usbhid",
         "driver_module": "usbhid",
-        "drivers": [
+        "drivers": ["usbhid"],
-          "usbhid"
+        "driver_modules": ["usbhid"],
-        ],
-        "driver_modules": [
-          "usbhid"
-        ],
         "driver_info": {
           "type": "mouse",
-          "db_entry_0": [
+          "db_entry_0": ["explorerps/2", "exps2"],
-            "explorerps/2",
-            "exps2"
-          ],
           "xf86": "explorerps/2",
           "gpm": "exps2",
           "buttons": -1,
@@ -1130,9 +1054,7 @@
       {
         "index": 18,
         "attached_to": 13,
-        "class_list": [
+        "class_list": ["network_controller"],
-          "network_controller"
-        ],
         "bus_type": {
           "hex": "008f",
           "name": "Virtio",
@@ -1157,9 +1079,7 @@
         "model": "Virtio Ethernet Card 0",
         "sysfs_id": "/devices/pci0000:00/0000:00:12.0/virtio1",
         "sysfs_bus_id": "virtio1",
-        "unix_device_names": [
+        "unix_device_names": ["ens18"],
-          "ens18"
-        ],
         "resources": [
           {
             "type": "hwaddr",
@@ -1172,12 +1092,8 @@
         ],
         "driver": "virtio_net",
         "driver_module": "virtio_net",
-        "drivers": [
+        "drivers": ["virtio_net"],
-          "virtio_net"
+        "driver_modules": ["virtio_net"],
-        ],
-        "driver_modules": [
-          "virtio_net"
-        ],
         "module_alias": "virtio:d00000001v00001AF4"
       }
     ],
@@ -1185,9 +1101,7 @@
       {
         "index": 26,
         "attached_to": 18,
-        "class_list": [
+        "class_list": ["network_interface"],
-          "network_interface"
-        ],
         "base_class": {
           "hex": "0107",
           "name": "Network Interface",
@@ -1201,9 +1115,7 @@
         "model": "Ethernet network interface",
         "sysfs_id": "/class/net/ens18",
         "sysfs_device_link": "/devices/pci0000:00/0000:00:12.0/virtio1",
-        "unix_device_names": [
+        "unix_device_names": ["ens18"],
-          "ens18"
-        ],
         "resources": [
           {
             "type": "hwaddr",
@@ -1216,19 +1128,13 @@
         ],
         "driver": "virtio_net",
         "driver_module": "virtio_net",
-        "drivers": [
+        "drivers": ["virtio_net"],
-          "virtio_net"
+        "driver_modules": ["virtio_net"]
-        ],
-        "driver_modules": [
-          "virtio_net"
-        ]
       },
       {
         "index": 27,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["network_interface"],
-          "network_interface"
-        ],
         "base_class": {
           "hex": "0107",
           "name": "Network Interface",
@@ -1241,19 +1147,14 @@
         },
         "model": "Loopback network interface",
         "sysfs_id": "/class/net/lo",
-        "unix_device_names": [
+        "unix_device_names": ["lo"]
-          "lo"
-        ]
       }
     ],
     "pci": [
       {
         "index": 13,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "unknown"],
-          "pci",
-          "unknown"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -1310,21 +1211,14 @@
         },
         "driver": "virtio-pci",
         "driver_module": "virtio_pci",
-        "drivers": [
+        "drivers": ["virtio-pci"],
-          "virtio-pci"
+        "driver_modules": ["virtio_pci"],
-        ],
-        "driver_modules": [
-          "virtio_pci"
-        ],
         "module_alias": "pci:v00001AF4d00001000sv00001AF4sd00000001bc02sc00i00"
       },
       {
         "index": 14,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["pci", "unknown"],
-          "pci",
-          "unknown"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -1380,12 +1274,8 @@
         },
         "driver": "virtio-pci",
         "driver_module": "virtio_pci",
-        "drivers": [
+        "drivers": ["virtio-pci"],
-          "virtio-pci"
+        "driver_modules": ["virtio_pci"],
-        ],
-        "driver_modules": [
-          "virtio_pci"
-        ],
         "module_alias": "pci:v00001AF4d00001002sv00001AF4sd00000005bc00scFFi00"
       }
     ],
@@ -1393,10 +1283,7 @@
       {
         "index": 6,
         "attached_to": 17,
-        "class_list": [
+        "class_list": ["storage_controller", "pci"],
-          "storage_controller",
-          "pci"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -1453,21 +1340,14 @@
         },
         "driver": "virtio-pci",
         "driver_module": "virtio_pci",
-        "drivers": [
+        "drivers": ["virtio-pci"],
-          "virtio-pci"
+        "driver_modules": ["virtio_pci"],
-        ],
-        "driver_modules": [
-          "virtio_pci"
-        ],
         "module_alias": "pci:v00001AF4d00001004sv00001AF4sd00000008bc01sc00i00"
       },
       {
         "index": 15,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["storage_controller", "pci"],
-          "storage_controller",
-          "pci"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -1557,12 +1437,8 @@
         },
         "driver": "ata_piix",
         "driver_module": "ata_piix",
-        "drivers": [
+        "drivers": ["ata_piix"],
-          "ata_piix"
+        "driver_modules": ["ata_piix"],
-        ],
-        "driver_modules": [
-          "ata_piix"
-        ],
         "module_alias": "pci:v00008086d00007010sv00001AF4sd00001100bc01sc01i80"
       }
     ],
@@ -1573,9 +1449,7 @@
       {
         "index": 19,
         "attached_to": 6,
-        "class_list": [
+        "class_list": ["unknown"],
-          "unknown"
-        ],
         "base_class": {
           "hex": "0000",
           "name": "Unclassified device",
@@ -1593,20 +1467,14 @@
         "sysfs_bus_id": "virtio2",
         "driver": "virtio_scsi",
         "driver_module": "virtio_scsi",
-        "drivers": [
+        "drivers": ["virtio_scsi"],
-          "virtio_scsi"
+        "driver_modules": ["virtio_scsi"],
-        ],
-        "driver_modules": [
-          "virtio_scsi"
-        ],
         "module_alias": "virtio:d00000008v00001AF4"
       },
       {
         "index": 20,
         "attached_to": 14,
-        "class_list": [
+        "class_list": ["unknown"],
-          "unknown"
-        ],
         "base_class": {
           "hex": "0000",
           "name": "Unclassified device",
@@ -1624,12 +1492,8 @@
         "sysfs_bus_id": "virtio0",
         "driver": "virtio_balloon",
         "driver_module": "virtio_balloon",
-        "drivers": [
+        "drivers": ["virtio_balloon"],
-          "virtio_balloon"
+        "driver_modules": ["virtio_balloon"],
-        ],
-        "driver_modules": [
-          "virtio_balloon"
-        ],
         "module_alias": "virtio:d00000005v00001AF4"
       }
     ],
@@ -1637,10 +1501,7 @@
       {
         "index": 7,
         "attached_to": 0,
-        "class_list": [
+        "class_list": ["usb_controller", "pci"],
-          "usb_controller",
-          "pci"
-        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -1707,25 +1568,15 @@
         },
         "driver": "uhci_hcd",
         "driver_module": "uhci_hcd",
-        "drivers": [
+        "drivers": ["uhci_hcd"],
-          "uhci_hcd"
+        "driver_modules": ["uhci_hcd"],
-        ],
-        "driver_modules": [
-          "uhci_hcd"
-        ],
         "driver_info": {
           "type": "module",
-          "db_entry_0": [
+          "db_entry_0": ["uhci-hcd"],
-            "uhci-hcd"
-          ],
           "active": true,
           "modprobe": true,
-          "names": [
+          "names": ["uhci-hcd"],
-            "uhci-hcd"
+          "module_args": [""],
-          ],
-          "module_args": [
-            ""
-          ],
           "conf": ""
         },
         "module_alias": "pci:v00008086d00007020sv00001AF4sd00001100bc0Csc03i00"
@@ -1838,9 +1689,7 @@
           "name": "RAM",
           "value": 7
         },
-        "memory_type_details": [
+        "memory_type_details": ["Other"],
-          "Other"
-        ],
         "speed": 0
       }
     ],

machines/hadar/configuration.nix

@@ -9,13 +9,6 @@ let
 in
 {
   clan.core.settings.machine.description = "VM machine that host Inventree system for Poy";
-  imports = [
-    inputs.self.nixosModules.inventree
-  ];
-
-  nixpkgs.overlays = [
-    inputs.self.overlays.packagesOverlay
-  ];
 
   nixpkgs.hostPlatform = {
     system = "x86_64-linux";
@@ -82,19 +75,12 @@ in
 
   services.inventree = {
     enable = true;
-    hostName = "${domain}";
+    inherit domain;
-    config.site_url = "https://${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;
+    adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
-    config.adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    settings.INVENTREE_SITE_URL = "https://${domain}";
   };
 
-  # services.nginx.virtualHosts."${domain}" = {
-  #   forceSSL = true;
-  #   sslCertificate = config.clan.core.vars.generators.nginx.files.sslCert.path;
-  #   sslCertificateKey = config.clan.core.vars.generators.nginx.files.sslKey.path;
-  # };
-
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
 }

machines/neptune/configuration.nix

@@ -10,7 +10,6 @@
   };
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
 
   networking.interfaces.enx00e04c106368.useDHCP = true; # recovery
 

machines/procyon/configuration.nix

@@ -9,13 +9,6 @@ let
 in
 {
   clan.core.settings.machine.description = "VM machine that host Inventree system for Glom";
-  imports = [
-    inputs.self.nixosModules.inventree
-  ];
-
-  nixpkgs.overlays = [
-    inputs.self.overlays.packagesOverlay
-  ];
 
   nixpkgs.hostPlatform = {
     system = "x86_64-linux";
@@ -82,19 +75,12 @@ in
 
   services.inventree = {
     enable = true;
-    hostName = "${domain}";
+    inherit domain;
-    config.site_url = "https://${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;
+    adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
-    config.adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    settings.INVENTREE_SITE_URL = "https://${domain}";
   };
 
-  # services.nginx.virtualHosts."${domain}" = {
-  #   forceSSL = true;
-  #   sslCertificate = config.clan.core.vars.generators.nginx.files.sslCert.path;
-  #   sslCertificateKey = config.clan.core.vars.generators.nginx.files.sslKey.path;
-  # };
-
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
 }

machines/ramus/configuration.nix

@@ -9,7 +9,6 @@
   clan.core.settings.machine.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;

machines/rigel/configuration.nix

@@ -1,18 +1,7 @@
 { config, ... }:
 {
-  imports = [
-    (import ../../lib/auto-accept-zerotier-members.nix {
-      memberIds = [
-        "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
-        "2bd36db8cc" # kurogeek-thinkpad
-      ];
-    })
-  ];
-
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
 
   clan.core.settings.machine.description = "Zima board computer for testing in B4L";
 }

machines/vega/configuration.nix

@@ -10,17 +10,9 @@
 
     (inputs.import-tree ./services)
 
-    (import ../../lib/auto-accept-zerotier-members.nix {
-      memberIds = [
-        "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
-        "2bd36db8cc" # kurogeek-thinkpad
-      ];
-    })
   ];
 
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
 
   clan.core.settings.machine.description = "Glom NAS";
 

modules/clan/headscale/default.nix

@@ -173,6 +173,7 @@
                 base_domain = settings.base_domain;
                 override_local_dns = true;
                 nameservers.global = settings.nameservers;
+                magic_dns = false;
               };
             };
 

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

@@ -66,8 +66,6 @@
                 "AutofillAddressEnabled" = false;
                 "AutofillCreditCardEnabled" = false;
                 "TranslateEnabled" = false;
-                "DnsOverHttpsMode" = "secure";
-                "DnsOverHttpsTemplates" = "https://dns.adguard-dns.com/dns-query";
               };
             };
 
@@ -81,14 +79,32 @@
                 inputs,
                 ...
               }:
+              let
+                dictionaries =
+                  with pkgs;
+                  (hunspellWithDicts (
+                    with hunspellDicts;
+                    [
+                      en-us-large
+                      th-th
+                    ]
+                  ));
+              in
               {
                 imports = [ inputs.plasma-manager.homeModules.plasma-manager ];
 
+                systemd.user.sessionVariables = {
+                  DICPATH = "${dictionaries}/share/hunspell";
+                };
+
                 home = {
                   homeDirectory = lib.mkForce "/home/${username}";
                   stateVersion = osConfig.system.stateVersion;
+
                   packages = with pkgs; [
-                    libreoffice-fresh
+                    libreoffice-qt6
+                    dictionaries
+
                     element-desktop
                     signal-desktop
                     brave

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

@@ -5,5 +5,4 @@
 
   services.displayManager.sddm.enable = lib.mkForce false;
   services.displayManager.gdm.enable = true;
-  services.displayManager.gdm.wayland = true;
 }

modules/clan/phonebox/default.nix

@@ -24,6 +24,11 @@
           description = "";
           default = "";
         };
+        options.extraClientNumbers = lib.mkOption {
+          type = with lib.types; listOf str;
+          description = "List of client suffix number.";
+          default = [ ];
+        };
       };
     perInstance =
       {
@@ -126,6 +131,22 @@
                 remove_existing=yes
               '';
 
+            genLocalSIPEndpointV6 =
+              { localNumber }:
+              ''
+                [${localNumber}](internal_endpoint)
+                transport=transport-udp6
+                aors=${localNumber}
+                auth=${localNumber}
+
+                [${localNumber}](userpass_auth)
+                username=${localNumber}
+                password=${localNumber}
+
+                [${localNumber}](dynamiic_aor)
+                max_contacts=1
+              '';
+
             genLocalExtenConf =
               { localNumber }:
               ''
@@ -356,6 +377,9 @@
                     + (genLocalExtenConf {
                       localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
                     })
+                    + lib.concatStringsSep "\n" (
+                      builtins.map (number: genLocalExtenConf { localNumber = number; }) settings.extraClientNumbers
+                    )
                     + serverConf;
 
                   "rtp.conf" = ''
@@ -387,6 +411,7 @@
 
                       [base_endpoint](!)
                       type=endpoint
+                      transport=transport-udp
                       disallow=all
                       allow=ulaw,alaw,g722,gsm
                       direct_media=no
@@ -409,6 +434,9 @@
                     + (genLocalSIPEndpoint {
                       localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
                     })
+                    + lib.concatStringsSep "\n" (
+                      builtins.map (number: genLocalSIPEndpointV6 { localNumber = number; }) settings.extraClientNumbers
+                    )
                     + serverConf;
                 };
             };

modules/clan/wordpress/default.nix

@@ -18,6 +18,16 @@
             description = "List of tenants website to host on the instance";
             example = [ "example.com" ];
           };
+          phpfpmOptions = lib.mkOption {
+            type = with lib.types; lines;
+            default = "";
+            description = "options appended to the PHP configuration file";
+          };
+          wpExtraConfig = lib.mkOption {
+            type = with lib.types; lines;
+            default = "";
+            description = "Any additional text to be appended to the wp-config.php";
+          };
         };
       };
 
@@ -44,7 +54,8 @@
               package = wp-pkg domain;
               extraConfig = ''
                 define('FS_METHOD', 'direct');
-              '';
+              ''
+              + settings.wpExtraConfig;
               themes = { };
             };
 
@@ -104,6 +115,16 @@
               443
             ];
 
+            services.phpfpm.pools = builtins.listToAttrs (
+              map (
+                tenant: lib.nameValuePair "wordpress-${tenant}" { phpOptions = settings.phpfpmOptions; }
+              ) settings.tenants
+            );
+
+            security.acme.acceptTerms = true;
+
+            users.users.nginx.extraGroups = [ "acme" ];
+
             security.acme.certs = lib.listToAttrs (
               map (
                 tenant:
@@ -114,6 +135,8 @@
               ) settings.tenants
             );
 
+            services.nginx.clientMaxBodySize = "128m";
+
             services.nginx.virtualHosts = lib.listToAttrs (
               map (
                 tenant:

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

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

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

@@ -0,0 +1 @@
+26.11

modules/clan/wordpress/tests/vm/vars/shared/acme/email/value

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

modules/nixos/default.nix

@@ -1,5 +0,0 @@
-{
-  flake.nixosModules = {
-    inventree = import ../nixos/inventree;
-  };
-}

modules/nixos/inventree/default.nix

@@ -1,334 +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";
-
-  env = {
-    INVENTREE_CONFIG_FILE = configFile;
-    INVENTREE_SECRET_KEY_FILE = cfg.secretKeyFile;
-    INVENTREE_AUTO_UPDATE = "1";
-    INVENTREE_PLUGINS_ENABLED = "1";
-    INVENTREE_PLUGIN_NOINSTALL = "0";
-    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_USE_X_FORWARDED_HOST = "1";
-    INVENTREE_CORS_ORIGIN_ALLOW_ALL = "1";
-    INVENTREE_FRONTEND_SETTINGS = ''{"mobile_mode":"allow-always"}'';
-
-    INVENTREE_SITE_URL = cfg.config.site_url;
-
-    PYTHONPATH = pkg.pythonPath;
-  };
-
-  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 = env;
-      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 = env;
-      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 = env;
-      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 = env;
-      serviceConfig = {
-        User = "inventree";
-        Group = "inventree";
-        StateDirectory = "inventree";
-        #RuntimeDirectory = "inventree";
-        PrivateTmp = true;
-        ExecStart = ''
-          ${pkg}/opt/inventree/src/backend/InvenTree/manage.py qcluster
-        '';
-      };
-    };
-  };
-}

modules/nixos/think-backend-gtcm.nix

@@ -173,10 +173,10 @@ in
       serviceConfig = {
         User = cfg.user;
         WorkingDirectory = "${file-uploader}";
-        ExecStart = "${lib.getExe pkgs.nodejs_20} ${file-uploader}/src/be/index.js";
+        ExecStart = "${lib.getExe pkgs.nodejs} ${file-uploader}/src/be/index.js";
         Restart = "on-failure";
       };
-      path = [ pkgs.nodejs_20 ];
+      path = [ pkgs.nodejs ];
     };
 
     environment.systemPackages = [

pkgs/gtcm-file-uploader.nix

@@ -17,7 +17,7 @@ buildNpmPackage {
   version = "1.0.0";
 
   nativeBuildInputs = with pkgs; [
-    nodejs_20
+    nodejs
     breakpointHook
   ];
 

pkgs/inventree/default.nix

@@ -1,161 +0,0 @@
-{
-  stdenvNoCC,
-  python3,
-  fetchFromGitHub,
-  fetchYarnDeps,
-  yarnConfigHook,
-  nodejs,
-}:
-let
-  version = "1.1.0";
-
-  src = fetchFromGitHub {
-    owner = "inventree";
-    repo = "InvenTree";
-    tag = "${version}";
-    hash = "sha256-GAATo5zkkNCes9fCQsYUsZ9auhgYEUnevN4obWj3ZRA=";
-  };
-
-  frontend = stdenvNoCC.mkDerivation {
-    name = "inventree-frontend";
-    inherit version src;
-
-    yarnOfflineCache = fetchYarnDeps {
-      yarnLock = "${src}/src/frontend/yarn.lock";
-      hash = "sha256-Ijbkx+INZgsvMhkzo8h/FUY75W3UHnKAdUjQRD8kJZw=";
-    };
-
-    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
-      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-mailbox
-      django-anymail
-      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
-      django-storages
-      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
-
-      opentelemetry-api
-      opentelemetry-sdk
-      opentelemetry-exporter-otlp
-      opentelemetry-instrumentation-django
-      opentelemetry-instrumentation-requests
-      opentelemetry-instrumentation-redis
-      opentelemetry-instrumentation-sqlite3
-      opentelemetry-instrumentation-system-metrics
-      opentelemetry-instrumentation-wsgi
-    ]
-    ++ django-anymail.optional-dependencies.amazon-ses;
-
-  installPhase = ''
-    substituteInPlace src/backend/InvenTree/InvenTree/settings.py --replace-fail "django_slowtests.testrunner.DiscoverSlowestTestsRunner" "django.test.runner.DiscoverRunner"
-
-    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;
-  };
-}

pkgs/overlay.nix

@@ -2,28 +2,4 @@ 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; };
 }

pkgs/python/django-dbbackup/default.nix

@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django,
-  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
-    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";
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

pkgs/python/django-slowtests/default.nix

@@ -1,38 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  django,
-}:
-
-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 ];
-
-  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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

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,
-  pytestrunner,
-  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
-      pytestrunner
-      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; [ ];
-  };
-}

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; [ ];
-  };
-}

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; [ ];
-  };
-}

vars/per-machine/alasia/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/alasia/zerotier/zerotier-identity-secret/machines/alasia

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

vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/bosona/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/bosona/zerotier/zerotier-identity-secret/machines/bosona

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

vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/canopus/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/canopus/zerotier/zerotier-identity-secret/machines/canopus

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

vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/deneb/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/deneb/zerotier/zerotier-identity-secret/machines/deneb

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

vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/neptune/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/neptune/zerotier/zerotier-identity-secret/machines/neptune

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

vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/petra/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/petra/zerotier/zerotier-identity-secret/machines/petra

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

vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/ramus/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/ramus/zerotier/zerotier-identity-secret/machines/ramus

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

vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/rana/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/rana/zerotier/zerotier-identity-secret/machines/rana

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

vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/rigel/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/rigel/zerotier/zerotier-identity-secret/machines/rigel

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

vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/sirius/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/sirius/zerotier/zerotier-identity-secret/machines/sirius

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

vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/per-machine/vega/zerotier/zerotier-identity-secret/groups/admins

@@ -1 +0,0 @@
-../../../../../../sops/groups/admins

vars/per-machine/vega/zerotier/zerotier-identity-secret/machines/vega

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

vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek

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

vars/shared/zerotier-identity-alasia/identity-secret/groups/admins

@@ -0,0 +1 @@
+../../../../../sops/groups/admins

vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia

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

vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek

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

vars/shared/zerotier-identity-bosona/identity-secret/groups/admins

@@ -0,0 +1 @@
+../../../../../sops/groups/admins

vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona

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

vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek

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

vars/shared/zerotier-identity-canopus/identity-secret/groups/admins

@@ -0,0 +1 @@
+../../../../../sops/groups/admins

vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus

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

vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek

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

vars/shared/zerotier-identity-deneb/identity-secret/groups/admins

@@ -0,0 +1 @@
+../../../../../sops/groups/admins

vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb

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

vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek

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

vars/shared/zerotier-identity-neptune/identity-secret/groups/admins

@@ -0,0 +1 @@
+../../../../../sops/groups/admins

vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune

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

vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek

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

vars/shared/zerotier-identity-petra/identity-secret/groups/admins

@@ -0,0 +1 @@
+../../../../../sops/groups/admins

vars/shared/zerotier-identity-petra/identity-secret/machines/petra

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

vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek

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

vars/shared/zerotier-identity-ramus/identity-secret/groups/admins

@@ -0,0 +1 @@
+../../../../../sops/groups/admins

vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus

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