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

lastFile:machines/vega/services/ups.nix
Update vars via generator ups for machine vega
2025-09-25 17:28:59 +07:00 · 2025-09-25 17:18:52 +07:00
28 changed files with 383 additions and 4002 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 # Ignore build outputs from performing a nix-build or `nix build` command
 result
 result-*
-run-vm-*
+
--- a/flake.lock
+++ b/flake.lock
@@ -136,19 +136,6 @@
        "type": "github"
      }
    },
-    "liminix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1760087246,
-        "narHash": "sha256-HRUkAS5XDuM7yDnz+TIMAre7kFOuqyHL/y26wTbH6Sg=",
-        "path": "/home/kurogeek/Desktop/gitea/dan/liminix",
-        "type": "path"
-      },
-      "original": {
-        "path": "/home/kurogeek/Desktop/gitea/dan/liminix",
-        "type": "path"
-      }
-    },
    "nix-darwin": {
      "inputs": {
        "nixpkgs": [
@@ -220,7 +207,6 @@
        "devshell": "devshell",
        "flake-parts": "flake-parts",
        "import-tree": "import-tree",
-        "liminix": "liminix",
        "nixpkgs": "nixpkgs",
        "treefmt-nix": "treefmt-nix"
      }
--- a/flake.nix
+++ b/flake.nix
@@ -21,11 +21,6 @@
      url = "github:numtide/treefmt-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    liminix = {
-      # url = "git+https://gti.telent.net/dan/liminix?ref=refs/heads/main&rev=29fbb5461d034c4c59b88cbe04937b04ecad18e0";
-      url = "path:/home/kurogeek/Desktop/gitea/dan/liminix";
-      flake = false;
-    };
  };
  outputs =
    {
@@ -38,30 +33,11 @@
        systems = [
          "x86_64-linux"
        ];
-
-        flake.legacyPackages.qemu-router = import "${inputs.liminix}/default.nix" {
-          liminix-config = import "${inputs.liminix}/examples/hello-from-qemu.nix";
-          device = (import "${inputs.liminix}/devices/qemu-aarch64/default.nix");
-        };
-        flake.legacyPackages.yada-router = import "${inputs.liminix}/default.nix" {
-          liminix-config = import ./routers/yada-house/configuration.nix { inherit inputs; };
-          device = (import ./routers/yada-house/device.nix { inherit inputs; });
-        };
-        flake.legacyPackages.qemu-flake = import "${inputs.liminix}/default.nix" {
-          liminix-config = import ./routers/qemu/configuration.nix { inherit inputs; };
-          device = (import ./routers/qemu/device.nix { inherit inputs; });
-        };
-        flake.legacyPackages.vanilla = import "${inputs.liminix}/default.nix" {
-          liminix-config = import ./routers/vanilla/configuration.nix { inherit inputs; };
-          device = (import "${inputs.liminix}/devices/gl-mt300a/default.nix");
-        };
-
        imports = [
          ./fmt.nix
          ./shell.nix

          ./machines
-          ./routers
          ./inventories
          ./modules/clan/flake-module.nix
        ];
--- a/inventories/default.nix
+++ b/inventories/default.nix
@@ -1,7 +1,19 @@
+{
+  inputs,
+  self,
+  lib,
+  pkgs,
+  ...
+}:
 {
  clan = {
    inventory = {

+      machines = {
+        rigel.deploy.targetHost = "root@rigel.local";
+        vega.deploy.targetHost = "root@vega.local";
+      };
+
      tags = {
        glom = [ "vega" ];
        b4l = [ "rigel" ];
@@ -61,6 +73,7 @@
            input = "self";
          };
          roles.default.machines.b4l = { };
+          roles.default.machines.vega = { };
        };
        stirling-pdf = {
          module = {
--- a/machines/rigel/configuration.nix
+++ b/machines/rigel/configuration.nix
@@ -1,16 +1,13 @@
-{ config, ... }:
 {
  imports = [
    (import ../../lib/auto-accept-zerotier-members.nix {
      memberIds = [
        "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
-        "2bd36db8cc" # kurogeek-thinkpad
+        "1b495eede9" # 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}]";
 }
--- a/machines/vega/configuration.nix
+++ b/machines/vega/configuration.nix
@@ -10,14 +10,12 @@
    (import ../../lib/auto-accept-zerotier-members.nix {
      memberIds = [
        "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
-        "2bd36db8cc" # kurogeek-thinkpad
+        "1b495eede9" # kurogeek-thinkpad
      ];
    })
  ];

  clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";

  nixpkgs.hostPlatform = {
    system = "x86_64-linux";
--- a/machines/vega/disko.nix
+++ b/machines/vega/disko.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 let
  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
-  os = "/dev/disk/by-id/mmc-CUTB42_0x95d14f9e";
+  os = "/dev/disk/by-id/mmc-CUTB42_0x9d59499c";
  vdev = [
    "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG"
    "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X"
--- a/machines/vega/facter.json
+++ b/machines/vega/facter.json
@@ -23,8 +23,8 @@
    },
    "bluetooth": [
      {
-        "index": 31,
-        "attached_to": 33,
+        "index": 33,
+        "attached_to": 34,
        "class_list": ["usb", "bluetooth"],
        "bus_type": {
          "hex": "0086",
@@ -99,7 +99,7 @@
      },
      {
        "index": 36,
-        "attached_to": 33,
+        "attached_to": 34,
        "class_list": ["usb", "bluetooth"],
        "bus_type": {
          "hex": "0086",
@@ -597,7 +597,7 @@
        "fpu_exception": true,
        "cpuid_level": 32,
        "write_protect": false,
-        "tlb_size": 32764,
+        "tlb_size": 32767,
        "clflush_size": 64,
        "cache_alignment": 64,
        "address_sizes": {
@@ -636,7 +636,7 @@
        },
        "device": {
          "hex": "0561",
-          "name": "1",
+          "name": "0",
          "value": 1377
        },
        "revision": {
@@ -645,10 +645,10 @@
          "value": 0
        },
        "serial": "000000004EBF",
-        "model": "1",
+        "model": "0",
        "sysfs_id": "/class/block/sdb",
-        "sysfs_bus_id": "1:0:0:1",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:1",
+        "sysfs_bus_id": "1:0:0:0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:0",
        "unix_device_name": "/dev/sdb",
        "unix_device_number": {
          "type": 98,
@@ -657,10 +657,10 @@
          "range": 16
        },
        "unix_device_names": [
-          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X",
-          "/dev/disk/by-id/usb-USB_3.0_Device_1_000000004EBF-0:1",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:1",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:1",
+          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG",
+          "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:0",
          "/dev/sdb"
        ],
        "unix_device_name2": "/dev/sg1",
@@ -706,7 +706,7 @@
          "name": "Disk",
          "value": 0
        },
-        "serial": "0x95d14f9e",
+        "serial": "0x9d59499c",
        "model": "Disk",
        "sysfs_id": "/class/block/mmcblk0",
        "sysfs_bus_id": "mmc0:0001",
@@ -719,7 +719,7 @@
          "range": 32
        },
        "unix_device_names": [
-          "/dev/disk/by-id/mmc-CUTB42_0x95d14f9e",
+          "/dev/disk/by-id/mmc-CUTB42_0x9d59499c",
          "/dev/mmcblk0"
        ],
        "resources": [
@@ -745,6 +745,180 @@
      },
      {
        "index": 29,
+        "attached_to": 25,
+        "class_list": ["disk", "block_device"],
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "model": "Disk",
+        "sysfs_id": "/class/block/mmcblk0boot0",
+        "sysfs_bus_id": "mmcblk0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1a.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0",
+        "unix_device_name": "/dev/mmcblk0boot0",
+        "unix_device_number": {
+          "type": 98,
+          "major": 179,
+          "minor": 32,
+          "range": 32
+        },
+        "unix_device_names": ["/dev/mmcblk0boot0"],
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 128,
+            "heads": 4,
+            "sectors": 16,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 8192,
+            "value_2": 512
+          }
+        ],
+        "driver": "mmcblk",
+        "drivers": ["mmcblk"]
+      },
+      {
+        "index": 30,
+        "attached_to": 22,
+        "class_list": ["disk", "usb", "scsi", "block_device"],
+        "bus_type": {
+          "hex": "0084",
+          "name": "SCSI",
+          "value": 132
+        },
+        "slot": {
+          "bus": 1,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "152d",
+          "value": 5421
+        },
+        "device": {
+          "hex": "0561",
+          "name": "1",
+          "value": 1377
+        },
+        "revision": {
+          "hex": "0000",
+          "name": "~",
+          "value": 0
+        },
+        "serial": "000000004EBF",
+        "model": "1",
+        "sysfs_id": "/class/block/sdc",
+        "sysfs_bus_id": "1:0:0:1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:1",
+        "unix_device_name": "/dev/sdc",
+        "unix_device_number": {
+          "type": 98,
+          "major": 8,
+          "minor": 32,
+          "range": 16
+        },
+        "unix_device_names": [
+          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X",
+          "/dev/disk/by-id/usb-USB_3.0_Device_1_000000004EBF-0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:1",
+          "/dev/sdc"
+        ],
+        "unix_device_name2": "/dev/sg2",
+        "unix_device_number2": {
+          "type": 99,
+          "major": 21,
+          "minor": 2,
+          "range": 1
+        },
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 19074048,
+            "heads": 64,
+            "sectors": 32,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 39063650304,
+            "value_2": 512
+          }
+        ],
+        "driver": "uas",
+        "driver_module": "uas",
+        "drivers": ["sd", "uas"],
+        "driver_modules": ["sd_mod", "uas"]
+      },
+      {
+        "index": 31,
+        "attached_to": 25,
+        "class_list": ["disk", "block_device"],
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "model": "Disk",
+        "sysfs_id": "/class/block/mmcblk0boot1",
+        "sysfs_bus_id": "mmcblk0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1a.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0",
+        "unix_device_name": "/dev/mmcblk0boot1",
+        "unix_device_number": {
+          "type": 98,
+          "major": 179,
+          "minor": 64,
+          "range": 32
+        },
+        "unix_device_names": ["/dev/mmcblk0boot1"],
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 128,
+            "heads": 4,
+            "sectors": 16,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 8192,
+            "value_2": 512
+          }
+        ],
+        "driver": "mmcblk",
+        "drivers": ["mmcblk"]
+      },
+      {
+        "index": 32,
        "attached_to": 22,
        "class_list": ["disk", "usb", "scsi", "block_device"],
        "bus_type": {
@@ -783,27 +957,27 @@
        },
        "serial": "000000001532",
        "model": "Generic STORAGE DEVICE",
-        "sysfs_id": "/class/block/sdc",
+        "sysfs_id": "/class/block/sda",
        "sysfs_bus_id": "0:0:0:0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0/host0/target0:0:0/0:0:0:0",
-        "unix_device_name": "/dev/sdc",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0/host0/target0:0:0/0:0:0:0",
+        "unix_device_name": "/dev/sda",
        "unix_device_number": {
          "type": 98,
          "major": 8,
-          "minor": 32,
+          "minor": 0,
          "range": 16
        },
        "unix_device_names": [
          "/dev/disk/by-id/usb-Generic_STORAGE_DEVICE_000000001532-0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:1:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:1:1.0-scsi-0:0:0:0",
-          "/dev/sdc"
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:2:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:2:1.0-scsi-0:0:0:0",
+          "/dev/sda"
        ],
-        "unix_device_name2": "/dev/sg2",
+        "unix_device_name2": "/dev/sg0",
        "unix_device_number2": {
          "type": 99,
          "major": 21,
-          "minor": 2,
+          "minor": 0,
          "range": 1
        },
        "resources": [
@@ -835,90 +1009,6 @@
        "drivers": ["sd", "usb-storage"],
        "driver_modules": ["sd_mod", "usb_storage"],
        "module_alias": "usb:v05E3p0749d1532dc00dsc00dp00ic08isc06ip50in00"
-      },
-      {
-        "index": 30,
-        "attached_to": 22,
-        "class_list": ["disk", "usb", "scsi", "block_device"],
-        "bus_type": {
-          "hex": "0084",
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 1,
-          "number": 0
-        },
-        "base_class": {
-          "hex": "0106",
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "hex": "152d",
-          "value": 5421
-        },
-        "device": {
-          "hex": "0561",
-          "name": "0",
-          "value": 1377
-        },
-        "revision": {
-          "hex": "0000",
-          "name": "~",
-          "value": 0
-        },
-        "serial": "000000004EBF",
-        "model": "0",
-        "sysfs_id": "/class/block/sda",
-        "sysfs_bus_id": "1:0:0:0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:0",
-        "unix_device_name": "/dev/sda",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 0,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG",
-          "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:0",
-          "/dev/sda"
-        ],
-        "unix_device_name2": "/dev/sg0",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 0,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 19074048,
-            "heads": 64,
-            "sectors": 32,
-            "size": "0x0",
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 39063650304,
-            "value_2": 512
-          }
-        ],
-        "driver": "uas",
-        "driver_module": "uas",
-        "drivers": ["sd", "uas"],
-        "driver_modules": ["sd_mod", "uas"]
      }
    ],
    "graphics_card": [
@@ -1028,7 +1118,7 @@
    ],
    "hub": [
      {
-        "index": 33,
+        "index": 34,
        "attached_to": 22,
        "class_list": ["usb", "hub"],
        "bus_type": {
@@ -1178,7 +1268,7 @@
        "module_alias": "usb:v1D6Bp0003d0615dc09dsc00dp03ic09isc00ip00in00"
      },
      {
-        "index": 38,
+        "index": 39,
        "attached_to": 9,
        "class_list": ["usb", "hub"],
        "bus_type": {
@@ -1258,7 +1348,7 @@
        "module_alias": "usb:v1D6Bp0002d0615dc09dsc00dp01ic09isc00ip00in00"
      },
      {
-        "index": 40,
+        "index": 41,
        "attached_to": 9,
        "class_list": ["usb", "hub"],
        "bus_type": {
@@ -1330,8 +1420,8 @@
    ],
    "keyboard": [
      {
-        "index": 39,
-        "attached_to": 33,
+        "index": 38,
+        "attached_to": 34,
        "class_list": ["keyboard", "usb"],
        "bus_type": {
          "hex": "0086",
@@ -1368,8 +1458,8 @@
          "value": 0
        },
        "model": "Logitech USB Receiver",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0",
-        "sysfs_bus_id": "3-2:1.0",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-5/3-5:1.0",
+        "sysfs_bus_id": "3-5:1.0",
        "resources": [
          {
            "type": "baud",
@@ -1439,7 +1529,7 @@
          {
            "type": "mem",
            "base": 0,
-            "range": 8097124352,
+            "range": 8096096256,
            "enabled": true,
            "access": "read_write",
            "prefetch": "unknown"
@@ -1628,8 +1718,8 @@
    ],
    "mouse": [
      {
-        "index": 32,
-        "attached_to": 33,
+        "index": 42,
+        "attached_to": 34,
        "class_list": ["mouse", "usb"],
        "bus_type": {
          "hex": "0086",
@@ -1668,8 +1758,8 @@
        "compat_vendor": "Unknown",
        "compat_device": "Generic USB Mouse",
        "model": "Logitech USB Receiver",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.1",
-        "sysfs_bus_id": "3-2:1.1",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-5/3-5:1.1",
+        "sysfs_bus_id": "3-5:1.1",
        "resources": [
          {
            "type": "baud",
@@ -1874,7 +1964,7 @@
        "resources": [
          {
            "type": "hwaddr",
-            "address": 54
+            "address": 48
          },
          {
            "type": "io",
@@ -1899,7 +1989,7 @@
          },
          {
            "type": "phwaddr",
-            "address": 53
+            "address": 54
          },
          {
            "type": "wlan",
@@ -1992,8 +2082,8 @@
    ],
    "network_interface": [
      {
-        "index": 41,
-        "attached_to": 0,
+        "index": 43,
+        "attached_to": 13,
        "class_list": ["network_interface"],
        "base_class": {
          "hex": "0107",
@@ -2001,17 +2091,32 @@
          "value": 263
        },
        "sub_class": {
-          "hex": "0000",
-          "name": "Loopback",
-          "value": 0
+          "hex": "000a",
+          "name": "WLAN",
+          "value": 10
        },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
-        "unix_device_names": ["lo"]
+        "model": "WLAN network interface",
+        "sysfs_id": "/class/net/wlan0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0",
+        "unix_device_name": "wlan0",
+        "unix_device_names": ["wlan0"],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 48
+          },
+          {
+            "type": "phwaddr",
+            "address": 54
+          }
+        ],
+        "driver": "rtw89_8852be",
+        "driver_module": "rtw89_8852be",
+        "drivers": ["rtw89_8852be"],
+        "driver_modules": ["rtw89_8852be"]
      },
      {
-        "index": 42,
+        "index": 44,
        "attached_to": 11,
        "class_list": ["network_interface"],
        "base_class": {
@@ -2045,8 +2150,8 @@
        "driver_modules": ["igc"]
      },
      {
-        "index": 43,
-        "attached_to": 13,
+        "index": 45,
+        "attached_to": 0,
        "class_list": ["network_interface"],
        "base_class": {
          "hex": "0107",
@@ -2054,29 +2159,14 @@
          "value": 263
        },
        "sub_class": {
-          "hex": "000a",
-          "name": "WLAN",
-          "value": 10
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
        },
-        "model": "WLAN network interface",
-        "sysfs_id": "/class/net/wlan0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0",
-        "unix_device_name": "wlan0",
-        "unix_device_names": ["wlan0"],
-        "resources": [
-          {
-            "type": "hwaddr",
-            "address": 54
-          },
-          {
-            "type": "phwaddr",
-            "address": 53
-          }
-        ],
-        "driver": "rtw89_8852be",
-        "driver_module": "rtw89_8852be",
-        "drivers": ["rtw89_8852be"],
-        "driver_modules": ["rtw89_8852be"]
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": ["lo"]
      }
    ],
    "pci": [
--- a/machines/vega/services/nextcloud.nix
+++ b/machines/vega/services/nextcloud.nix
@@ -0,0 +1,34 @@
+{ config, pkgs, ... }:
+let
+  # ncDomain = "${config.clan.core.vars.generators.vega-nextcloud.files.subdomain.value}.${config.networking.fqdn}";
+  ncDomain = "${config.networking.fqdn}";
+in
+{
+  clan.core.vars.generators.vega-nextcloud = {
+    files.subdomain.secret = false;
+
+    prompts = {
+      subdomain = {
+        persist = true;
+        type = "line";
+        description = "Sub-domain for Nextcloud app. Default:(cloud)";
+      };
+    };
+
+    script = ''cat $prompts/subdomain || echo -n "cloud" > $out/subdomain'';
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  services.nextcloud = {
+    hostName = ncDomain;
+    package = pkgs.nextcloud31;
+  };
+  # services.nginx.virtualHosts."${ncDomain}" = {
+  #   # useACMEHost = "${config.networking.fqdn}";
+  #   # forceSSL = true;
+  # };
+}
--- a/machines/vega/services/samba.nix
+++ b/machines/vega/services/samba.nix
@@ -1,93 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  sambaUser = lib.filterAttrs (
-    name: user: user.isNormalUser && builtins.elem "samba" user.extraGroups
-  ) config.users.users;
-
-  sharedFolders = {
-    GLOM.users = [
-      "w"
-      "kurogeek"
-      "berwn"
-    ];
-  };
-in
-{
-
-  services.samba = {
-    enable = true;
-    openFirewall = true;
-    settings = {
-      global = {
-        security = "user";
-        workgroup = "WORKGROUP";
-        "server string" = "Glom Vega";
-        interfaces = "eth* en*";
-        "max log size" = "50";
-        "dns proxy" = false;
-        "syslog only" = true;
-        "map to guest" = "Bad User";
-        "guest account" = "nobody";
-      };
-    }
-    // lib.mapAttrs (share: opts: {
-      path = "/mnt/hdd/samba/${share}";
-      comment = share;
-      "force user" = share;
-      "force group" = share;
-      public = "yes";
-      "guest ok" = "yes";
-      "create mask" = "0640";
-      "directory mask" = "0750";
-      writable = "no";
-      browseable = "yes";
-      printable = "no";
-      # TODO
-      # "valid users" = toString opts.users;
-    }) sharedFolders;
-  };
-
-  users.users = lib.mapAttrs (share: opts: {
-    isSystemUser = true;
-    group = share;
-  }) sharedFolders;
-
-  users.groups = lib.mapAttrs (share: opts: { }) sharedFolders;
-
-  systemd.services.samba-smbd.postStart =
-    lib.concatMapStrings (
-      user:
-      let
-        password = config.clan.core.vars.generators."${user}-smb-password".files.password.path;
-      in
-      ''
-        mkdir -p /mnt/hdd/samba/${user}
-        chown ${user}:users /mnt/hdd/samba/${user}
-        # if a password is unchanged, this will error
-        (echo $(<${password}); echo $(<${password})) | ${config.services.samba.package}/bin/smbpasswd -s -a ${user}
-      ''
-    ) (lib.attrNames sambaUser)
-    + lib.concatMapStrings (share: ''
-      mkdir -p /mnt/hdd/samba/${share}
-      chown ${share}:${share} /mnt/hdd/samba/${share}
-    '') (lib.attrNames sharedFolders);
-
-  services.samba-wsdd = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  services.avahi = {
-    publish.enable = true;
-    publish.userServices = true;
-    # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile`
-    nssmdns4 = true;
-    # ^^ Not one hundred percent sure if this is needed- if it aint broke, don't fix it
-    enable = true;
-    openFirewall = true;
-  };
-}
--- a/machines/vega/services/ups.nix
+++ b/machines/vega/services/ups.nix
@@ -0,0 +1,33 @@
+{ config, ... }:
+{
+  clan.core.vars.generators.ups = {
+    dependencies = [ "root-password" ];
+    files.password = {
+      secret = true;
+      owner = "nutmon";
+      group = "nutmon";
+
+    };
+    script = ''
+      cat $in/root-password/password > $out/password
+    '';
+  };
+  power.ups = {
+    enable = true;
+    mode = "standalone";
+
+    ups."apc" = {
+      driver = "usbhid-ups";
+      port = "auto";
+    };
+    upsmon.monitor."test-monitor" = {
+      powerValue = 1;
+      user = "root";
+      type = "primary";
+      passwordFile = config.clan.core.vars.generators.ups.files.password.path;
+    };
+    upsmon.settings = {
+      RUN_AS_USER = "root";
+    };
+  };
+}
--- a/routers/default.nix
+++ b/routers/default.nix
@@ -1,25 +0,0 @@
-{ inputs, ... }:
-{
-  flake.legacyPackages = {
-    qemu-router = import "${inputs.liminix}/default.nix" {
-      liminix-config = import "${inputs.liminix}/examples/hello-from-qemu.nix";
-      device = (import "${inputs.liminix}/devices/qemu-aarch64/default.nix");
-    };
-    yada-router = import "${inputs.liminix}/default.nix" {
-      liminix-config = import ./routers/yada-house/configuration.nix { inherit inputs; };
-      device = (import ./routers/yada-house/device.nix { inherit inputs; });
-    };
-    qemu-flake = import "${inputs.liminix}/default.nix" {
-      liminix-config = import ./routers/qemu/configuration.nix { inherit inputs; };
-      device = (import ./routers/qemu/device.nix { inherit inputs; });
-    };
-    vanilla = import "${inputs.liminix}/default.nix" {
-      liminix-config = import ./routers/vanilla/configuration.nix { inherit inputs; };
-      device = (import "${inputs.liminix}/devices/gl-mt300a/default.nix");
-    };
-    fax-router = import "${inputs.liminix}/default.nix" {
-      device = (import "${inputs.liminix}/devices/gl-ar750");
-      liminix-config = import ./fax-router/configuration.nix { inherit inputs; };
-    };
-  };
-}
--- a/routers/fax-router/configuration.nix
+++ b/routers/fax-router/configuration.nix
@@ -1,46 +0,0 @@
-# This is an example that uses the "gateway" profile to create a
-# "typical home wireless router" configuration suitable for a Gl.inet
-# gl-ar750 router. It should be fairly simple to edit it for other
-# devices: mostly you will need to attend to the number of wlan and lan
-# interfaces
-{ inputs }:
-{ config, pkgs, ... }:
-let
-  inherit (pkgs.liminix.services) target;
-  svc = config.system.service;
-in
-rec {
-  imports = [
-    "${inputs.liminix}/modules/wlan.nix"
-    "${inputs.liminix}/modules/network"
-    "${inputs.liminix}/modules/ntp"
-    "${inputs.liminix}/modules/vlan"
-  ];
-
-  services.dhcpv4 =
-    let
-      iface = svc.network.link.build { ifname = "eth1"; };
-    in
-    svc.network.dhcp.client.build { interface = iface; };
-
-  services.defaultroute4 = svc.network.route.build {
-    via = "$(output ${services.dhcpv4} ip)";
-    target = "default";
-    dependencies = [ services.dhcpv4 ];
-  };
-
-  services.packet_forwarding = svc.network.forward.build { };
-
-  services.ntp = config.system.service.ntp.build {
-    pools = {
-      "pool.ntp.org" = [ "iburst" ];
-    };
-  };
-
-  boot.tftp = {
-    serverip = "192.168.8.148";
-    ipaddr = "192.168.8.251";
-  };
-
-  defaultProfile.packages = [ pkgs.hello ];
-}
--- a/routers/fax-router/router-secrets.nix
+++ b/routers/fax-router/router-secrets.nix
@@ -1,17 +0,0 @@
-{
-  wpa_passphrase = "you bring light in";
-  ssid = "liminix";
-  l2tp = {
-    name = "abcde@a.1";
-    password = "NotMyIspPassword";
-  };
-  root = {
-    #  mkpasswd -m sha512crypt
-    passwd = "$6$6pt0mpbgcB7kC2RJ$kSBoCYGyi1.qxt7dqmexLj1l8E6oTZJZmfGyJSsMYMW.jlsETxdgQSdv6ptOYDM7DHAwf6vLG0pz3UD31XBfC1";
-    openssh.authorizedKeys.keys = [ ];
-  };
-
-  lan = {
-    prefix = "10.8.0";
-  };
-}
--- a/routers/qemu/configuration.nix
+++ b/routers/qemu/configuration.nix
@@ -1,49 +0,0 @@
-{ inputs }:
-{ config, pkgs, ... }:
-let
-  svc = config.system.service;
-
-in
-rec {
-  imports = [
-    "${inputs.liminix}/modules/network"
-    "${inputs.liminix}/modules/dnsmasq"
-    "${inputs.liminix}/modules/ssh"
-  ];
-
-  hostname = "hello";
-
-  # configure the internal network (LAN) with an address
-  services.int = svc.network.address.build {
-    interface = config.hardware.networkInterfaces.lan;
-    family = "inet";
-    address = "10.3.0.1";
-    prefixLength = 16;
-  };
-
-  services.sshd = svc.ssh.build { };
-
-  users.root = {
-    # the password is "secret". Use mkpasswd -m sha512crypt to
-    # create this hashed password string
-    passwd = "$6$y7WZ5hM6l5nriLmo$5AJlmzQZ6WA.7uBC7S8L4o19ESR28Dg25v64/vDvvCN01Ms9QoHeGByj8lGlJ4/b.dbwR9Hq2KXurSnLigt1W1";
-  };
-
-  services.dns =
-    let
-      interface = services.int;
-    in
-    svc.dnsmasq.build {
-      inherit interface;
-      ranges = [
-        "10.3.0.10,10.3.0.240"
-        "::,constructor:$(output ${interface} ifname),ra-stateless"
-      ];
-
-      domain = "example.org";
-    };
-
-  defaultProfile.packages = with pkgs; [
-    figlet
-  ];
-}
--- a/routers/qemu/device.nix
+++ b/routers/qemu/device.nix
@@ -1,58 +0,0 @@
-# This "device" generates images that can be used with the QEMU
-# emulator. The default output is a directory containing separate
-# kernel ("Image" format) and root filesystem (squashfs or jffs2)
-# images
-{ inputs }:
-{
-  system = {
-    crossSystem = {
-      config = "aarch64-unknown-linux-musl";
-    };
-  };
-
-  description = ''
-    QEMU Aarch64
-    ************
-
-    This target produces an image for
-    the `QEMU "virt" platform <https://www.qemu.org/docs/master/system/arm/virt.html>`_ using a 64 bit CPU type.
-
-    ARM targets differ from MIPS in that the kernel format expected
-    by QEMU is an "Image" (raw binary file) rather than an ELF
-    file, but this is taken care of by :command:`run.sh`. Check the
-    documentation for the :ref:`qemu` target for more information.
-
-  '';
-
-  # this device is described by the "qemu" device
-  installer = "vmroot";
-
-  module =
-    { config, lim, ... }:
-    {
-      imports = [
-        "${inputs.liminix}/modules/arch/aarch64.nix"
-        "${inputs.liminix}/devices/families/qemu.nix"
-      ];
-      kernel = {
-        config = {
-          VIRTUALIZATION = "y";
-          PCI_HOST_GENERIC = "y";
-
-          SERIAL_AMBA_PL011 = "y";
-          SERIAL_AMBA_PL011_CONSOLE = "y";
-        };
-      };
-      boot.commandLine = [
-        "console=ttyAMA0,38400"
-      ];
-      hardware =
-        let
-          addr = lim.parseInt "0x40010000";
-        in
-        {
-          loadAddress = addr;
-          entryPoint = addr;
-        };
-    };
-}
--- a/routers/vanilla/configuration.nix
+++ b/routers/vanilla/configuration.nix
@@ -1,41 +0,0 @@
-{ inputs }:
-{ config, pkgs, ... }:
-let
-  inherit (pkgs.liminix.services) target;
-  svc = config.system.service;
-in
-rec {
-  imports = [
-    "${inputs.liminix}/modules/wlan.nix"
-    "${inputs.liminix}/modules/network"
-    "${inputs.liminix}/modules/ntp"
-    "${inputs.liminix}/modules/vlan"
-  ];
-
-  services.dhcpv4 =
-    let
-      iface = svc.network.link.build { ifname = "eth1"; };
-    in
-    svc.network.dhcp.client.build { interface = iface; };
-
-  services.defaultroute4 = svc.network.route.build {
-    via = "$(output ${services.dhcpv4} ip)";
-    target = "default";
-    dependencies = [ services.dhcpv4 ];
-  };
-
-  services.packet_forwarding = svc.network.forward.build { };
-
-  services.ntp = config.system.service.ntp.build {
-    pools = {
-      "pool.ntp.org" = [ "iburst" ];
-    };
-  };
-
-  boot.tftp = {
-    serverip = "192.168.8.148";
-    ipaddr = "192.168.8.251";
-  };
-
-  defaultProfile.packages = [ pkgs.hello ];
-}
--- a/routers/vanilla/device.nix
+++ b/routers/vanilla/device.nix
@@ -1,86 +0,0 @@
-# This "device" generates images that can be used with the QEMU
-# emulator. The default output is a directory containing separate
-# kernel (uncompressed vmlinux) and initrd (squashfs) images
-{ inputs }:
-{
-  system = {
-    crossSystem = {
-      config = "mips-unknown-linux-musl";
-      gcc = {
-        abi = "32";
-        arch = "mips32"; # maybe mips_24kc-
-      };
-    };
-  };
-
-  description = ''
-    QEMU MIPS
-    *********
-
-    This target produces an image for
-    QEMU, the "generic and open source machine emulator and
-    virtualizer".
-
-    MIPS QEMU emulates a "Malta" board, which was an ATX form factor
-    evaluation board made by MIPS Technologies, but mostly in Liminix
-    we use paravirtualized devices (Virtio) instead of emulating
-    hardware.
-
-    Building an image for QEMU results in a :file:`result/` directory
-    containing ``run.sh`` ``vmlinux``, and ``rootfs`` files. To invoke
-    the emulator, run ``run.sh``.
-
-    The configuration includes two emulated "hardware" ethernet
-    devices and the kernel :code:`mac80211_hwsim` module to
-    provide an emulated wlan device. To read more about how
-    to connect to this network, refer to :ref:`qemu-networking`
-    in the Development manual.
-
-  '';
-  module =
-    {
-      config,
-      lib,
-      lim,
-      ...
-    }:
-    {
-      imports = [
-        "${inputs.liminix}/modules/arch/mipseb.nix"
-        "${inputs.liminix}/devices/families/qemu.nix"
-      ];
-      kernel = {
-        config = {
-          MIPS_MALTA = "y";
-          CPU_MIPS32_R2 = "y";
-
-          POWER_RESET = "y";
-          POWER_RESET_SYSCON = "y";
-
-          SERIAL_8250 = "y";
-          SERIAL_8250_CONSOLE = "y";
-        };
-      };
-      hardware =
-        # from arch/mips/mti-malta/Platform:load-$(CONFIG_MIPS_MALTA)  += 0xffffffff80100000
-        let
-          addr = lim.parseInt "0x80100000";
-        in
-        {
-          loadAddress = addr;
-          entryPoint = addr;
-
-          # Unlike the arm qemu targets, we need a static dts when
-          # running u-boot-using tests, qemu dumpdtb command doesn't
-          # work for this board. I am not at all sure this dts is
-          # *correct* but it does at least boot
-          dts = lib.mkForce {
-            src = "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/mti/malta.dts";
-            includePaths = [
-              "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/"
-            ];
-          };
-
-        };
-    };
-}
--- a/routers/yada-house/configuration.nix
+++ b/routers/yada-house/configuration.nix
@@ -1,54 +0,0 @@
-{ inputs }:
-
-{
-  config,
-  pkgs,
-  ...
-}:
-let
-  svc = config.system.service;
-
-in
-rec {
-  imports = [
-    "${inputs.liminix}/modules/network"
-    "${inputs.liminix}/modules/dnsmasq"
-    "${inputs.liminix}/modules/ssh"
-  ];
-
-  hostname = "hello";
-
-  # configure the internal network (LAN) with an address
-  services.int = svc.network.address.build {
-    interface = config.hardware.networkInterfaces.lan2;
-    family = "inet";
-    address = "192.168.8.1";
-    prefixLength = 24;
-  };
-
-  services.sshd = svc.ssh.build { };
-
-  users.root = {
-    # the password is "secret". Use mkpasswd -m sha512crypt to
-    # create this hashed password string
-    passwd = "$6$y7WZ5hM6l5nriLmo$5AJlmzQZ6WA.7uBC7S8L4o19ESR28Dg25v64/vDvvCN01Ms9QoHeGByj8lGlJ4/b.dbwR9Hq2KXurSnLigt1W1";
-  };
-
-  services.dns =
-    let
-      interface = services.int;
-    in
-    svc.dnsmasq.build {
-      inherit interface;
-      ranges = [
-        "192.168.8.1,192.168.8.240"
-        "::,constructor:$(output ${interface} ifname),ra-stateless"
-      ];
-
-      domain = "example.org";
-    };
-
-  # defaultProfile.packages = with pkgs; [
-  #   figlet
-  # ];
-}
--- a/routers/yada-house/device.nix
+++ b/routers/yada-house/device.nix
@@ -1,127 +0,0 @@
-# GL.iNet GL-MT6000
-{ inputs }:
-{
-  system = {
-    crossSystem = {
-      config = "aarch64-unknown-linux-musl";
-      gcc = {
-        arch = "armv8-a";
-      };
-    };
-  };
-
-  description = ''
-    Device configuration for Yada/White house router.
-  '';
-
-  module =
-    {
-      pkgs,
-      config,
-      lib,
-      lim,
-      ...
-    }:
-    let
-      inherit (pkgs) openwrt_24_10;
-      # mac80211 = pkgs.kmodloader.override {
-      #   targets = [ "rt2800soc" ];
-      #   inherit (config.system.outputs) kernel;
-      # };
-    in
-    {
-      imports = [
-        "${inputs.liminix}/modules/outputs/mtdimage.nix"
-        "${inputs.liminix}/modules/outputs/squashfs.nix"
-        "${inputs.liminix}/modules/outputs/tftpboot.nix"
-        "${inputs.liminix}/modules/outputs/vmroot.nix"
-        "${inputs.liminix}/modules/arch/aarch64.nix"
-        # "${inputs.liminix}/modules/base.nix"
-        "${inputs.liminix}/modules/vlan"
-      ];
-      boot.tftp = {
-        serverip = "192.168.1.254";
-        ipaddr = "192.168.1.1";
-        loadAddress = lim.parseInt "0x46000000";
-      };
-      boot.imageFormat = "fit";
-      boot.loader.fit.enable = true;
-      rootfsType = "squashfs";
-      hardware = {
-        loadAddress = lim.parseInt "0x48080000";
-        entryPoint = lim.parseInt "0x48080000";
-
-        flash = {
-          address = lim.parseInt "0x41e00000";
-          size = lim.parseInt "0x4000";
-          eraseBlockSize = 65536;
-        };
-        rootDevice = "/dev/root";
-
-        dts = {
-          src = "${openwrt_24_10.src}/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts";
-          includePaths = [
-            "${openwrt_24_10.src}/target/linux/mediatek/dts"
-            "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
-          ];
-        };
-        networkInterfaces =
-          let
-            inherit (config.system.service.network) link;
-            inherit (config.system.service) vlan;
-          in
-          rec {
-            eth0 = link.build { ifname = "eth0"; };
-            wan = link.build { ifname = "eth1"; };
-
-            lan1 = vlan.build {
-              ifname = "lan1@eth0";
-              primary = eth0;
-              vid = "1";
-            };
-            lan2 = vlan.build {
-              ifname = "lan2@eth0";
-              primary = eth0;
-              vid = "2";
-            };
-            lan3 = vlan.build {
-              ifname = "lan3@eth0";
-              primary = eth0;
-              vid = "3";
-            };
-            lan4 = vlan.build {
-              ifname = "lan4@eth0";
-              primary = eth0;
-              vid = "4";
-            };
-            lan5 = vlan.build {
-              ifname = "lan5@eth0";
-              primary = eth0;
-              vid = "5";
-            };
-
-            # wlan = link.build {
-            #   ifname = "wlan0";
-            #   dependencies = [ mac80211 ];
-            # };
-          };
-      };
-
-      kernel = {
-        src = openwrt_24_10.kernelSrc;
-        version = openwrt_24_10.kernelVersion;
-        extraPatchPhase = ''
-          echo ==================================================
-          ls ${openwrt_24_10.src}/config
-          echo ==================================================
-          patch ${openwrt_24_10.src}/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch
-          echo --------------------------------------------------
-          ls ${openwrt_24_10.src}/config
-          echo --------------------------------------------------
-          ${openwrt_24_10.applyPatches.mediatek}
-        '';
-        config = {
-        };
-      };
-    };
-}
--- a/routers/yada-house/dts/mt7986a.dtsi
+++ b/routers/yada-house/dts/mt7986a.dtsi
@@ -1,645 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright (C) 2021 MediaTek Inc.
- * Author: Sam.Shih <sam.shih@mediatek.com>
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/clock/mt7986-clk.h>
-#include <dt-bindings/reset/mt7986-resets.h>
-#include <dt-bindings/phy/phy.h>
-
-/ {
-	compatible = "mediatek,mt7986a";
-	interrupt-parent = <&gic>;
-	#address-cells = <2>;
-	#size-cells = <2>;
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		cpu0: cpu@0 {
-			compatible = "arm,cortex-a53";
-			reg = <0x0>;
-			device_type = "cpu";
-			enable-method = "psci";
-			#cooling-cells = <2>;
-		};
-
-		cpu1: cpu@1 {
-			compatible = "arm,cortex-a53";
-			reg = <0x1>;
-			device_type = "cpu";
-			enable-method = "psci";
-			#cooling-cells = <2>;
-		};
-
-		cpu2: cpu@2 {
-			compatible = "arm,cortex-a53";
-			reg = <0x2>;
-			device_type = "cpu";
-			enable-method = "psci";
-			#cooling-cells = <2>;
-		};
-
-		cpu3: cpu@3 {
-			compatible = "arm,cortex-a53";
-			reg = <0x3>;
-			device_type = "cpu";
-			enable-method = "psci";
-			#cooling-cells = <2>;
-		};
-	};
-
-	clk40m: oscillator-40m {
-		compatible = "fixed-clock";
-		clock-frequency = <40000000>;
-		#clock-cells = <0>;
-		clock-output-names = "clkxtal";
-	};
-
-	psci {
-		compatible = "arm,psci-0.2";
-		method = "smc";
-	};
-
-	reserved-memory {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-		/* 192 KiB reserved for ARM Trusted Firmware (BL31) */
-		secmon_reserved: secmon@43000000 {
-			reg = <0 0x43000000 0 0x30000>;
-			no-map;
-		};
-
-		wmcpu_emi: wmcpu-reserved@4fc00000 {
-			no-map;
-			reg = <0 0x4fc00000 0 0x00100000>;
-		};
-
-		wo_emi0: wo-emi@4fd00000 {
-			reg = <0 0x4fd00000 0 0x40000>;
-			no-map;
-		};
-
-		wo_emi1: wo-emi@4fd40000 {
-			reg = <0 0x4fd40000 0 0x40000>;
-			no-map;
-		};
-
-		wo_ilm0: wo-ilm@151e0000 {
-			reg = <0 0x151e0000 0 0x8000>;
-			no-map;
-		};
-
-		wo_ilm1: wo-ilm@151f0000 {
-			reg = <0 0x151f0000 0 0x8000>;
-			no-map;
-		};
-
-		wo_data: wo-data@4fd80000 {
-			reg = <0 0x4fd80000 0 0x240000>;
-			no-map;
-		};
-
-		wo_dlm0: wo-dlm@151e8000 {
-			reg = <0 0x151e8000 0 0x2000>;
-			no-map;
-		};
-
-		wo_dlm1: wo-dlm@151f8000 {
-			reg = <0 0x151f8000 0 0x2000>;
-			no-map;
-		};
-
-		wo_boot: wo-boot@15194000 {
-			reg = <0 0x15194000 0 0x1000>;
-			no-map;
-		};
-
-	};
-
-	soc {
-		compatible = "simple-bus";
-		ranges;
-		#address-cells = <2>;
-		#size-cells = <2>;
-
-		gic: interrupt-controller@c000000 {
-			compatible = "arm,gic-v3";
-			reg = <0 0x0c000000 0 0x10000>,  /* GICD */
-			      <0 0x0c080000 0 0x80000>,  /* GICR */
-			      <0 0x0c400000 0 0x2000>,   /* GICC */
-			      <0 0x0c410000 0 0x1000>,   /* GICH */
-			      <0 0x0c420000 0 0x2000>;   /* GICV */
-			interrupt-parent = <&gic>;
-			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-controller;
-			#interrupt-cells = <3>;
-		};
-
-		infracfg: infracfg@10001000 {
-			compatible = "mediatek,mt7986-infracfg", "syscon";
-			reg = <0 0x10001000 0 0x1000>;
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-		};
-
-		wed_pcie: wed-pcie@10003000 {
-			compatible = "mediatek,mt7986-wed-pcie",
-				     "syscon";
-			reg = <0 0x10003000 0 0x10>;
-		};
-
-		topckgen: topckgen@1001b000 {
-			compatible = "mediatek,mt7986-topckgen", "syscon";
-			reg = <0 0x1001B000 0 0x1000>;
-			#clock-cells = <1>;
-		};
-
-		watchdog: watchdog@1001c000 {
-			compatible = "mediatek,mt7986-wdt";
-			reg = <0 0x1001c000 0 0x1000>;
-			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-			#reset-cells = <1>;
-			status = "disabled";
-		};
-
-		apmixedsys: apmixedsys@1001e000 {
-			compatible = "mediatek,mt7986-apmixedsys";
-			reg = <0 0x1001E000 0 0x1000>;
-			#clock-cells = <1>;
-		};
-
-		pio: pinctrl@1001f000 {
-			compatible = "mediatek,mt7986a-pinctrl";
-			reg = <0 0x1001f000 0 0x1000>,
-			      <0 0x11c30000 0 0x1000>,
-			      <0 0x11c40000 0 0x1000>,
-			      <0 0x11e20000 0 0x1000>,
-			      <0 0x11e30000 0 0x1000>,
-			      <0 0x11f00000 0 0x1000>,
-			      <0 0x11f10000 0 0x1000>,
-			      <0 0x1000b000 0 0x1000>;
-			reg-names = "gpio", "iocfg_rt", "iocfg_rb", "iocfg_lt",
-				    "iocfg_lb", "iocfg_tr", "iocfg_tl", "eint";
-			gpio-controller;
-			#gpio-cells = <2>;
-			gpio-ranges = <&pio 0 0 100>;
-			interrupt-controller;
-			interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-parent = <&gic>;
-			#interrupt-cells = <2>;
-		};
-
-		pwm: pwm@10048000 {
-			compatible = "mediatek,mt7986-pwm";
-			reg = <0 0x10048000 0 0x1000>;
-			#pwm-cells = <2>;
-			interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&topckgen CLK_TOP_PWM_SEL>,
-				 <&infracfg CLK_INFRA_PWM_STA>,
-				 <&infracfg CLK_INFRA_PWM1_CK>,
-				 <&infracfg CLK_INFRA_PWM2_CK>;
-			clock-names = "top", "main", "pwm1", "pwm2";
-			status = "disabled";
-		};
-
-		sgmiisys0: syscon@10060000 {
-			compatible = "mediatek,mt7986-sgmiisys_0",
-				     "syscon";
-			reg = <0 0x10060000 0 0x1000>;
-			#clock-cells = <1>;
-		};
-
-		sgmiisys1: syscon@10070000 {
-			compatible = "mediatek,mt7986-sgmiisys_1",
-				     "syscon";
-			reg = <0 0x10070000 0 0x1000>;
-			#clock-cells = <1>;
-		};
-
-		trng: rng@1020f000 {
-			compatible = "mediatek,mt7986-rng",
-				     "mediatek,mt7623-rng";
-			reg = <0 0x1020f000 0 0x100>;
-			clocks = <&infracfg CLK_INFRA_TRNG_CK>;
-			clock-names = "rng";
-			status = "disabled";
-		};
-
-		crypto: crypto@10320000 {
-			compatible = "inside-secure,safexcel-eip97";
-			reg = <0 0x10320000 0 0x40000>;
-			interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "ring0", "ring1", "ring2", "ring3";
-			clocks = <&infracfg CLK_INFRA_EIP97_CK>;
-			assigned-clocks = <&topckgen CLK_TOP_EIP_B_SEL>;
-			assigned-clock-parents = <&apmixedsys CLK_APMIXED_NET2PLL>;
-			status = "disabled";
-		};
-
-		uart0: serial@11002000 {
-			compatible = "mediatek,mt7986-uart",
-				     "mediatek,mt6577-uart";
-			reg = <0 0x11002000 0 0x400>;
-			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&infracfg CLK_INFRA_UART0_SEL>,
-				 <&infracfg CLK_INFRA_UART0_CK>;
-			clock-names = "baud", "bus";
-			assigned-clocks = <&topckgen CLK_TOP_UART_SEL>,
-					  <&infracfg CLK_INFRA_UART0_SEL>;
-			assigned-clock-parents = <&topckgen CLK_TOP_XTAL>,
-						 <&topckgen CLK_TOP_UART_SEL>;
-			status = "disabled";
-		};
-
-		uart1: serial@11003000 {
-			compatible = "mediatek,mt7986-uart",
-				     "mediatek,mt6577-uart";
-			reg = <0 0x11003000 0 0x400>;
-			interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&infracfg CLK_INFRA_UART1_SEL>,
-				 <&infracfg CLK_INFRA_UART1_CK>;
-			clock-names = "baud", "bus";
-			assigned-clocks = <&infracfg CLK_INFRA_UART1_SEL>;
-			assigned-clock-parents = <&topckgen CLK_TOP_F26M_SEL>;
-			status = "disabled";
-		};
-
-		uart2: serial@11004000 {
-			compatible = "mediatek,mt7986-uart",
-				     "mediatek,mt6577-uart";
-			reg = <0 0x11004000 0 0x400>;
-			interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&infracfg CLK_INFRA_UART2_SEL>,
-				 <&infracfg CLK_INFRA_UART2_CK>;
-			clock-names = "baud", "bus";
-			assigned-clocks = <&infracfg CLK_INFRA_UART2_SEL>;
-			assigned-clock-parents = <&topckgen CLK_TOP_F26M_SEL>;
-			status = "disabled";
-		};
-
-		i2c0: i2c@11008000 {
-			compatible = "mediatek,mt7986-i2c";
-			reg = <0 0x11008000 0 0x90>,
-			      <0 0x10217080 0 0x80>;
-			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
-			clock-div = <5>;
-			clocks = <&infracfg CLK_INFRA_I2C0_CK>,
-				 <&infracfg CLK_INFRA_AP_DMA_CK>;
-			clock-names = "main", "dma";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-
-		spi0: spi@1100a000 {
-			compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
-			reg = <0 0x1100a000 0 0x100>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&topckgen CLK_TOP_MPLL_D2>,
-				 <&topckgen CLK_TOP_SPI_SEL>,
-				 <&infracfg CLK_INFRA_SPI0_CK>,
-				 <&infracfg CLK_INFRA_SPI0_HCK_CK>;
-			clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
-			status = "disabled";
-		};
-
-		spi1: spi@1100b000 {
-			compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
-			reg = <0 0x1100b000 0 0x100>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&topckgen CLK_TOP_MPLL_D2>,
-				 <&topckgen CLK_TOP_SPIM_MST_SEL>,
-				 <&infracfg CLK_INFRA_SPI1_CK>,
-				 <&infracfg CLK_INFRA_SPI1_HCK_CK>;
-			clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
-			status = "disabled";
-		};
-
-		thermal: thermal@1100c800 {
-			compatible = "mediatek,mt7986-thermal";
-			reg = <0 0x1100c800 0 0x800>;
-			interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&infracfg CLK_INFRA_THERM_CK>,
-				 <&infracfg CLK_INFRA_ADC_26M_CK>;
-			clock-names = "therm", "auxadc";
-			nvmem-cells = <&thermal_calibration>;
-			nvmem-cell-names = "calibration-data";
-			#thermal-sensor-cells = <1>;
-			mediatek,auxadc = <&auxadc>;
-			mediatek,apmixedsys = <&apmixedsys>;
-		};
-
-		auxadc: adc@1100d000 {
-			compatible = "mediatek,mt7986-auxadc";
-			reg = <0 0x1100d000 0 0x1000>;
-			clocks = <&infracfg CLK_INFRA_ADC_26M_CK>;
-			clock-names = "main";
-			#io-channel-cells = <1>;
-			status = "disabled";
-		};
-
-		ssusb: usb@11200000 {
-			compatible = "mediatek,mt7986-xhci",
-				     "mediatek,mtk-xhci";
-			reg = <0 0x11200000 0 0x2e00>,
-			      <0 0x11203e00 0 0x0100>;
-			reg-names = "mac", "ippc";
-			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>,
-				 <&infracfg CLK_INFRA_IUSB_CK>,
-				 <&infracfg CLK_INFRA_IUSB_133_CK>,
-				 <&infracfg CLK_INFRA_IUSB_66M_CK>,
-				 <&topckgen CLK_TOP_U2U3_XHCI_SEL>;
-			clock-names = "sys_ck",
-				      "ref_ck",
-				      "mcu_ck",
-				      "dma_ck",
-				      "xhci_ck";
-			phys = <&u2port0 PHY_TYPE_USB2>,
-			       <&u3port0 PHY_TYPE_USB3>,
-			       <&u2port1 PHY_TYPE_USB2>;
-			status = "disabled";
-		};
-
-		mmc0: mmc@11230000 {
-			compatible = "mediatek,mt7986-mmc";
-			reg = <0 0x11230000 0 0x1000>,
-			      <0 0x11c20000 0 0x1000>;
-			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-			assigned-clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
-					  <&topckgen CLK_TOP_EMMC_250M_SEL>;
-			assigned-clock-parents = <&apmixedsys CLK_APMIXED_MPLL>,
-						 <&topckgen CLK_TOP_NET1PLL_D5_D2>;
-			clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
-				 <&infracfg CLK_INFRA_MSDC_HCK_CK>,
-				 <&infracfg CLK_INFRA_MSDC_CK>,
-				 <&infracfg CLK_INFRA_MSDC_133M_CK>,
-				 <&infracfg CLK_INFRA_MSDC_66M_CK>;
-			clock-names = "source", "hclk", "source_cg", "bus_clk",
-				      "sys_cg";
-			status = "disabled";
-		};
-
-		pcie: pcie@11280000 {
-			compatible = "mediatek,mt7986-pcie",
-				     "mediatek,mt8192-pcie";
-			reg = <0x00 0x11280000 0x00 0x4000>;
-			reg-names = "pcie-mac";
-			ranges = <0x82000000 0x00 0x20000000 0x00
-				  0x20000000 0x00 0x10000000>;
-			device_type = "pci";
-			#address-cells = <3>;
-			#size-cells = <2>;
-			interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-			bus-range = <0x00 0xff>;
-			clocks = <&infracfg CLK_INFRA_IPCIE_PIPE_CK>,
-				 <&infracfg CLK_INFRA_IPCIE_CK>,
-				 <&infracfg CLK_INFRA_IPCIER_CK>,
-				 <&infracfg CLK_INFRA_IPCIEB_CK>;
-			clock-names = "pl_250m", "tl_26m", "peri_26m", "top_133m";
-
-			phys = <&pcie_port PHY_TYPE_PCIE>;
-			phy-names = "pcie-phy";
-
-			#interrupt-cells = <1>;
-			interrupt-map-mask = <0 0 0 0x7>;
-			interrupt-map = <0 0 0 1 &pcie_intc 0>,
-					<0 0 0 2 &pcie_intc 1>,
-					<0 0 0 3 &pcie_intc 2>,
-					<0 0 0 4 &pcie_intc 3>;
-			status = "disabled";
-
-			pcie_intc: interrupt-controller {
-				#address-cells = <0>;
-				#interrupt-cells = <1>;
-				interrupt-controller;
-			};
-		};
-
-		pcie_phy: t-phy {
-			compatible = "mediatek,mt7986-tphy",
-				     "mediatek,generic-tphy-v2";
-			ranges;
-			#address-cells = <2>;
-			#size-cells = <2>;
-			status = "disabled";
-
-			pcie_port: pcie-phy@11c00000 {
-				reg = <0 0x11c00000 0 0x20000>;
-				clocks = <&clk40m>;
-				clock-names = "ref";
-				#phy-cells = <1>;
-			};
-		};
-
-		efuse: efuse@11d00000 {
-			compatible = "mediatek,mt7986-efuse", "mediatek,efuse";
-			reg = <0 0x11d00000 0 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			thermal_calibration: calib@274 {
-				reg = <0x274 0xc>;
-			};
-		};
-
-		usb_phy: t-phy@11e10000 {
-			compatible = "mediatek,mt7986-tphy",
-				     "mediatek,generic-tphy-v2";
-			ranges = <0 0 0x11e10000 0x1700>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			status = "disabled";
-
-			u2port0: usb-phy@0 {
-				reg = <0x0 0x700>;
-				clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>,
-					 <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>;
-				clock-names = "ref", "da_ref";
-				#phy-cells = <1>;
-			};
-
-			u3port0: usb-phy@700 {
-				reg = <0x700 0x900>;
-				clocks = <&topckgen CLK_TOP_USB3_PHY_SEL>;
-				clock-names = "ref";
-				#phy-cells = <1>;
-			};
-
-			u2port1: usb-phy@1000 {
-				reg = <0x1000 0x700>;
-				clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>,
-					 <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>;
-				clock-names = "ref", "da_ref";
-				#phy-cells = <1>;
-			};
-		};
-
-		ethsys: syscon@15000000 {
-			 compatible = "mediatek,mt7986-ethsys",
-				      "syscon";
-			 reg = <0 0x15000000 0 0x1000>;
-			 #clock-cells = <1>;
-			 #reset-cells = <1>;
-		};
-
-		wed0: wed@15010000 {
-			compatible = "mediatek,mt7986-wed",
-				     "syscon";
-			reg = <0 0x15010000 0 0x1000>;
-			interrupt-parent = <&gic>;
-			interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
-			memory-region = <&wo_emi0>, <&wo_ilm0>, <&wo_dlm0>,
-					<&wo_data>, <&wo_boot>;
-			memory-region-names = "wo-emi", "wo-ilm", "wo-dlm",
-					      "wo-data", "wo-boot";
-			mediatek,wo-ccif = <&wo_ccif0>;
-		};
-
-		wed1: wed@15011000 {
-			compatible = "mediatek,mt7986-wed",
-				     "syscon";
-			reg = <0 0x15011000 0 0x1000>;
-			interrupt-parent = <&gic>;
-			interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
-			memory-region = <&wo_emi1>, <&wo_ilm1>, <&wo_dlm1>,
-					<&wo_data>, <&wo_boot>;
-			memory-region-names = "wo-emi", "wo-ilm", "wo-dlm",
-					      "wo-data", "wo-boot";
-			mediatek,wo-ccif = <&wo_ccif1>;
-		};
-
-		eth: ethernet@15100000 {
-			compatible = "mediatek,mt7986-eth";
-			reg = <0 0x15100000 0 0x80000>;
-			interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ethsys CLK_ETH_FE_EN>,
-				 <&ethsys CLK_ETH_GP2_EN>,
-				 <&ethsys CLK_ETH_GP1_EN>,
-				 <&ethsys CLK_ETH_WOCPU1_EN>,
-				 <&ethsys CLK_ETH_WOCPU0_EN>,
-				 <&sgmiisys0 CLK_SGMII0_TX250M_EN>,
-				 <&sgmiisys0 CLK_SGMII0_RX250M_EN>,
-				 <&sgmiisys0 CLK_SGMII0_CDR_REF>,
-				 <&sgmiisys0 CLK_SGMII0_CDR_FB>,
-				 <&sgmiisys1 CLK_SGMII1_TX250M_EN>,
-				 <&sgmiisys1 CLK_SGMII1_RX250M_EN>,
-				 <&sgmiisys1 CLK_SGMII1_CDR_REF>,
-				 <&sgmiisys1 CLK_SGMII1_CDR_FB>,
-				 <&topckgen CLK_TOP_NETSYS_SEL>,
-				 <&topckgen CLK_TOP_NETSYS_500M_SEL>;
-			clock-names = "fe", "gp2", "gp1", "wocpu1", "wocpu0",
-				      "sgmii_tx250m", "sgmii_rx250m",
-				      "sgmii_cdr_ref", "sgmii_cdr_fb",
-				      "sgmii2_tx250m", "sgmii2_rx250m",
-				      "sgmii2_cdr_ref", "sgmii2_cdr_fb",
-				      "netsys0", "netsys1";
-			assigned-clocks = <&topckgen CLK_TOP_NETSYS_2X_SEL>,
-					  <&topckgen CLK_TOP_SGM_325M_SEL>;
-			assigned-clock-parents = <&apmixedsys CLK_APMIXED_NET2PLL>,
-						 <&apmixedsys CLK_APMIXED_SGMPLL>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			mediatek,ethsys = <&ethsys>;
-			mediatek,sgmiisys = <&sgmiisys0>, <&sgmiisys1>;
-			mediatek,wed-pcie = <&wed_pcie>;
-			mediatek,wed = <&wed0>, <&wed1>;
-			status = "disabled";
-		};
-
-		wo_ccif0: syscon@151a5000 {
-			compatible = "mediatek,mt7986-wo-ccif", "syscon";
-			reg = <0 0x151a5000 0 0x1000>;
-			interrupt-parent = <&gic>;
-			interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>;
-		};
-
-		wo_ccif1: syscon@151ad000 {
-			compatible = "mediatek,mt7986-wo-ccif", "syscon";
-			reg = <0 0x151ad000 0 0x1000>;
-			interrupt-parent = <&gic>;
-			interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>;
-		};
-
-		wifi: wifi@18000000 {
-			compatible = "mediatek,mt7986-wmac";
-			reg = <0 0x18000000 0 0x1000000>,
-			      <0 0x10003000 0 0x1000>,
-			      <0 0x11d10000 0 0x1000>;
-			resets = <&watchdog MT7986_TOPRGU_CONSYS_SW_RST>;
-			reset-names = "consys";
-			clocks = <&topckgen CLK_TOP_CONN_MCUSYS_SEL>,
-				 <&topckgen CLK_TOP_AP2CNN_HOST_SEL>;
-			clock-names = "mcu", "ap2conn";
-			interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
-			memory-region = <&wmcpu_emi>;
-		};
-	};
-
-	thermal-zones {
-		cpu_thermal: cpu-thermal {
-			polling-delay-passive = <1000>;
-			polling-delay = <1000>;
-			thermal-sensors = <&thermal 0>;
-
-			trips {
-				cpu_trip_crit: crit {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical";
-				};
-
-				cpu_trip_hot: hot {
-					temperature = <120000>;
-					hysteresis = <2000>;
-					type = "hot";
-				};
-
-				cpu_trip_active_high: active-high {
-					temperature = <115000>;
-					hysteresis = <2000>;
-					type = "active";
-				};
-
-				cpu_trip_active_med: active-med {
-					temperature = <85000>;
-					hysteresis = <2000>;
-					type = "active";
-				};
-
-				cpu_trip_active_low: active-low {
-					temperature = <60000>;
-					hysteresis = <2000>;
-					type = "active";
-				};
-			};
-		};
-	};
-
-	timer {
-		compatible = "arm,armv8-timer";
-		interrupt-parent = <&gic>;
-		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
-			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
-			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
-			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
-	};
-};
--- a/routers/yada-house/kconf-from-device.txt
+++ b/routers/yada-house/kconf-from-device.txt
--- a/routers/yada-house/kconf-from-openwrt.txt
+++ b/routers/yada-house/kconf-from-openwrt.txt
@@ -1,103 +0,0 @@
-ARM="y";
-SYS_HAS_NONCACHED_MEMORY="y";
-POSITION_INDEPENDENT="y";
-ARCH_MEDIATEK="y";
-TEXT_BASE="0x41e00000";
-SYS_MALLOC_F_LEN="0x4000";
-NR_DRAM_BANKS="1";
-ENV_SIZE="0x80000";
-ENV_OFFSET="0x400000";
-DEFAULT_DEVICE_TREE="mt7986a-glinet-gl-mt6000";
-OF_LIBFDT_OVERLAY="y";
-TARGET_MT7986="y";
-SYS_LOAD_ADDR="0x46000000";
-PRE_CON_BUF_ADDR="0x4007EF00";
-DEBUG_UART_BASE="0x11002000";
-DEBUG_UART_CLOCK="40000000";
-DEBUG_UART="y";
-AHCI="y";
-FIT="y";
-AUTOBOOT_KEYED="y";
-AUTOBOOT_MENU_SHOW="y";
-DEFAULT_FDT_FILE="mediatek/mt7986a-glinet-gl-mt6000.dtb";
-LOGLEVEL="7";
-PRE_CONSOLE_BUFFER="y";
-LOG="y";
-BOARD_LATE_INIT="y";
-HUSH_PARSER="y";
-SYS_PROMPT="MT7986> ";
-CMD_CPU="y";
-CMD_LICENSE="y";
-CMD_BOOTMENU="y";
-CMD_ASKENV="y";
-CMD_ERASEENV="y";
-CMD_ENV_FLAGS="y";
-CMD_STRINGS="y";
-CMD_DM="y";
-CMD_GPIO="y";
-CMD_PWM="y";
-CMD_GPT="y";
-CMD_MMC="y";
-CMD_PART="y";
-CMD_USB="y";
-CMD_TFTPSRV="y";
-CMD_RARP="y";
-CMD_CDP="y";
-CMD_SNTP="y";
-CMD_LINK_LOCAL="y";
-CMD_DHCP="y";
-CMD_DNS="y";
-CMD_PING="y";
-CMD_CACHE="y";
-CMD_PSTORE="y";
-CMD_PSTORE_MEM_ADDR="0x42ff0000";
-CMD_UUID="y";
-CMD_HASH="y";
-CMD_SMC="y";
-OF_EMBED="y";
-ENV_OVERWRITE="y";
-ENV_IS_IN_MMC="y";
-SYS_RELOC_GD_ENV_ADDR="y";
-USE_DEFAULT_ENV_FILE="y";
-DEFAULT_ENV_FILE="defenvs/glinet_gl-mt6000_env";
-ENV_VARS_UBOOT_RUNTIME_CONFIG="y";
-VERSION_VARIABLE="y";
-NETCONSOLE="y";
-USE_IPADDR="y";
-IPADDR="192.168.1.1";
-USE_SERVERIP="y";
-SERVERIP="192.168.1.254";
-NET_RANDOM_ETHADDR="y";
-BUTTON="y";
-BUTTON_GPIO="y";
-CLK="y";
-GPIO_HOG="y";
-LED="y";
-LED_BLINK="y";
-LED_GPIO="y";
-SUPPORT_EMMC_BOOT="y";
-MMC_HS200_SUPPORT="y";
-MMC_MTK="y";
-PHY_FIXED="y";
-MEDIATEK_ETH="y";
-PHY="y";
-PHY_MTK_TPHY="y";
-PINCTRL="y";
-PINCONF="y";
-PINCTRL_MT7986="y";
-POWER_DOMAIN="y";
-MTK_POWER_DOMAIN="y";
-DM_REGULATOR="y";
-DM_REGULATOR_FIXED="y";
-DM_REGULATOR_GPIO="y";
-DM_PWM="y";
-PWM_MTK="y";
-RAM="y";
-DM_SERIAL="y";
-SERIAL_RX_BUFFER="y";
-MTK_SERIAL="y";
-USB="y";
-USB_XHCI_HCD="y";
-USB_XHCI_MTK="y";
-USB_STORAGE="y";
-HEXDUMP="y";
--- a/routers/yada-house/mt7986a-glinet-gl-mt6000.dts
+++ b/routers/yada-house/mt7986a-glinet-gl-mt6000.dts
@@ -1,356 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/pinctrl/mt65xx.h>
-
-#include "mt7986a.dtsi"
-
-/ {
-	model = "GL.iNet GL-MT6000";
-	compatible = "glinet,gl-mt6000", "mediatek,mt7986a";
-
-	aliases {
-		serial0 = &uart0;
-		label-mac-device = &gmac1;
-		led-boot = &led_blue;
-		led-failsafe = &led_blue;
-		led-running = &led_white;
-		led-upgrade = &led_white;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-		bootargs-append = " root=PARTLABEL=rootfs rootwait";
-	};
-
-	reg_1p8v: regulator-1p8v {
-		compatible = "regulator-fixed";
-		regulator-name = "1.8vd";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-boot-on;
-		regulator-always-on;
-	};
-
-	reg_3p3v: regulator-3p3v {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-3.3V";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-boot-on;
-		regulator-always-on;
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		reset {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&pio 9 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_blue: led-0 {
-			label = "blue:run";
-			gpios = <&pio 38 GPIO_ACTIVE_LOW>;
-		};
-
-		led_white: led-1 {
-			label = "white:system";
-			gpios = <&pio 37 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	usb_vbus: regulator-usb-vbus {
-		compatible = "regulator-fixed";
-		regulator-name = "usb_vbus";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		gpios = <&pio 24 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
-		regulator-boot-on;
-	};
-};
-
-&eth {
-	status = "okay";
-
-	gmac0: mac@0 {
-		compatible = "mediatek,eth-mac";
-		reg = <0>;
-		phy-mode = "2500base-x";
-		nvmem-cells = <&macaddr_factory_a 2>;
-		nvmem-cell-names = "mac-address";
-
-		fixed-link {
-			speed = <2500>;
-			full-duplex;
-			pause;
-		};
-	};
-
-	gmac1: mac@1 {
-		compatible = "mediatek,eth-mac";
-		reg = <1>;
-		nvmem-cells = <&macaddr_factory_a 0>;
-		nvmem-cell-names = "mac-address";
-		phy-mode = "2500base-x";
-		phy-handle = <&phy1>;
-	};
-
-	mdio: mdio-bus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		phy1: phy@1 {
-			compatible = "ethernet-phy-ieee802.3-c45";
-			reg = <1>;
-			reset-assert-us = <100000>;
-			reset-deassert-us = <100000>;
-			reset-gpios = <&pio 10 GPIO_ACTIVE_LOW>;
-			interrupt-parent = <&pio>;
-			interrupts = <46 IRQ_TYPE_LEVEL_LOW>;
-			realtek,aldps-enable;
-		};
-
-		phy7: ethernet-phy@7 {
-			compatible = "ethernet-phy-ieee802.3-c45";
-			reg = <7>;
-			reset-assert-us = <100000>;
-			reset-deassert-us = <100000>;
-			reset-gpios = <&pio 19 GPIO_ACTIVE_LOW>;
-			interrupt-parent = <&pio>;
-			interrupts = <47 IRQ_TYPE_LEVEL_LOW>;
-			realtek,aldps-enable;
-		};
-
-		switch: switch@1f {
-			compatible = "mediatek,mt7531";
-			reg = <31>;
-			reset-gpios = <&pio 18 GPIO_ACTIVE_HIGH>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-			interrupt-parent = <&pio>;
-			interrupts = <66 IRQ_TYPE_LEVEL_HIGH>;
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
-					label = "lan2";
-				};
-
-				port@1 {
-					reg = <1>;
-					label = "lan3";
-				};
-
-				port@2 {
-					reg = <2>;
-					label = "lan4";
-				};
-
-				port@3 {
-					reg = <3>;
-					label = "lan5";
-				};
-
-				port@5 {
-					reg = <5>;
-					label = "lan1";
-					phy-handle = <&phy7>;
-					phy-mode = "2500base-x";
-				};
-
-				port@6 {
-					reg = <6>;
-					ethernet = <&gmac0>;
-					phy-mode = "2500base-x";
-
-					fixed-link {
-						speed = <2500>;
-						full-duplex;
-						pause;
-					};
-				};
-			};
-		};
-	};
-};
-
-&pio {
-	wf_2g_5g_pins: wf_2g_5g-pins {
-		mux {
-			function = "wifi";
-			groups = "wf_2g", "wf_5g";
-		};
-		conf {
-			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
-			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
-			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
-			       "WF1_TOP_CLK", "WF1_TOP_DATA";
-			drive-strength = <MTK_DRIVE_4mA>;
-		};
-	};
-
-	mmc0_pins_default: mmc0-pins {
-		mux {
-			function = "emmc";
-			groups = "emmc_51";
-		};
-		conf-cmd-dat {
-			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
-			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
-			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
-			input-enable;
-			drive-strength = <MTK_DRIVE_4mA>;
-			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;	/* pull-up 10K */
-		};
-		conf-clk {
-			pins = "EMMC_CK";
-			drive-strength = <MTK_DRIVE_6mA>;
-			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;	/* pull-down 50K */
-		};
-		conf-ds {
-			pins = "EMMC_DSL";
-			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;	/* pull-down 50K */
-		};
-		conf-rst {
-			pins = "EMMC_RSTB";
-			drive-strength = <MTK_DRIVE_4mA>;
-			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;	/* pull-up 10K */
-		};
-	};
-
-	mmc0_pins_uhs: mmc0-uhs-pins {
-		mux {
-			function = "emmc";
-			groups = "emmc_51";
-		};
-		conf-cmd-dat {
-			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
-			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
-			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
-			input-enable;
-			drive-strength = <MTK_DRIVE_4mA>;
-			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;	/* pull-up 10K */
-		};
-		conf-clk {
-			pins = "EMMC_CK";
-			drive-strength = <MTK_DRIVE_6mA>;
-			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;	/* pull-down 50K */
-		};
-		conf-ds {
-			pins = "EMMC_DSL";
-			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;	/* pull-down 50K */
-		};
-		conf-rst {
-			pins = "EMMC_RSTB";
-			drive-strength = <MTK_DRIVE_4mA>;
-			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;	/* pull-up 10K */
-		};
-	};
-};
-
-&crypto {
-	status = "okay";
-};
-
-&ssusb {
-	vusb33-supply = <&reg_3p3v>;
-	vbus-supply = <&usb_vbus>;
-	status = "okay";
-};
-
-&trng {
-	status = "okay";
-};
-
-&uart0 {
-	status = "okay";
-};
-
-&usb_phy {
-	status = "okay";
-};
-
-&watchdog {
-	status = "okay";
-};
-
-&wifi {
-	nvmem-cells = <&eeprom_factory_0>;
-	nvmem-cell-names = "eeprom";
-	pinctrl-names = "default";
-	pinctrl-0 = <&wf_2g_5g_pins>;
-	status = "okay";
-};
-
-&mmc0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	pinctrl-names = "default", "state_uhs";
-	pinctrl-0 = <&mmc0_pins_default>;
-	pinctrl-1 = <&mmc0_pins_uhs>;
-	bus-width = <8>;
-	max-frequency = <200000000>;
-	cap-mmc-highspeed;
-	mmc-hs200-1_8v;
-	mmc-hs400-1_8v;
-	hs400-ds-delay = <0x14014>;
-	vmmc-supply = <&reg_3p3v>;
-	vqmmc-supply = <&reg_1p8v>;
-	non-removable;
-	no-sd;
-	no-sdio;
-	status = "okay";
-
-	card@0 {
-		compatible = "mmc-card";
-		reg = <0>;
-
-		block {
-			compatible = "block-device";
-			partitions {
-				block-partition-env {
-					partname = "u-boot-env";
-
-					nvmem-layout {
-						compatible = "u-boot,env";
-					};
-				};
-
-				block-partition-factory {
-					partname = "factory";
-
-					nvmem-layout {
-						compatible = "fixed-layout";
-						#address-cells = <1>;
-						#size-cells = <1>;
-
-						eeprom_factory_0: eeprom@0 {
-							reg = <0x0 0x1000>;
-						};
-
-						macaddr_factory_a: macaddr@a {
-							compatible = "mac-base";
-							reg = <0xa 0x6>;
-							#nvmem-cell-cells = <1>;
-						};
-					};
-				};
-			};
-		};
-	};
-};
--- a/vars/per-machine/vega/ups/password/groups/admins
+++ b/vars/per-machine/vega/ups/password/groups/admins
@@ -0,0 +1 @@
+../../../../../../sops/groups/admins
--- a/vars/per-machine/vega/ups/password/machines/vega
+++ b/vars/per-machine/vega/ups/password/machines/vega
@@ -0,0 +1 @@
+../../../../../../sops/machines/vega
--- a/vars/per-machine/vega/ups/password/secret
+++ b/vars/per-machine/vega/ups/password/secret
@@ -0,0 +1,51 @@
+{
+	"data": "ENC[AES256_GCM,data:9KQPJ1ANkdVaJ5tDbjm47S9o4xs5xg0UDsKQ/tMd662Xs2Tz,iv:/1uH1iYKpBHVQUF19KIscCzTeZhCTGZnYNacOA9NRJA=,tag:neYS9VibwpVn86kDIEmELQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age134vt63pjqpd0m7702fyn8vhdlzyj2deqc2q78sp9uw9052kxsgwq6d25ez",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXUUxtS0pDdnBLTmpoS0p3\ndE5KVDE5bHhWZU5VQmpiM04rTU8vK0k1UGw0CnB6TjRiaEhjSjJvSE1ZQmwyUkVJ\nNHlheVB5U2FyQU5odXRrZGlNa0lhR0EKLS0tIERpUDJuSFQxVXY3WlhRR2Z5M2lO\nL0JYVEVTWWdRM3pWRDNzVTM3eVJCa00KVOJgJ+syOOaCYqjLfhPwAVGyI7GrluyU\n04C9BwmAwSuvBA4MhnIT6a3JAHGj0LqvGTDAeeUHzxGO6dKfu6BCWg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age17d4qt0n9edq57tgcqyk8eu5mrendl59yt6z2y3a4vkq7el8krqtq6lq28g",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhQ1QxWUlTdHV1dGFoWVlj\nVkxDWHhIaWM0bGZtYnYwUit6eXB5bWMxcUVvCmFtVlZDYVEvamZrK0xZVFQwZTJU\nWkQ1aXpVWDN1NWRWTVdNZGJneU5qeDAKLS0tIGNQTTZrdXZPaENiVFhnSXNBSFZ3\nc0h1RkxZejNrU2xuczhZbjlaZ28wcDAK50drPDlvgOhW7NLEfuMcJmibsBPY6XdO\n9JJR8S+LmpwiPmDd4PPSg5lXlGXk41MeODz0HaGy8Ty1Ra83oppGiA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1fido2-hmac1qqpf43tgcfjm048lsqskvq34w2t4uvrm5qy6m2eg6zjj82ctca8wctgpczxvj0q4y6337uhvsxdh5j86k9h9ymautpvv2759ucwnef75ez7pa7fpkddklp40mxk2tedsp74359g0kefn5rsq0x0yss6cu4yd0h06up0rp08t6yc4l0hfa9y8jn5fkx6nk0hjhz06ykwv0fyxe7z42q683jy0",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIDJwQitrbWtW\nbzJ2WkpmWlBKbXkyVnJZR0xNOVlRanBNZFFEaHJBSFJ3ejggQVEgd0l6SlBCVW1v\neDl5N0lHYmVrajZzVzVTYjd4WVdNVjZoZVlkUEtmVXlMdyBIdmtoczF0dmhxL1py\nS1hsc0ErckdoVVB0bE02RGdCNW5raERXT1ZJMTkzNjRGNHd2T3ZSTVYrKzZlbEll\nVTZKc2JVN1B2SzRuNkpaekhwSWJQaFZVQQpVZFpXWXJoTk00TWpTcmhWZlorVjZl\nT1gxekhMZG5VYjVHZlZBS29xTTl3Ci0tLSB2UlpzUDE3bWR6Mm4yZGVTUFRIKzlE\nZWpvVnZVYzZXRmttUGJzeTdRd2F3CjgcUpQOAdEiu8XtZypEmCAmq7MUhKCqOh5x\nYOttmHxe6wcpt8uVhzKJzWh0N3az+Q83GqfqRtbqpYaUVUk0xJ4=\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1fido2-hmac1qqprw0vfpc8wzsu78quc777kmee54ln6nnsjrnrhl7nr33eh4kvkksqp05qqxj4kgfzrmrugrsvg7skx6ghh3q9xc0x0agthtkvy25d9eq7eklta5wf7s30hexkuyl5546rdz9ffa5tawlp5yweqkgccntw0ny540n2am3cqw3luhxkfmrp63kwr6mwplhr9u26wll48x0n3k5f60c7hg9a3",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIHpwTUYrWWR4\neTEwQW5ZZjZhRjlYQ0dFSEJaTFR3STdWaHZSMWszYmZBbXMgQVEgZlFBRFNyWkNS\nRDJQaUJ3WWowTEcwaTk0Z0tiRHpQNmhkMTJZUlZHbHlEMCBtMzE5bzVQb1JmZkpy\nY0orbEs2RzBSVXA3UmZYZkRRanNnc2pHSnJjK1pLVmZOWGR4d0IwZjh1YXlkakRx\nTm5EMXR3ZjNHWGl0Ty8rcHpQbkcxRTZmZwpjTnNQcWhDbnJOZzR2QTYvOGIyRGlC\ncG1SSTlZOW9lUzVuNGl5VnF2aWVzCi0tLSAxZkYybWxBUERGU1VsaXFrcmVzK0Vh\nbFJCQ2tOa2oyOHQ4SGdGT05MME4wCnkCUJJZMZoYnKxRcp4NQC3LG92wdoM+8fGw\nHnZ4HxteJ3aeINgG4PLSudmvWD/tltHH8c556guZKTGmKytHHrw=\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1fido2-hmac1qqpyewum3q8dfcumfgec8nn958aec9f4q9aqy0k06kw5kq27d6fdqdgp0p7y4ru3n5xk90u747xevxa2af3v37e85j9g3axrmw5hdwdfh0wz22hut5vrafxsx26a7vh8fjwkymz3ramfgvvu4detztu075kmpr8l9ydqda0rnjwatdwmfgswg849p37astvld98s3nleeq575azlwc2hhpuh",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IGZpZG8yLWhtYWMgQUFJIE1nalBxWXFm\nUnVLSVNsTFRFUlV3ZG1NUDhEL2FESTZhQStQaFdWenlxRm8gQVEgZUh4S2o1R2RE\nV0svbnErTmxodXE2bUxJK3lla2lvajB3OXVwZHJtcHU5dyBKU3I4WFJnK3BOQXl0\nZDh5NTB5ZFlteFJIM2FVTVp5cmNyRXZqL1V0c0l6L0tSb0c5ZU9jbmRXMTIwb2c1\nQjZsREgzWUxaOXBUd2pQK2NncDZuUmZkZwpxa3N4Nlk2VmQyb2drWEM3UTN3bW9a\nL3g2SERINUg2c2lmN0FxaXdBb2t3Ci0tLSA3L0RTdmp0c3NHT1NYWWdGKzhvLzNO\nRU9VSCs2QUNOdDEweWtCWm9aVWpzCpI+ZP5DwtUteBE9kniwss3SVTxqCBFajP4J\n3QXDxCBYk1j5c1kBlzL+aMpCQTJyKatlYTvQisvbOIZVBiYbT4Q=\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1hlzrpqqgndcthq5m5yj9egfgyet2fzrxwa6ynjzwx2r22uy6m3hqr3rd06",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArK3JKcTVOUjZmb08xYmpj\nSkcvSXZhS2t6RGRjelFLeFFCUFJJVHlpaEJNCkxUUVRxaDhNMFNGcUdramt0OVhH\nVFFjSmVzS3lHeUNrM3NDckF3Rlp2VmsKLS0tIFNvNzlmUkNFRk5zYzhyS29QVEZF\nZ3oxYUJYS2lPVkNzbmFRS1U4NUhUNkkKtl//bn218lQeG5mU32GzdfF5pB+bai2h\neI0cGoNtjU+/ppvx4gT9aH6QSYuYethxkoDjBuysSrQFh/KukOqrJA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1pl3nej4ayvuk75cydwyz5ttzelqqdkun8hweu40vypvspzh9j4vqp9rl0j",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoa1luRDhDdDBoV1d6cm94\nZnZRallGUHJSaHhuQ2FKYmIxMWpqUzRSTEU0Ck5wM2ZSMVNPTmxWdm1OK1JTY09H\nWmdrUEpIQlFkbmREK3hySm5vb3ZmUkEKLS0tIFNWVEdITUZZeE55TG1XaFZ5Z3ZU\nZ2E5MmNtNFdhMmdWRktVdHFRNDUxek0Kfcxpxd4HOoz/c+bRJ9VXyoTIX8yutTSp\ng4jsXwAipq8r0kh94U6QBbzffIqdwUMPYyy1sr3oEXiIxabdMtJ8fg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1sg0rvgyetdcqw7j2x983fh69kdkvqsngpe5x36e5920qa7fze3cqhj4wgx",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOMEhpekVyRUpQOW9pWkw5\nOUZiSTROdXJrS3gzUUlnYUZ2TU5kMUFMdVdBClJod2loQU91bFRhVGdDMjhvSkdU\nL3dNdHM2anAybWN4eENqUis1M2ZSTTAKLS0tIFhHRGk5VzJjTSt3UGxpOTU4OXB1\nWWViTzAvaWlKVWZPR3J3eno3cGwzRWMKiHIJ7jBtf6uTRLyhh7IoLHvIWtHhHGOt\nLMqDloJN18hCveOdW4f4sksi2GEMlpfxRnx4DATWthiD0M403tDZkw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1swlyyk2rzvevqawyeekv75nx2dz34zpe3xqhkqme26gcgeavy4dqrfpcd8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3U3dCcWEzd3o5dFBFbnZS\ncDNwQmIzUDNoSTFiMTZGeW1LUlJSbUFaOUdBCjZEL2dOVXBoU3BLa0tOaVlCSzNt\nNDhsTms2QmhmRS80WmhWaFM0NlkzRkEKLS0tIFZNRk5vVnhqN2diMS9kRjZ3Nkw5\nbVlyOGFqY3VHZ0pQRGpUUUQ4OWdXT1EKRIHVf9M32BG13P2x7eWof0Cz56NKJI/h\nFESmEFBxbF0BpnRxOM70GWTzsoS3+PzsM2I4GG9ArbkFRfZfkkR9AA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1vphy2sr6uw4ptsua3gh9khrm2cqyt65t46tusmt44z98qa7q6ymq6prrdl",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxL3VoMzVPM3FKQU55clYz\nRjB1aTFQRmhtT0h4KzN2T0xKRmJyQ3NLejJnCmdTU1VVODEyb2E5ak40ZmxKcjlS\nbG5oc3Z4ZUVVNzRiaEEvNW91T1RGY0UKLS0tIGx4MkVJblRKendyNlROYlJwaFBX\nZ1lmWDJyVE83SWdqV3o0K2pmYUNuMXMKwZa+GFWR5HvE4W2s3ovNbCZgXFtaus7p\n5wvIqsfQ30jFzIkWRMBq/uHDYKJggHZ3wwI3oU31wP5QlxvNlvPnFg==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-09-25T10:18:52Z",
+		"mac": "ENC[AES256_GCM,data:9/cdNmwYO7byDJGgiC1FdvHlkFW28zQ4ax0jgKuJBIOh41vY2h6WseedmsS4AAjl+3qBEAd2whYNzB2FdCba6d2IGqEx9z9jew4rS8TpigH3lPEz4SrkEn7KgxsjYB8xVhM2OkjFuc0T2b3F9UAyg2Bh8Ushuexnlk39e9OiTRc=,iv:dHbmzHniZZ/aKOJvj4RSP4lEmeG0uPo5oB7qKS6EaiI=,tag:sRJ+OILqs6L2gXwwepNH/Q==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.10.2"
+	}
+}
--- a/vars/per-machine/vega/ups/password/users/kurogeek
+++ b/vars/per-machine/vega/ups/password/users/kurogeek
@@ -0,0 +1 @@
+../../../../../../sops/users/kurogeek
Author	SHA1	Message	Date
kurogeek	9ddef2b268	mob next [ci-skip] [ci skip] [skip ci] lastFile:machines/vega/services/ups.nix	2025-09-25 17:28:59 +07:00
kurogeek	c102be10c6	Update vars via generator ups for machine vega	2025-09-25 17:18:52 +07:00