phosh-mobile-settings: fix .desktop file to display in phosh

phosh-mobile-settings: remove unneeded gnome schema refs (for real this time)
Merge branch 'staging/phosh-mobile-settings' into HEAD
2022-09-30 20:58:48 -07:00 · 2022-09-30 18:31:27 -07:00 · 2022-09-30 18:29:21 -07:00 · 2022-09-30 18:27:07 -07:00 · 2022-09-30 18:21:12 -07:00 · 2022-09-30 18:21:12 -07:00
32 changed files with 587 additions and 395 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -39,11 +39,11 @@
    "mobile-nixos": {
      "flake": false,
      "locked": {
-        "lastModified": 1661716773,
-        "narHash": "sha256-uxf0aC+kx8av3/IT8/UecxSMElC9i4UQvH25RHFwna4=",
+        "lastModified": 1664571968,
+        "narHash": "sha256-bLQ1V4bVm5cy9sPMSIr6aYTcGsCwNatc7Qh3/Ro19b4=",
        "owner": "nixos",
        "repo": "mobile-nixos",
-        "rev": "09e388c42298fa777caa7738cd8d8d2b6d1ac8db",
+        "rev": "b082416ae3169e00552b8b0933c9f38ae50f181b",
        "type": "github"
      },
      "original": {
@@ -54,11 +54,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1664017330,
-        "narHash": "sha256-919WZKBTxFdTkzIK6uJXE7hwSPQb7e/ekybxxWaotR4=",
+        "lastModified": 1664370076,
+        "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fde244a8c7655bc28616864e2290ad9c95409c2c",
+        "rev": "854fdc68881791812eddd33b2fed94b954979a8e",
        "type": "github"
      },
      "original": {
@@ -69,11 +69,11 @@
    },
    "nixpkgs-22_05": {
      "locked": {
-        "lastModified": 1664063819,
-        "narHash": "sha256-5wXa+9uboo7UizMDeUTMoANv3pm0g9ze1NdTleY3rCE=",
+        "lastModified": 1664201777,
+        "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "aee4db5b9eaccd3fb7f16c742685fef9dc355077",
+        "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14",
        "type": "github"
      },
      "original": {
@@ -85,11 +85,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1664028844,
-        "narHash": "sha256-wwGqnvROHW54ma0h4q6GL5toKxTVVKvAypv0CcJkraU=",
+        "lastModified": 1664177230,
+        "narHash": "sha256-eyo88ffm16I0K9cdcePbOsQg4MDjf1EgIdkGTLB/7iA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "72bdd03f0d5696412b25a93218acaad530570d30",
+        "rev": "ff9793cfd1a25145a7e591af604675b3d6f68987",
        "type": "github"
      },
      "original": {
@@ -114,11 +114,11 @@
        "nixpkgs-22_05": "nixpkgs-22_05"
      },
      "locked": {
-        "lastModified": 1664080128,
-        "narHash": "sha256-obau1+3+QiTtNGfoTcbSYB5Z4Gvf4o0Or85yLttSYt8=",
+        "lastModified": 1664204020,
+        "narHash": "sha256-LAey3hr8b9EAt3n304Wt9Vm4uQFd8pSRtLX8leuYFDs=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "17f009daf09992d2342657f9bd7b44d877cd00e1",
+        "rev": "912f9ff41fd9353dec1f783170793699789fe9aa",
        "type": "github"
      },
      "original": {
--- a/machines/moby/default.nix
+++ b/machines/moby/default.nix
@@ -8,6 +8,14 @@
    ./fs.nix
    ./kernel.nix
  ];
+
+  # cross-compiled documentation is *slow*.
+  # no obvious way to natively compile docs (2022/09/29).
+  # entrypoint is nixos/modules/misc/documentation.nix
+  # doc building happens in nixos/doc/manual/default.nix
+  # TODO: we could *maybe* inject pkgs.buildPackages.xyz = cross.buildPackages.xyz?
+  documentation.nixos.enable = false;
+
  # XXX colin: phosh doesn't work well with passwordless login
  users.users.colin.initialPassword = "147147";
  services.getty.autologinUser = "root";  # allows for emergency maintenance?
@@ -53,6 +61,9 @@
  # mobile.boot.stage-1.enable = false;
  # boot.initrd.systemd.enable = false;
  # boot.initrd.services.swraid.enable = false;  # attempt to fix dm_mod stuff
+  # disable proximity sensor.
+  # the filtering/calibration is bad that it causes the screen to go fully dark at times.
+  boot.blacklistedKernelModules = [ "stk3310" ];

  # mobile-nixos' /lib/firmware includes:
  #   rtl_bt          (bluetooth)
@@ -82,4 +93,6 @@
  systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";

  users.groups.feedbackd.gid = config.sane.allocations.feedbackd-gid;
+
+  hardware.opengl.driSupport = true;
 }
--- a/modules/gui/phosh.nix
+++ b/modules/gui/phosh.nix
@@ -60,6 +60,8 @@ in
    };

    sane.home-manager.extraPackages = with pkgs; [
+      phosh-mobile-settings
+
      # TODO: see about removing this if the in-built gnome-settings bluetooth manager can work
      gnome.gnome-bluetooth
    ];
--- a/modules/impermanence.nix
+++ b/modules/impermanence.nix
@@ -14,6 +14,10 @@ in
      default = false;
      type = types.bool;
    };
+    sane.impermanence.home-files = mkOption {
+      default = [];
+      type = types.listOf types.str;
+    };
    sane.impermanence.home-dirs = mkOption {
      default = [];
      type = types.listOf (types.either types.str (types.attrsOf types.str));
@@ -35,6 +39,15 @@ in
    map-home-dirs = map-dirs { user = "colin"; group = "users"; mode = "0755"; directory = "/home/colin/"; };
    map-sys-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
    map-service-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
+
+    map-home-files = files: builtins.map (f: {
+      parentDirectory = {
+        user = "colin";
+        group = "users";
+        mode = "0755";
+      };
+      file = "/home/colin/${f}";
+    }) files;
  in mkIf cfg.enable {
    sane.image.extraDirectories = [ "/nix/persist/var/log" ];
    environment.persistence."/nix/persist" = {
@@ -94,12 +107,19 @@ in
        # "/etc/group"
        # "/etc/passwd"
        # "/etc/shadow"
-      ];
+      ] ++ map-home-files cfg.home-files;
    };

    systemd.services.sane-sops = {
+      # TODO: it would be better if we could inject the right dependency into setupSecrets instead of patching like this.
+      # /run/current-system/activate contains the precise ordering logic.
+      # it's largely unaware of systemd.
+      # maybe we could insert some activation script which simply waits for /etc/ssh to appear?
      description = "sops relies on /etc/ssh being available, so re-run its activation AFTER fs-local";
-      script = config.system.activationScripts.setupSecrets.text;
+      script = ''
+      ${config.system.activationScripts.setupSecrets.text}
+      ${config.system.activationScripts.linkIwdKeys.text}
+      '';
      after = [ "fs-local.target" ];
      wantedBy = [ "multi-user.target" ];
    };
--- a/modules/universal/allocations.nix
+++ b/modules/universal/allocations.nix
@@ -33,6 +33,8 @@ in
    sane.allocations.systemd-coredump-gid = mkId 2003;  # 996
    sane.allocations.nscd-uid = mkId 2004;
    sane.allocations.nscd-gid = mkId 2004;
+    sane.allocations.systemd-oom-uid = mkId 2005;
+    sane.allocations.systemd-oom-gid = mkId 2005;

    # found on graphical machines
    sane.allocations.nm-iodine-uid = mkId 2101;  # desko/moby/lappy
--- a/modules/universal/env/default.nix
+++ b/modules/universal/env/default.nix
@@ -17,6 +17,7 @@
    #   https://nixos.wiki/wiki/Slack#Wayland
    # Discord under sway crashes with this.
    # NIXOS_OZONE_WL = "1";
+    # LIBGL_ALWAYS_SOFTWARE = "1";
  };
 }

--- a/modules/universal/env/feeds.nix
+++ b/modules/universal/env/feeds.nix
@@ -18,6 +18,12 @@ with lib;
        "https://anchor.fm/s/34c7232c/podcast/rss"
        "https://feeds.feedburner.com/80000HoursPodcast"
        "https://allinchamathjason.libsyn.com/rss"
+        "https://acquired.libsyn.com/rss"
+        "https://rss.acast.com/deconstructed"
+        ## The Daily
+        "https://feeds.simplecast.com/54nAGcIl"
+        "https://rss.acast.com/intercepted-with-jeremy-scahill"
+        "https://podcast.posttv.com/itunes/post-reports.xml"
        ## Eric Weinstein
        "https://rss.art19.com/the-portal"
        "https://feeds.megaphone.fm/darknetdiaries"
--- a/modules/universal/env/home-manager.nix
+++ b/modules/universal/env/home-manager.nix
@@ -14,6 +14,9 @@ let
  pkglist = pkgspec: builtins.map (e: e.pkg or e) pkgspec;
  # extract `dir` from `extraPackages`
  dirlist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "dir" then [ e.dir ] else []) pkgspec);
+  # extract `persist-files` from `extraPackages`
+  persistfileslist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "persist-files" then e.persist-files else []) pkgspec);
+  # TODO: dirlist and persistfileslist should be folded
 in
 {
  options = {
@@ -67,6 +70,7 @@ in
      "Videos"
      vim-swap-dir
    ] ++ (dirlist cfg.extraPackages);
+    sane.impermanence.home-files = persistfileslist cfg.extraPackages;

    home-manager.useGlobalPkgs = true;
    home-manager.useUserPackages = true;
@@ -96,14 +100,32 @@ in
        templates = "$HOME/.xdg/Templates";
        videos = "$HOME/Videos";
      };
+
+      # the xdg mime type for a file can be found with:
+      # - `xdg-mime query filetype path/to/thing.ext`
      xdg.mimeApps.enable = true;
      xdg.mimeApps.defaultApplications = {
+        # HTML
        "text/html" = [ "librewolf.desktop" ];
        "x-scheme-handler/http" = [ "librewolf.desktop" ];
        "x-scheme-handler/https" = [ "librewolf.desktop" ];
        "x-scheme-handler/about" = [ "librewolf.desktop" ];
        "x-scheme-handler/unknown" = [ "librewolf.desktop" ];
+        # RICH-TEXT DOCUMENTS
+        "application/pdf" = [ "org.gnome.Evince.desktop" ];
+        "text/markdown" = [ "obsidian.desktop" ];
+        # IMAGES
+        "image/heif" = [ "org.gnome.gThumb.desktop" ];  # apple codec
        "image/png" = [ "org.gnome.gThumb.desktop" ];
+        "image/jpeg" = [ "org.gnome.gThumb.desktop" ];
+        # VIDEO
+        "video/mp4" = [ "vlc.desktop" ];
+        "video/quicktime" = [ "vlc.desktop" ];
+        "video/x-matroska" = [ "vlc.desktop" ];
+        # AUDIO
+        "audio/flag" = [ "vlc.desktop" ];
+        "audio/mpeg" = [ "vlc.desktop" ];
+        "audio/x-vorbis+ogg" = [ "vlc.desktop" ];
      };

      # convenience
@@ -252,6 +274,9 @@ in

          # ART
          "https://miniature-calendar.com/feed" = { tags = [ "daily" "visual" ]; };
+
+          # CODE
+          "https://github.com/Kaiteki-Fedi/Kaiteki/commits/master.atom" = { tags = [ "infrequent" "tech" ]; };
        };
        dark_reader = false;
        new_first = true;
--- a/modules/universal/env/home-packages.nix
+++ b/modules/universal/env/home-packages.nix
@@ -53,7 +53,9 @@ let

    emote  # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience.
    evince  # works on phosh
+
    { pkg = fluffychat-moby; dir = ".local/share/chat.fluffy.fluffychat"; }  # TODO: ship normal fluffychat on non-moby?
+
    foliate
    font-manager
    gimp  # broken on phosh
@@ -67,7 +69,10 @@ let
    gnome-podcasts
    gnome.gnome-system-monitor
    gnome.gnome-terminal  # works on phosh
-    gpodder-configured
+    gnome.gnome-weather
+
+    { pkg = gpodder-configured; dir = "gPodder/Downloads"; }
+
    gthumb
    inkscape
    krita
@@ -88,7 +93,10 @@ let
    #   possible to pass config as a CLI arg (sublime-music -c config.json)
    { pkg = sublime-music; dir = ".local/share/sublime-music"; }
    tdesktop  # broken on phosh
-    vlc  # works on phosh
+
+    # vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf
+    { pkg = vlc; persist-files = [ ".config/vlc/vlc-qt-interface.conf" ]; }
+
    whalebird # pleroma client. input is broken on phosh
    xdg-utils  # for xdg-open
    xterm  # broken on phosh
--- a/modules/universal/fs.nix
+++ b/modules/universal/fs.nix
@@ -28,31 +28,37 @@ in
    device = "colin@uninsane.org:/var/lib/uninsane/media";
    inherit (sshOpts) fsType;
    options = sshOpts.optionsColin;
+    noCheck = true;
  };
  fileSystems."/mnt/servo-media-lan" = {
    device = "colin@servo:/var/lib/uninsane/media";
    inherit (sshOpts) fsType;
    options = sshOpts.optionsColin;
+    noCheck = true;
  };
  fileSystems."/mnt/servo-root-wan" = {
    device = "colin@uninsane.org:/";
    inherit (sshOpts) fsType;
    options = sshOpts.optionsRoot;
+    noCheck = true;
  };
  fileSystems."/mnt/servo-root-lan" = {
    device = "colin@servo:/";
    inherit (sshOpts) fsType;
    options = sshOpts.optionsRoot;
+    noCheck = true;
  };
  fileSystems."/mnt/desko-home" = {
    device = "colin@desko:/home/colin";
    inherit (sshOpts) fsType;
    options = sshOpts.optionsColin;
+    noCheck = true;
  };
  fileSystems."/mnt/desko-root" = {
    device = "colin@desko:/";
    inherit (sshOpts) fsType;
    options = sshOpts.optionsRoot;
+    noCheck = true;
  };

  environment.systemPackages = [
--- a/modules/universal/net.nix
+++ b/modules/universal/net.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, lib, pkgs, ... }:

 {
  # if using router's DNS, these mappings will already exist.
@@ -11,37 +11,54 @@
    "192.168.0.48" = [ "moby" ];
  };

-  sops.secrets."nm-community-university" = {
-    sopsFile = ../../secrets/universal/net/community-university.nmconnection.bin;
-    format = "binary";
-  };
-  sops.secrets."nm-friend-libertarian-dod" = {
-    sopsFile = ../../secrets/universal/net/friend-libertarian-dod.nmconnection.bin;
-    format = "binary";
-  };
-  sops.secrets."nm-friend-rationalist-empathist" = {
-    sopsFile = ../../secrets/universal/net/friend-rationalist-empathist.nmconnection.bin;
-    format = "binary";
-  };
-  sops.secrets."nm-home-bedroom" = {
-    sopsFile = ../../secrets/universal/net/home-bedroom.nmconnection.bin;
-    format = "binary";
-  };
-  sops.secrets."nm-home-shared-24G" = {
-    sopsFile = ../../secrets/universal/net/home-shared-24G.nmconnection.bin;
-    format = "binary";
-  };
-  sops.secrets."nm-home-shared" = {
-    sopsFile = ../../secrets/universal/net/home-shared.nmconnection.bin;
-    format = "binary";
-  };
+  # the default backend is "wpa_supplicant".
+  # wpa_supplicant reliably picks weak APs to connect to.
+  # see: <https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/474>
+  # iwd is an alternative that shouldn't have this problem
+  # docs:
+  # - <https://nixos.wiki/wiki/Iwd>
+  # - <https://iwd.wiki.kernel.org/networkmanager>
+  # use `iwctl` to control
+  networking.wireless.iwd.enable = true;
+  networking.networkmanager.wifi.backend = "iwd";

-  environment.etc = {
-    "NetworkManager/system-connections/nm-community-university".source = config.sops.secrets.nm-community-university.path;
-    "NetworkManager/system-connections/nm-friend-libertarian-dod".source = config.sops.secrets.nm-friend-libertarian-dod.path;
-    "NetworkManager/system-connections/nm-friend-rationalist-empathist".source = config.sops.secrets.nm-friend-rationalist-empathist.path;
-    "NetworkManager/system-connections/nm-home-bedroom".source = config.sops.secrets.nm-home-bedroom.path;
-    "NetworkManager/system-connections/nm-home-shared-24G".source = config.sops.secrets.nm-home-shared-24G.path;
-    "NetworkManager/system-connections/nm-home-shared".source = config.sops.secrets.nm-home-shared.path;
+  system.activationScripts.linkIwdKeys = let
+    unwrapped = ../../scripts/install-iwd;
+    install-iwd = pkgs.writeShellApplication {
+      name = "install-iwd";
+      runtimeInputs = with pkgs; [ coreutils gnused ];
+      text = ''${unwrapped} "$@"'';
+    };
+  in (lib.stringAfter
+    [ "setupSecrets" ]
+    ''
+    mkdir -p /var/lib/iwd
+    ${install-iwd}/bin/install-iwd /run/secrets/iwd /var/lib/iwd
+    ''
+  );
+
+  sops.secrets."iwd/community-university.psk" = {
+    sopsFile = ../../secrets/universal/net/community-university.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/friend-libertarian-dod.psk" = {
+    sopsFile = ../../secrets/universal/net/friend-libertarian-dod.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/friend-rationalist-empathist.psk" = {
+    sopsFile = ../../secrets/universal/net/friend-rationalist-empathist.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-bedroom.psk" = {
+    sopsFile = ../../secrets/universal/net/home-bedroom.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-shared-24G.psk" = {
+    sopsFile = ../../secrets/universal/net/home-shared-24G.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-shared.psk" = {
+    sopsFile = ../../secrets/universal/net/home-shared.psk.bin;
+    format = "binary";
  };
 }
--- a/modules/universal/users.nix
+++ b/modules/universal/users.nix
@@ -100,6 +100,8 @@ in
    users.groups.systemd-coredump.gid = config.sane.allocations.systemd-coredump-gid;
    users.users.nscd.uid = config.sane.allocations.nscd-uid;
    users.groups.nscd.gid = config.sane.allocations.nscd-gid;
+    users.users.systemd-oom.uid = config.sane.allocations.systemd-oom-uid;
+    users.groups.systemd-oom.gid = config.sane.allocations.systemd-oom-gid;

    # guarantee determinism in uid/gid generation for users:
    assertions = let
--- a/nixpatches/10-flutter-arm64.patch
+++ b/nixpatches/10-flutter-arm64.patch
@@ -10,8 +10,8 @@ index 565c44f72e9..f20a3d4e9be 100644
 }:
 
 +let vendorHashes = {
-+  x86_64-linux = "sha256-PSZK5frmQGeiTuEJNZ6Fh8NXSLIrLnoOzQk1Xa4jqHw=";
-+  aarch64-linux = "sha256-tU83EeFwakTNkEaLo90ZJV55CnmN+NcicHgBJ0u/RKM=";
+  x86_64-linux = "sha256-p5EJP2zSvWyRV1uyTHw0EpFsEwAGtX5B9WVjpLmnVew=";
+  aarch64-linux = "sha256-DVMVPCab+7tSNRKwioQXi0WZnlpvm5tIhO/l1vFX3J8=";
 +};
 +in
 flutter.mkFlutterApp rec {
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -4,6 +4,8 @@ fetchpatch: [
  #   (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 )
  ./02-rpi4-uboot.patch

+  # Fix mk flutter app
+  # closed. updates fluffychat 1.2.0 -> 1.6.1, but unstable hashing
  (fetchpatch {
    url = "https://github.com/NixOS/nixpkgs/pull/186839.diff";
    sha256 = "sha256-NdIfie+eTy4V1vgqiiRPtWdnxZ5ZHsvCMfkEDUv9SC8=";
@@ -21,9 +23,55 @@ fetchpatch: [
  # TODO: upstream
  ./07-duplicity-rich-url.patch

-  # navidrome: adhoc hack to fix the build
+  # kaiteki: init at 2022-09-03
  (fetchpatch {
-    url = "https://github.com/NixOS/nixpkgs/pull/191467.diff";
-    sha256 = "sha256-Np0J06RER/0GGUhL/PDuVjpYYIPzB9A3EPWwTWpS/D4=";
+    # url = "https://git.uninsane.org/colin/nixpkgs/commit/ca8e17b15e99683e9372b4deb5dd446f1019937d.diff";
+    url = "https://github.com/NixOS/nixpkgs/pull/193169.diff";
+    sha256 = "sha256-1O9vC/r3jpvGhHGp7d2r3oL7C8kFX2Ph214JV0vWZA0=";
+  })
+
+  # zecwallet: 1.7.13 -> 1.8.8
+  (fetchpatch {
+    url = "https://github.com/NixOS/nixpkgs/pull/193276.diff";
+    sha256 = "sha256-rSWllDAxL8E42vYPR3vgGZklU5cKp9dqYowMJkPoYlY=";
+  })
+
+  # whalebird: 4.6.0 -> 4.6.5
+  (fetchpatch {
+    # url = "https://git.uninsane.org/colin/nixpkgs/commit/5f410db5e0bc24521ad413c33285a3175517941c.diff";
+    url = "https://github.com/NixOS/nixpkgs/pull/193281.diff";
+    sha256 = "sha256-SY+pJPNEB6gJDkEbFgWVjMf7Grrt05INoBtQVp2af1w=";
+  })
+
+  # (merged into master 2022/09/28): element-{web,desktop}: 1.11.5 -> 1.11.7
+  (fetchpatch {
+    url = "https://github.com/NixOS/nixpkgs/pull/193342.diff";
+    sha256 = "sha256-A9TUmabRl4BC6dGmo0e1c4YdAyUG4o097GYdMChepfw=";
+  })
+
+  # (merged into master 2022/09/28): element-{desktop,web}: 1.11.7 -> 1.11.8
+  (fetchpatch {
+    url = "https://github.com/NixOS/nixpkgs/pull/193362.diff";
+    sha256 = "sha256-ZkkbNdCKh905fDe9QHrP/alRkDfenoPc6XrLg3Hf2dI=";
+  })
+
+  # phosh: 0.21.0 -> 0.21.1
+  (fetchpatch {
+    # url = "https://git.uninsane.org/colin/nixpkgs/commit/0b81457690fce39b14c5d3463af0d6331b73b850.diff";
+    url = "https://github.com/NixOS/nixpkgs/pull/193700.diff";
+    sha256 = "sha256-GtpYSii1c/Kw1NEQ4sVR1nO/kvSa/CSIxuXxL00oBGw=";
+  })
+
+  # element-desktop: upgrade electron 19 -> 20
+  (fetchpatch {
+    # url = "https://git.uninsane.org/colin/nixpkgs/commit/7e6a47b3904f5d8f2a37c35ff2d12772524727a9.diff";
+    url = "https://github.com/NixOS/nixpkgs/pull/193799.diff";
+    sha256 = "sha256-OcqDIoBcphGZfeeOzaS7Ip1khocpkYrpG6tMGExa3S4=";
+  })
+
+  # phosh-mobile-settings: init at 0.21.1
+  (fetchpatch {
+    url = "https://git.uninsane.org/colin/nixpkgs/commit/0b197a1fc628e917572f6b0a1a0ce17790bc9a05.diff";
+    sha256 = "sha256-CXRXDQTfJeHIQpdUFr3T050c4Lj4ZLNmBDVfk/oaDcs=";
  })
 ]
--- a/pkgs/kaiteki/default.nix
+++ b/pkgs/kaiteki/default.nix
@@ -2,39 +2,67 @@
 , fetchFromGitHub
 , flutter
 , makeDesktopItem
+, imagemagick
+, xdg-user-dirs
 }:

 flutter.mkFlutterApp rec {
  pname = "kaiteki";
-  version = "unstable-2022-06-03";
+  version = "unstable-2022-09-03";

  # this hash seems unstable -- depends on other nixpkgs, perhaps?
-  vendorHash = "sha256-IC3FAPFASuMcNOpUuaB+MDcm9nqGCtq/6A2dCxIXHEg=";
+  vendorHash = "sha256-+kVwa5FObRYOdkPrF7jd0qOB+wwBm+OvdJP8NdSXTJ8=";

  src = fetchFromGitHub {
    owner = "Kaiteki-Fedi";
    repo = "Kaiteki";
-    rev = "0a322313071e4391949d23d9b006d74de65f58d9";
-    hash = "sha256-ggDIbVwueS162m15TFaC6Tcg+0lpcVGi4x/O691sxR8";
+    # rev = "cf94ec55063cd7af20a37103fc40c588a634962f";
+    # hash = "sha256-jtRT0Q4/i3dxRYcC6HPClL9Iw1PizkIUgswU1eusKig=";
+    # this is the last hash before the code uses features not apparently supported by our version of dart.
+    rev = "fd1e26c98f37ad6a98ed549da879c91721f997d0";
+    hash = "sha256-N7n6o/B9s0DCYf9HFMZSCPShpE65wKl9FaQ5dbFnr1E=";
+    fetchSubmodules = true;
  };

-  desktopItems = [ (makeDesktopItem {
+  nativeBuildInputs = [ imagemagick ];
+
+  desktopItem = makeDesktopItem {
    name = "Kaiteki";
-    exec = "kaiteki";
+    exec = "@out@/bin/kaiteki";
    icon = "kaiteki";
    desktopName = "Kaiteki";
    genericName = "Micro-blogging client";
    comment = meta.description;
    categories = [ "Network" "InstantMessaging" "GTK" ];
-  }) ];
+  };

  sourceRoot = "source/src/kaiteki";

+  postInstall = ''
+    wrapProgram $out/bin/kaiteki \
+      --prefix PATH : "${xdg-user-dirs}/bin"
+
+    FAV=$out/app/data/flutter_assets/assets/icon.png
+    ICO=$out/share/icons
+
+    install -D $FAV $ICO/kaiteki.png
+    for s in 24 32 42 64 128 256 512; do
+      D=$ICO/hicolor/''${s}x''${s}/apps
+      mkdir -p $D
+      convert $FAV -resize ''${s}x''${s} $D/kaiteki.png
+    done
+
+    mkdir $out/share/applications
+    cp $desktopItem/share/applications/*.desktop $out/share/applications
+    substituteInPlace $out/share/applications/*.desktop \
+      --subst-var out
+  '';
+
  meta = with lib; {
    description = "The comfy Fediverse client";
    homepage = "https://craftplacer.moe/projects/kaiteki/";
    license = licenses.agpl3Plus;
-    # maintainers = with maintainers; [ colinsane ];
+    maintainers = with maintainers; [ colinsane ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -36,7 +36,8 @@
  ubootRaspberryPi4_64bit = prev.callPackage ./ubootRaspberryPi4_64bit { pkgs = prev; };

  #### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
-  kaiteki = prev.callPackage ./kaiteki { };
+  # kaiteki = prev.callPackage ./kaiteki { };
+  kaiteki = prev.kaiteki;
  nabla = prev.callPackage ./nabla { };
 })

--- a/pkgs/sane-scripts/default.nix
+++ b/pkgs/sane-scripts/default.nix
@@ -24,7 +24,7 @@ resholve.mkDerivation {
        findutils
        gnugrep
        ifuse
-        inotifyTools
+        inotify-tools
        ncurses
        oath-toolkit
        openssh
@@ -33,6 +33,7 @@ resholve.mkDerivation {
        ssh-to-age
        sops
        sudo
+        util-linux
        which
      ];
      keep = {
--- a/pkgs/sane-scripts/src/sane-reclaim-disk-space
+++ b/pkgs/sane-scripts/src/sane-reclaim-disk-space
@@ -1,17 +1,41 @@
 #!/usr/bin/env bash
-set -ex
 # script to reclaim some hard drive space
+set -e
+
+options=$(getopt -l "fast" -o "f" -- "$@")
+do_rmlint=true
+for arg in $options; do
+  case $arg in
+    -f|--fast)
+      do_rmlint=false
+      ;;
+    --)
+      ;;
+  esac
+done
+
+set -x
+
+# always claim nix garbage
 sudo nix-collect-garbage
-# identify duplicate files in the nix store
-rmlint --types="duplicates" --config=sh:handler=clone --output=sh:/tmp/rmlint.sh --output=json:/dev/null --progress /nix/store
-# link the dupes together (uses ioctl_fideduperange)
-#   see: https://btrfs.wiki.kernel.org/index.php/Deduplication
-#   see: https://rmlint.readthedocs.io/en/latest/tutorial.html
-sudo mount -o remount,rw /nix/store
-# XXX: does rmlint really need to be invoked as root?
-sudo /tmp/rmlint.sh -d || true  # on failure, we still want to remount ro
-# XXX this doesn't work: 'mount point is busy.'
-sudo mount -o remount,ro /nix/store
+
+if [ $do_rmlint = true ]
+then
+  # identify duplicate files in the nix store
+  rmlint --types="duplicates" --config=sh:handler=clone --output=sh:/tmp/rmlint.sh --output=json:/dev/null --progress /nix/store
+  # link the dupes together (uses ioctl_fideduperange)
+  #   see: https://btrfs.wiki.kernel.org/index.php/Deduplication
+  #   see: https://rmlint.readthedocs.io/en/latest/tutorial.html
+fi
+
+if [ $do_rmlint = true ]
+then
+  sudo mount -o remount,rw /nix/store
+  # XXX: does rmlint really need to be invoked as root?
+  sudo /tmp/rmlint.sh -d || true  # on failure, we still want to remount ro
+  # XXX this doesn't work: 'mount point is busy.'
+  sudo mount -o remount,ro /nix/store
+fi

 # TODO: instead of using rmlint, could use dduper: https://github.com/Lakshmipathi/dduper
 #   better perf for btrfs (checksum tests)
--- a/pkgs/zecwallet-lite/default.nix
+++ b/pkgs/zecwallet-lite/default.nix
@@ -1,30 +0,0 @@
-{ lib, fetchurl, appimageTools }:
-
-appimageTools.wrapType2 rec {
-  pname = "zecwallet-lite";
-  version = "1.7.13";
-
-  src = fetchurl {
-    url = "https://github.com/adityapk00/zecwallet-lite/releases/download/v${version}/Zecwallet.Lite-${version}.AppImage";
-    hash = "sha256-uBiLGHBgm0vurfvOJjJ+RqVoGnVccEHTFO2T7LDqUzU=";
-  };
-
-  extraInstallCommands =
-    let contents = appimageTools.extract { inherit pname version src; };
-    in ''
-      mv $out/bin/${pname}-${version} $out/bin/${pname}
-
-      install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace 'Exec=AppRun' 'Exec=${pname}'
-      cp -r ${contents}/usr/share/icons $out/share
-    '';
-
-  meta = with lib; {
-    description = "A fully featured shielded wallet for Zcash";
-    homepage = "https://www.zecwallet.co/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ colinsane ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
--- a/scripts/install-iwd
+++ b/scripts/install-iwd
@@ -0,0 +1,18 @@
+#!/bin/sh
+# usage: install-iwd.sh <source_dir> <dest_dir>
+# source_dir contains plain-text .psk files of any filename.
+# for each file, this extracts the SSID and creates a symlink in dest_dir which
+# points to the original file, using the SSID name as filename.
+#
+# this is because iwd extracts the SSID from the filename, but users might
+# prefer the SSID be kept separate from the filename.
+
+src_dir="$1"
+dest_dir="$2"
+for f in $(ls "$src_dir")
+do
+        ssid=$(sed -rn 's/# SSID=(.*)/\1/p' "$src_dir/$f")
+        # not sure that iwd can deal with un-writeable symlinks
+        # ln -sf "$src_dir/$f" "$dest_dir/$ssid.psk"
+        cp "$src_dir/$f" "$dest_dir/$ssid.psk"
+done
--- a/secrets/universal/net/community-university.nmconnection.bin
+++ b/secrets/universal/net/community-university.nmconnection.bin
@@ -1,48 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:Ei6XDLQznlR+FZjdpc/4Ff1yk386tvUw+v8eYyEVhlYWMbf3Im4uqdD2aylcthkLr/ypzTUBW/o6XVV/e2VtWLA/QBTM1uQKbuGKrlCxkW0uFt/L+ZzAGm6mc0EHBbRmiOLLbbZzQF3kxRlHsAUFwmuixjzjftv4ejo5jTKyK7r1DBt7Y4M8jb9paiBHGDxWmuc8wIkiTcLAlvKX7qySfl7zRO8EURI2h5YzQdcXqGLaZEpy22ktH5j8prAi2RYLGbCikKYqk3UmM/3c6Q4zI+BpF0eTpieUuUkzgv68lg/ek4PEeLa6cpPJrD/zuVlFKjVTzoo6779TFg==,iv:/8FfgfH173YrEDk9zGPUCfPjGvjEww1Q21/E1bL+YeI=,tag:0wGtRM5gGREWTefq2SGv8A==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxU0VtNFBIVlNxMCtLVXBJ\nZ0lTaXY5NnJvOElGV0dHWkUyK2V1blBOR0ZFCnJxWkhkVmRnR1FYVnMybUVHb3E1\nZHhGazFTaXFRRmh5Y3dDczJnWEZ6SEkKLS0tIGY0R2FiZlV2OHpSclA3RUdPa2tM\na1pPbUh2cGFibmFidUtQdFpMSGVrcEUKG81db/ZBzHNGV49Rgwc5hfeWc6uNbbLi\nZpPjZS6y14ZVMFoyE7XPD1+D7OL3BEP+rOwICrFXLAGKpyLEvBngBA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2MzlvUTdzK096ZkswUEJv\nRlF1c3ltKzBDQmVCcUgySVRhK0xMZFlhVGxvCnFIalFJb0lxMGlIdE51WXAvMVB6\nTkNjT0hKeTB5TDl3d1hnMXNoN1p2djAKLS0tIGNmcTUzZnIrVXl6aUhVYkpPUVRi\neFV1UWtwdHZvTlNEeDg0NG10bXV3dmsK4y9+g2cxRQvePeKhKjWvtO4/KZ7dG2Kn\nXGFLEUJAI9BG4PiJoIPjvXvugHndfahqmFtdbXA8mdso99QxbW4Few==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiTFQrMkdGc3ZBTFgwNVRO\nM1FOTHZ1VnVsWXlXMFBKR2NQajhmRnM0RXpzCmZ2QStTUllSelRIN3g3VnJQRG1Y\nalRKa1BaYzRPUXlwa2p5ZkxxVVBLNkEKLS0tIGd6TFNRZkVTRHA2NHNybWt3eDY3\nd2tkeXFMeVl5NDkxK3hOQkRJTXNiUlUKMrXMYYy+pGVmVW/ebmcKsAf2Xxjh0mJ4\nrWSUDmAb9sm2N9yCkkl5oQ9GRHHr3/HmS6Xek5Y8aJNdvuFJzkz8Og==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVeW5neXUxdDVjaGFKL0VX\nUDFCOFhta3Zpek1qVG9yQkYwdmlhU2N2T0VnCnJuai9qOFhIdGxzUlJjSkNaNFdI\nY0dOa1FaRTRGNU84YlNIWmg0dS9XNzAKLS0tIHdiYjlhWmNWUkhNY09nK2pPSEFV\nN1V4ZlZNU3JlQWdEVWZXTXh6UmNkWjQKD87Fm/TZGY33wqBedwHgkIhziUrKpSdw\nc8mRAUqjNdp4avomtoSAyhThPdilpKO0ES0NJiu9q8mqqK/aRwungg==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDTjRjSXdVUDk2eTI5cm1X\ncDlhWUJVcWdEWk1jMVdUVEd1bytYY2tCSlNRClBsTVEwQmZ6cDZlbWpSd0NZMkt5\nMzhEVU93WVdkbGZDWEdoN1FvejJwZzQKLS0tIHVJKytaUStRaDV3Q01ZL29Eellv\ndGVMU25GWFdiT0FPVW9oYXdZbGJqNXMK0vdn85DKuobJo0baVLy+0hFvTonPJzoS\nD29tcM29rea+haH/EDRLXTKEXeOgQm99SBDaumgaUAraIiwlpDB9SQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlYUp2Zjdkbi9HTUh4RUZN\nemx0VUV0QUNFTitlNVV5YUFQUDErcTI5UFNnCmYySjFRcU5jMTJQOGNwdWtWU3lC\nWmxnVmxmWEhpbjZsZlRkdnNUQ0hTaEEKLS0tIGNCY05PSUhtTEZQejhDL01wbHY0\nSkNnNFVRTGpDbEJnMGUvdDlBQmV0L3cKBswixkjiGmJZP2sZ3kT+eJus4fxzORy3\nbM+6dRYu6O+1886gWVGjqcPNBnA9YPii0ClX8vhPWS/dPN0/k421tA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNRU00OG82bTZvbVBBNFdG\neTNOK3h6QWZEWWtlOUJEU2w0T28wcGVlakJZClZxR2VzajFpTmJLVWFQa1VUckdU\nOVhaeGcrYlZjY0c1RC9NWWY3cVhuVk0KLS0tIEY2SW5EY0I1N3RnM1h3VGxYMTNh\naUFXaWJoc3drMnFQNS9NTzYyK3VMbTgKGjnfsWmn8YfE9VqA4zMiALxfV1XW5FEr\nHsG3mTRnShcxiOO8XvH1cUO2tDZ3ekTz++DbA4xRvrd9aD87t56gww==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpL1ZpUGNJSkNBRUdkSEIz\nSXM1cnRwa1ovVG5NVE5URDlNeGkrSy9WOTBBCjIrTzhHZ29veGtMV1ZRUU9Xd2xF\nU2o2ckdSL3JjeEJuc0JEMjlGVXRuZ2MKLS0tIDFjVjVyMnFVVytNQVh2ZGJJUjhv\nMU1IZzNjaXJDa1lPWnUxTEtlRUYwODgKKWr698/3WsEmCrHSHFEG8LCsuQ/KyWmm\nDOMwUW6YBdF29X8tzA8845MTaOaWrPiK5f/i7RZRhZTekv1CiOZAWw==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2022-09-26T01:01:07Z",
-		"mac": "ENC[AES256_GCM,data:RUWSeeRnF7sI5Rn748V5h1NYPrk488gMwf7lTJRjzJTGQJBuu+hxAeJsoeG7gWPxGYJp9C362dFyHzUYWyFmJqk+JK0p2wh6mFIDerfZS8lTxAEP9qtDcA1ZMFRJVm9X3IYq8CyOb/DHdQ1+ih7Oxbo5XDOyXMuDGvCCWD71N9o=,iv:Myy4VHpuWgS8mOJVFNkcbN3QyRIDl/h5V/YeOtPQ0kU=,tag:HaRPPUG4o2HRN0v70He0pw==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
-	}
-}
--- a/secrets/universal/net/community-university.psk.bin
+++ b/secrets/universal/net/community-university.psk.bin
@@ -0,0 +1,48 @@
+{
+	"data": "ENC[AES256_GCM,data:JJk6bnHkxhfMNecslbm/iA2hdnC/C1DdeiesZrkUpJru8DMBs9ExhcHcYSRfxwzcZ1FDPLv3a9Mnickgb9uIz9UWbNZBfPUg2xEIHIs=,iv:dWqSRR+tCSXch0OebLQPzaBtNJieMHLFUeR7yXe4NTA=,tag:C/kAerUFRhugyf91puhKYg==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGQnVZQ3NvWUhMSy8wQzJM\nWkZnc09UaldLc3M4RjlKZjN4ZWY3NC8ybWk0CnRwTUtmZ0NMU2tCMmM5SzRnUHht\nSUg5MWpGV010b3N3WWU5UkljV0VBWU0KLS0tIHRjUER0RkhwbmVKOXBYR0RnbCtC\nd0hUd0VuZm1wQjNhclpTL0RLZnBybE0KA1ZTaq3D3UgV4g/mhwgss4uBE0LPuPNC\niFs7ixvRBF591VWvraVWUpTqOZW5dMybMBu5EjGHYtHl7f9dbhY5aA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDdCtBd0tjWmtyVGZmbHNJ\ncTZwa2xzd3VoN3RFcjZ6TUtLcUdhMm01Tm1nCnVvaDBnNG9jOVd5SFNiTjJzZnV1\nZkltV0RtYS8zays1ZVdKcENGV2J3N1kKLS0tIDF4V2gxdEoySDR2azR6THVGY3BQ\nTFE1ZE9rZ0JFZWd2TDd0Z0pQc0VZWmsKgFEfMB2W76AVPOTkGszqDLiw8aTGJ3Ym\n1Tv+OXtdaqcgD+MY67Fa396oJiD/K2zY5CfQvH2YV+VYNeAfZsRM+g==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCbGErdE5idTNnZzVtcXJy\neUJIbDBncytYVlcwandMUU9nRXB6TE1IUVEwCjFrZEU3VVltbVlkNW1MTk1LQkZB\nTGZ1Z3hJSFBsNEtQZVZFemZBKzZGUmsKLS0tIERpY29zZWkzcnJsRU00SDhhWXYw\nSE9tK1JJSlZpTTJ0ZUtoV0RlQ2xkOE0KCBuW93P3rgeaFewybt27fmA6BE9HY08f\n+0kix/idWFkdxtzS/v+WFHnaac2lhIl+X3EQQoU6PJGVrlV4q/qqAw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiNGZZQlowTXhtZkRMNGx0\nQ0xUL1hkaWtUTkY3Ti9BMHhKS2NtTEd6MmlZCjg1WFJVZkFwOE1yQzhQbWs1bThP\nQlU4dFZWZnJOWjM5aTZZLytiMnNEdTgKLS0tIGFuRFkrakZWMmNPSmVycEdYUnVs\nTk96RWdOYmlLUmYwNGJIZ1IxVk92R2sKARCSlcel/yqCPKDXSNNDV+ej8jU3CiPI\nMktemcTe9FjEpQzRDEQQJ1izlHIqpSwlOSx0UZsUgQOFFP+fwQGUaA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBZnorZkFYTkJ3d1pXMWor\ndnpjSGJYYlhCMWJaSnJJUXRLMlIzNjZhOW53CjZQdWVPdTN3eldFN3FvWW9VNmdk\nYnp1QkpoaW56bFdnL2Z3RjJERWZlK2cKLS0tIG9vUFJzNTNZVklob2hnWnMxaDNF\nWW9tV2ZJcVEyS0QvbGZaK0d4MzBIVXMKMtIMAwa+HJwAHhbM4NhLiPYgXbIZUzD8\nGwjFTyRi6K1vOw2/c+w0BYb1ZIvaChrsl9ISfU4+e3gjvSX1MP0Cyw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQenF0YnRscjJSQUFTbHNI\nSGNTS21LNklxaW9uTGlxT2pDTE5SZmJMUkRNCnBwYXRDUHJ2TDh5QXMvWjVYRWFs\nL1FjRFJyQ0hkVkpRWjNnQlVNczZjb0UKLS0tIGk0U1RFVVRMcHBLU1VtaHdxeXRj\nblRlekhIQmRYZnczcGNqNFQ0RG9UcDAKAbFvm1CGCqbd8FBbubfJNCjEFTO4LdfX\ncUBaV9xFvFD5Gy/576KBNUO4NjIEnd14JL93TC/okakJAsxnHMG/iA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCQmh1dE1LZGI4SlUza2Zq\nVTc4K2NWeHFxNXVmUzgvNUNDanlQOTZXOVd3CkthcWZRby9ZbzFlang0RytsZEI1\nczVodG52MFV6RklhVGNBcUxjQXZJWVUKLS0tIFExRjM2N3N1MUtHRWpGN3I0bjEy\nWHlJN2phSW9FMUVhQ05iSDM0dUkxdkEKoNIaw3OW2JfoPL6viItBWRwm78x5j12v\nlV0/Ui3MBKoKwxbzti25mxwGRshw7dwStuGpkCVRbp1Gx3JQbggrLw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVWU9YcEs3Zzk3L0RNZTFJ\ndDJleXZlOHFKNk5KUlp1REllNTFaZTlSYUY0CmdaYzU2aE40cnZUYm4xajdzK3NO\ncXlnalFZVHZ5bnlSc0RpQjBEMHBEV0kKLS0tIHNYSks5QUI0WkxJc3VBVjFmbGhP\nR1RIaDk0RnN3VXBBcmY2L1JBamx0RUUKnTymF1GRV1Zz7q0XNGLz61xkMXGuhoRs\nPpE3hFbQNrap+vf8NhpElJJ7dTnrndfZNftBco+YsocOxlVXWw52Fg==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2022-09-29T11:34:03Z",
+		"mac": "ENC[AES256_GCM,data:ozFWkM2SFgTicicB1l2pMCfKVvVxoUV7k93VyR9OWtVhUqH7DYgrKWFzFCwGbR6xBSMSIZU7haeVJP8r7n3S9wwQNu7FsS/PfqVcsTfpT+g5Q83vfdVFcFnV4VsalsZ8HvTQ3OiVbNVLn3J8M94KL+5ya8mf1oNHwq8xbAYcM6U=,iv:AtHuh1VIAdUqmazPbesmmYq6gXEBE241Ejos73AFkUQ=,tag:bM9Z//NV43U5buXJ7VMSlw==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.7.3"
+	}
+}
--- a/secrets/universal/net/friend-libertarian-dod.nmconnection.bin
+++ b/secrets/universal/net/friend-libertarian-dod.nmconnection.bin
@@ -1,48 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:gHFfxCihZwMfkgoTjRL4kKduzV6IbNIlIFPqjFHOFYBSOER0Olr/nxOahL3yNCcvKtriGa5zfBkAUQYpsGuknkUta6FfOLNNmyb1b5qajlLClaDWTR7q4ZAUacrdbFOjPtv1ljawADD7BWIgYPPtqwhHq354r5LpziF6bnmPkBU4PQYftSYrBzsOu3Ko1OyRogRWB3VzmMbEKyvBk84A9enNHOSHZDLv297AN3XC7n01oyr6l5kdu8TSwqIW+5lkLcQAujl4iq0n17LSdsZthYKOmkmlxLtJXNzlpBLROejr7PstQNuEhM1fgvPswIl72qiCsu00I5QOTW7sxkIjK2XnVVeMpIJS/ciy6Hrf7n+n8yVUHOq3gEC9YLwBvSZD,iv:fPze55Cmr7Pm3YEsU+dnwloEwjRPSx4DNSF969K+ijA=,tag:FmZFMbE8Sx1ix44kYoOVSw==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5RzBlN2VsUHV5RkZJdStF\ncFpiREpWeWlWMzV5Qk9Lay93U25TS3FMQ1hjCld1aWFjRGc2bXV4NHVFTVhYVDBR\nZDRIVFFRN05aQ0dVVkdxZHY3b0Z2TEUKLS0tIDF6NTFUM1ViSHFrSHlxS2FaR2tE\ncko3L3d0QTdYc1Y4V25ZdEVReWZkOTQKR7UzugT3eRyymjY8nT62OhLjScOv1BYj\ntmWjrK3y/DJcngFw/w+/xHGRJnMK73r90pgyukXXTJsbOJQmD/+G/A==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDV2FUemlkKzJTUGpmVmJw\nNlJ5RGRGTlptY3VhQUtPdTRpRVNsU1lHaGxrCncwbnVtNlQvbE1pYkNvaHQvZisw\nZGNTMGpHcUhuRXMwRFRZY21NeEtTTEkKLS0tIGVORGpUVHpuZS9KMWFNVDZ6bktU\ndERnWm0yK0ZtN1hDUmZxOG11ZzJkc2cKgGiR1ZMbRTRvNBSwTNxemOepggOgaSn+\nnNf/2E+YY4i9dO1H5E2daqZQ9V6ohCpXC9v5NGMdPOzTkfXqOGwngQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAveGlKbUd0bENaSThaWE9C\nTXE1U29aazV1N0JsKzNiTG1KYS9Jd3I2NGdzClV3Y3FLK1JVcnlUWkJlUnErZnc5\namRMRm0xYTI0cnM5UzY0NnBteXFnM1EKLS0tIGZLdVRacHhoZkZnSUMvNndMQzdy\nUEtVL3NVb1B0ZnkvZjZYSGJvYk5zTmcK1niMCVoVFlBnkXn8zPDUNAuLBwxKpBAS\nP34gwYWst5Eo6lfPbC/R/3DIVWMgPnPmKxzwO1QQcRPS8wu2iw++EA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzUkZ6WldkS1NwMmc5ZVBI\nSWlVSmp0eFFVbVl5SDJGb1NSUTFlTU1NVDBBCm5jSi9HSTJTSFhvQVJmS2lDY1ZD\nSjdyNWlMZi82Y0FBWmEweVYyU3dBdmsKLS0tIDNNUWw2UWNPZXR2QjZGMWFpdXVK\nczF0RXNBR01QY0xwV2MzUzc0SkQ2SU0K9ZT4/l89s9kB0SrK+1STUnlMUgnGVtH1\noV6Xu4berh8t09paiqzKwjsCMUYAIhm12K67YJpiJfZiua9CK9fQcg==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvYVZMR0RCM3hmWEdmcVBy\nYVJzcjBwZUZlUTNscUlWbDJQWk5RSnIwdENFCnBYRHQ5SDVFcGRBTjhRMTgwUjBk\nQzFEYVFxMTNHc29xSTJuS3o4Q1ZFdFkKLS0tIC9UZjc0MWJKa2VKMGRvdkhFbHo4\nd094RFlyL0psU3ZqMmpqK2NVLzZuSHcKwmaO5Z+qlZGZumjg8IBlr7cQZYsSzVoD\nYW1sohyOabz04Wto6IwL2XFJIG2rJMrynY6JY4Np++w2hjgwbVXkEw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOdy9vNmtsM3hjOTRkS014\nTWtORmxmQ0NIUHRScXh1aS9sZGNTQUF1MkJjCnBBODZUWlVFUDFCUmJQZCtsdy84\nUHZ6SDVqMmRrZlRFcWwyRHYxbCtraHMKLS0tIEU3Z1hjQ0VQeGZNYmhSK1RFU2xv\nWUNiVjFhLzRrMHFvdFJYUU40bzlmclUKI+Jjl5h+GANpSEoldLlxs1tggxAqtatF\ndpvt8Boa7mSDgEMrzI43XTVmMoz6Co2NJzaryie+jlnEsmxlxZiC6A==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVk0wSXJPRi9UYWd1a3FG\nTGpTN0tOejRMVUhzRDRvZzRnTDN4eG04TjE4CnNsRXZ0UC9ucWFWZ0tPVjFXNERn\nRFRWOTF5RGNEdFhGbXI2eFBrcEZLN0kKLS0tIGVNazZ4N2FFNFYxWEtqMFJucXlS\nRnNaQWNFMVIwaDlWUnhnOElxOVg5Y3MKgLbtex6wdbgjDhT+/wFs6KrZjMsR3gpo\nhqtt4zhTJnxjdaqMyn92ESQ8t1Fs4a74zpdzABYqEdDgYd2ORQim0A==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArZlJQMXFBcEFDWDBhWTFa\nSUVId0V3RzV5VExhOEdLTTlUd2Uyd3M1d3dFClkwWWhJSWpoUmJzMW4yN1p1cDV2\nUDRTNUprdGlacWRiVUJGSXQ2R29YZ0EKLS0tIGthOU9TTTY4SjEyYVlCYzdzbm9X\nMkhSTGx4TjdrUDBRNVIxbm5meWVxRVUKdGNdKElkDW/kmyoJ/QM522A15XFqmUlA\nRkbszSXVAqWRJ9GsLYnvH+9D8Vt68dV/F2tN+IqRSn2ri7+fmf2ayQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2022-09-26T01:01:37Z",
-		"mac": "ENC[AES256_GCM,data:Y0OiO9/jbF1q2IAUxXZ+Ku6i+quG3pQwVc6h0P0xM8M8m3E3aDqrxloJgcuC0GxXhDresLERWSzlNLQOUsNjDmztSezTGqlYUjuezO3YXtpmAkdVMqQOIoC4lg9SnociVSn71WpxNOYNaPpwwuYuuieuvAq6k+Ny847dlkARPts=,iv:f3R7QxsjfgI94g1PwZ+R4+wC4P9wb23kp8U79e0Z2+E=,tag:pB+glpdh3/kcxw7cJbUPeA==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
-	}
-}
--- a/secrets/universal/net/friend-libertarian-dod.psk.bin
+++ b/secrets/universal/net/friend-libertarian-dod.psk.bin
@@ -0,0 +1,48 @@
+{
+	"data": "ENC[AES256_GCM,data:iRxcs8VpOA6dFng9B3wHwxpEx0hhLpKUb+Eu09CFzPiZKPfQ00pecfbpQeXJpT4uvVxmkl5zuGkksSzBEJDBIA==,iv:Ii65q3V8dGz1TfhQNxKa7gSM3w8T9mnP3C8vUJpBbrg=,tag:ge94QompXmUtdl9o7306sg==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZQURjcVlTRDNRM0IwbDdB\nRXJOM3BkTWNhSXBYRkRicWlFbkR2QWJtVUFNCmZMeEs2SmpuN0RDK0JFQ1VUOHdk\nSnNxSkxPR2R2cHNZZ0c0SGtNWXVTZGsKLS0tIG93T3JCU0dTUEFRNzg1L3NlTEpr\nWlpHcHhKcTRKM0tZd1dXdGxlMTlyVEEKt8dheToHMyd/kGnQoUoerdIaexgY1jb6\ndOYZfwizrTE5mhYFzcApkChnjSHWfPTlWE0EzG4pBkTGkmoAx8LU0w==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAraUp0eHVGYnBZOUtMOVdu\nMTI5ZjBraEY1aFk1ajVLcmdqcGhhRzZ4UzBvCjVXWGtBaytkdWVnMDBEb1R3VWh2\nZnNYVzljMWRGYjVzZng5c0p4aVFXTzgKLS0tIDlVTzdrZENZaXFLWEtZWXUzQWFR\nTTFLYnR0WUgzcFhMU0V0VzcwQzQyV2MKdPvZdrfidA+k+PO9q7ruNlAbLkj3Hcvm\nvDcsTlYUA1ZG5SBsEhsztzNa7dSDX4EYrf5j1WSPu0/a0UYXkrR20g==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrNzZUc0hVWVhsKzVFcng5\nQ0VnbWZyL2RwT0FIMDhtR1FBNmxEZzR3OFhzCmRTTnpxcCsvZ1dvaE10NHppVW14\nVk95bUlRck5jUU5kWUZ1ZDVFUkdVdDAKLS0tIDduSWMydy9Gc0hmQWU4ZkI3VktN\nd0xUeUdYbExYREcvazlZZk9uSjJtZzAKkTW5axKqwBuo75Z6bGI3+4wXf5ilAXaO\nQOhyWWTLTdnCq0TOPt5eZlFgMleOsJD66wHTQR5Eb+Cw0+9w+XZmag==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLWlBSald4czhxRGNoR1Np\nOElFNGJsT1M1NWRpbXF1bmJ3eE54UGVNbUFRCnV4K2pQMzR6ZXdqVU9yWXNqMTQ3\nQ2NzUkpNdkcrSldqNks3YXlyS20wTW8KLS0tIGVaVzIydEtHeWZiVXRZbnNiNEJR\ndXp4WmxmRVppYWNDaTNoUTVZZ2N2LzQKPRFZQD6TJXBewxurVsHlazTE0HsygOVD\nRuTjEj+F9DRVc4scne8GhHkQYUJSe1iVsb31WK9/JNpXBpOaSNvZUQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZZlEyMEJOay93blhnUGZ0\neEhreE14b01Wdk1CTW9TVHVTV0pmZ1crNVFzCitiaVd5TjNiZWIwaVcyL3FaSmtl\nSzBJZVVGSi9tU0lUMk54UTZIZm9YMjgKLS0tIHpoK0ZVVUY3enZoNDhXSlVoUi9p\nUmxtU0ZBU05iVjdpSDVYc0tuamdHcDgKUzf5zX9oN63tHY2fYFAUKShS+rJIg6/2\nMX/QUGUDT44TBSw6forKS5qrlyuMkxr3PpgB1+P2isZNR9UK+dOcmw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEeStqei9pSmcvYU9FMDlQ\nQ2lNWXhjaFBTK3p3WjdoMmhKcFptYXA2eHdFCnFHSnZ1ckRNUUFDa2l5L0tJM2pD\naC9LZjY3N053Y3g0RFNKYnhIdUsveUEKLS0tIGFHZDJrdXRReElxcTRXY3JNK0dH\nSG9TNHFFUmtidWpDV29ZZlcvNERRdW8KUqP2zeYjBv1JhAjZMIY2LByZahRwhAzo\nLsCb2/kp1uWF/2jYllFmP3mtxJE3cijeHuN/1cwaMkJfFr5pyR1feA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMcEVzZWhoZzYvbVBCd0lD\nQzJPMmlvN2F4dlJUN1pQMTNKQ3lkb01XaWdZCmhHMHh5Q25aeVpZN0pNWVAvUmpr\nMGg0cXNyNFRuTVUySG5pUEJuTXJLYU0KLS0tIEk4NXNGV1RWYTdvZWU3QllnSXNN\nZ2JPNkZHMFpxRHE1Q09KN3kxbEFaQmMKAgmnPBq25Be+v4UJcYZXG6Cg4RNUI1yu\nw3HK1X1TcI1M4f7PuChbPzhp9+LVgWNkftDoSTjq0WFKsBlW95alRw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrSTFlZ2s3dGlxNi9pV081\nSjI3Q2U2Z0pxR0RhUFJ6cmZWTFVnNFFUdURJCjJkRkRody9KZ1EvMTRNOG4yaXNa\nTHliSmE1Y3dKRTIrNjFzMnpuSmdYVkkKLS0tIGxaYW8rUHk4clo3aGt0VTJlcGZ4\nZTdVTkxrNFRYS01Wb0ZYUTRoU1JocVUKX6VXkWHWma+3D8Vd6OC72mIelgXWMbrj\nwRIO2fHsy9M+TBQzHHxhdCdKefAYMu/hfXEFL47/Wn5yBJmSWjYEeg==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2022-09-29T11:27:51Z",
+		"mac": "ENC[AES256_GCM,data:dgJ/bcxkcCrTSAPKDa4T1djvZVTnWofmb1nTx+V3X0C0g0xCYrffpcieSPusKoQC+AzaZSy4H/RyLlW9We8+t41hrWdjdPkGcLd7n2u2e5o/AIgdSv/ODdFnX2E13ZTKMnfI7kUHsSaNLUF7TvitdXCO/hICGkGoJwRFwbV8bxU=,iv:WeQByrD8To8wqOwfbZYonci2gTm42Mv94zKKKNufq2k=,tag:avhJCmvNdZhkd3mTtx7cRQ==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.7.3"
+	}
+}
--- a/secrets/universal/net/friend-rationalist-empathist.nmconnection.bin
+++ b/secrets/universal/net/friend-rationalist-empathist.nmconnection.bin
@@ -1,48 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:0EjWtJmTwjKtNX4fV4SMWgeTFwvDbUBmiEdkVLhd62EU5Tk8hkKLlFLeZtkS7bvCxUDZnowRtIYuWz29Gv/beydtHmcLZjDHgB5Rew2VSo7uVTkOJtfeHuVs/qj3soYN6DrIY0qJbI+biL8WfkExxvodgzN55oGcQRx0+PLrpn6mCoDdxdVXHgUxhWKedOVxSiK8YaYSO7uspRMhe0ukJrIysUgIPZue2KCh0Lr01jryYCEe2JgTkz6wv/vGMB6vN8P7MZ5N3DqYwKaz7wGCmcQogXJJzSFxRCIwusWs5pmHzZ3pkloK+xR26JGR8/4nlPIi0wulP2wuFNQMam2okSvv60TqEodBBgoP5xk=,iv:ahlaBYrX8lR61f3qlAY7TDS8k+qxpIXjrHUUaTDsWFo=,tag:mO78yMIWUXBkM+P6UIiJxQ==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzUTEvZFhXaUdaaUVNMW1v\nYUxLMHF3RmRuWXpzT3lRSlltcHJDV0N6aUY0ClFzMVkzNy9YM200aUhqaCtlNG9q\nYS9zalcrOTJodXN2UkxFZXltYXZSancKLS0tIEFrdzFsNnVGUFlmMjJYZjh2Rmpj\ndHR0aFpUQmR6M3RsL3RxcHBzeldoWVUKdrg1fyXCXaKsadvyLni/sb9nQHHEXyMb\n0CS8SSxc3XE8qtOr+KDG81NnEKagz8CwfJThuNom6uPShFeuIrXr4w==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXVDNiM1lOdUF1Qk5SMzVa\nQ3ArL1hxdHREY0UxanF6amsrWWpBbDlVMTBrCnd2dHhXMnJHWmFuSUNsYTJ5Vy85\nZitZOEhxY095U3pJSG9ZVU5mSk9NTmcKLS0tIHEwclJSZm9MMzlQVHNtUTJHaGox\nazlxODNjcnFnYmd6SzNlMjhncHRWYVEKdaHIg9/POjzVu5PDVGsL3hbFV5vG+kCA\nNpEKnOYD7qNvGFVffVXmWKbid7Djl+hllVA1p60qcMD6mKujObBbyA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOL0t2LzBONmpOOEh2N0pM\naHBKRzkvUmJMdURrRlNhUHJDMVlNdTBTOVRjCmN6aUhLc3VyZjkvMHh6RWs0cWl3\naStabGxieEJKeHZiaWQ2YmJIREpKencKLS0tIGFSMmVrMjBnbEdnVzAzMk9FWm1T\nV09qazRMMEVrb1ZsWTQ0NEQycW9YSTAKF2AfmSY0AyK2IBcs8KLY9qPem0fMqafn\nQP/ZYnZ8HxUdTFn8O8WAo9tPGd8FPIwa7h4cjHSCgeIE2vsp44Ggqw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXZWhhUEd6aUFGUmhMcHNM\nZ282WFJHZlM0UmI5SWkzbmRHY1FtRmFyVXlnCkJNRU51ZnFRVkFWNUt5OHZ3ZlZh\nQW9sVGZPQUQvUytVYzBMdm1KdnQ3UU0KLS0tIGtOSUpXNngvUEswWVNxSjdqZ3NK\nUzR0ZUZWN0VILzdnbTcrWkxRVThGczQKHY+9t84/DHfL9A8xuH4ywJOft86E9IMw\nTzuXWaNuveew7lm6ftyLCIDyPKuPAbHML6GGZ/eTntYvihm/HtQOPQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEM1VDYjQwTTA5R3FBTzZs\ndXN6M2ZjSXRiMXNzUVJadFJNUU9xWmVjTFdZCitLTlVZOW1YMERXaURFN2JXRUhv\neHFIRUFwTFVteW5BTzdHZnJEczQybFkKLS0tIFhiQk8raHZsRTRmTWRRNUpLcG15\nRGVzRVJIdEl2VzdOVmt1RlJHSFpKbXMKATMXl7FxIZjxHB8CDywi9w7oObw6KJNm\nc/3/z8Sd44jVuJF4caihhz5s2zqRCkZX97g78aGRJJkDUSuVpukk8Q==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArazV1bFpvL2NhQ2M1OUk3\ndE9pbjhzRHJtSEtvLy9IQ05GdlFBamVUTFI0CjNpbUN4YnlDS0R3b2lEb29SRmJu\nczN4SXBueUoxNmV4MjlwR3FIdHNET2MKLS0tIEQzUUxVRCtvTW9vNTNHenYyRnd1\nTUU5THN2TnBuYTNLZkc5ZzVYaGVaNm8KjJv+na2x8y9W0zrCnImInLIPwQz3sAAV\nRSW+9FCsQg6XoVtzZNHKKWMgtwLUnwLKxD4MbnWOJl+gJVYtArKryw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxTEFpTW5UWDBpOWlOS29C\nN2ZFOWd5OHpxdzB2UDY4WVRjVWhUdFdGdkZzCkdtejVzREo1dkkxVHNiaUZ4Z0FV\nOEZRbUlvQ0l3WE11L0NCVXA4NUUyVE0KLS0tIGgvc3FIMFI5UjFBa3lidUgvVTZl\nMnRIN1Z0YjZUQ2dMdFlxRmRmdlkwSjAKTFYzmzEAD+WoZ90BRYBgXNGaAypL7aao\nKHMB0cdIEg7ynxB8cEeA1VynYQ/H8SKau7s9CKjGJEN2kqQ3R16l0w==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZmtmUm5adzBUT1NHZTJw\nNmFZZ3pHNG5vRFgyQkFRWVNnTU9jNExKZkhrClk1OFFBdDlyalFNMzQwemt3UjRD\nRkRqUlI3eE1RVUhkdjBYOStKNm1qYzQKLS0tIGRtTHA0YlFCMjNLNllBZUp5NFRk\nNGl4VmdxRmg0K2JJc2ZQY1FSZXhOVE0Kfz3g/XU5NloEqn+rpvYBNRXk7bF5D1Mh\n6PqvdxzDBWODLSpC4gDenwHAukCANdR5khZRuP2TQXXHof0ckYegmw==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2022-09-26T01:02:04Z",
-		"mac": "ENC[AES256_GCM,data:/EkX5suKDBUSs2SqJDh7+juCdzDh57qmfUMNVFjLW8ASOt3ltRuUyYykNTiDrN3BNlzepFZi/1Fu8C7GZGjB4j/6YweT8oAz3cBQlcNcal4AWG1Q5JG3izoEPs7b7+ouBHrRR523FacPTKYftAiASOK2z5/Bbf3LZUN2zwBQy1U=,iv:2HNBbJiXBNbhHZbcTYEuV3SZP4f71hiNYWes4Tbhj2k=,tag:fgMjYlHaFBfujuJuu9iu6w==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
-	}
-}
--- a/secrets/universal/net/friend-rationalist-empathist.psk.bin
+++ b/secrets/universal/net/friend-rationalist-empathist.psk.bin
@@ -0,0 +1,48 @@
+{
+	"data": "ENC[AES256_GCM,data:zhMmmsRibiS5Akobs2hEZnyFZRitEyXguYolhUmXNSMdhybLWealGNPF5D0v5MzEV0dhncmvXs8oz3k=,iv:xtQtYnbXfndMyB/I1ruL/F4k0omQeShDP8QuaK2SVkU=,tag:MfxdSbk3OR6mBVggsw2I6w==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1T29tc1Y3RElhY1hCR3JO\nMDMrV0VGdUVLNVBsV1VWenlXRCtucDhZbHdZCjdnU0ZjOGN5Vit5OGxqL1RMaUJo\nT0ttZDFLaTAzd3g1Nk5VMVgrMEt3c1EKLS0tIFJEakR1cTNETGpVdGxqTE5xVVU3\nWGlDZkY4dGZPVFIxRGJmdXF0WFoxS3MK7xGioj8OTPTL+WGYRjJbXEHbgU20qoA4\n/usblY/fawOBNbAGttpSEWyHb1qlQTWwVl00XNb/LqUd/Qa6O1uoiA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBySmQxSTJOVmtVVFhTMmxN\nWUFpekVqZzVZSXQrRW1ZYWk4bWpSbUJvV2dRCjlBLzR3YmxlWGQxYXI4MzdQVkZW\nSlU5QVhNUTNrMFM0VVV0dkRnLzhHVDAKLS0tIE0va3hhNlJCR0VzVVVNQlk2bTFV\nZXpNS0JvS290TlA3MXYxWWVueE5TNU0K9cq49fk1ip9CBAoPkifyZfY8NqFo5zgo\n2UsL9qla2F/DzA8Kl2l2DXaU9PaRngrj8AoFdvtUtO67r0NwmQ3zaQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxNGVmWGJmUzZweXVCUzlK\neEI4VUl0V2t0WFFoRDAxZjZvd1dJRnZ2VmdBClVXZVZpd2lhMEdTUFlpMUZjVmNi\nV2xKaktRbmRtVzA2UlhJVmZtcnErYlEKLS0tIHlyME1OdHIrWG5uODQzbmt1Q0Zp\nRXJLTithVXBnditUc0tPd0dJYXZjMlEKWOL7CXR0wn8TkQtuBssx6cErNZQdonxr\nzcDUJeAQ6SPFsnyCZ6BH972z0izmRkHYaqVRj5Pl2Ogrr+UHIxSqeQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1T2VFTlZHSDdvWWFaS3pO\nVHg2aEdZNDd1ZnFwbGpQWE5MYkdPZ1lkRWswCjRuQU5zN1cyTXRwa0ZaWEs2Qkg4\nMHZGWDBqSE5kNHVCVzRqb2JEb0lrSFEKLS0tIFJ4Vm9RUm1WZXdXcHVqYjNBMU1W\nT2srSGZNUUFZSlpaM2RyREk1aHJab1UKBpY37flWrKKeRgjs2BzWof/6E3k3DZp9\n1b/Ctvyebvxx0C9jxBzajqgbVahN/167JGwHrz87vTqp8907sFEbkQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDN2IzVExDUXNwTlBDVndz\nZERnUmxTK0Jqeng3d2xWMVgvS3h4M1dYbm44Cmh0YnZ3UmltaFlxTXY1VFN5dTNT\nSzY4cjBkVldESXZSZndrMUdMZDJNQmsKLS0tIGlUOHZoMXBjNFFXbno1WWxsVEJm\nakUvSzBST0t1a2o0RG9zVXpOWlU2NWsKRJ80nHXMzEwPS0BZIAT4KKTDYtxufC3s\nFlcLzDQVVN+JLAdu9viayUrLrKfAaKvPKGY0YUFgIV3YyA4/vBLIpg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWUmxSS0U5bE8xdHVmQkpz\nZ1JrdlVHMFF2VFJiMFVMejJGNU1xbStJWXh3CllRYWxyT0dORHlSWFVMeGcyMXI2\nRy9lM0N4L0w5VDRMK0dueVV6OUE5WlEKLS0tICsrQ21FU3d2Q1hoNGZuSGdzUkxD\nalhRTkNZNCtoQ0xmRzBYMzlvRnlNNEEKzL4v1ZRwfJ9aYHYZZNwrsHzXeZdQzk/R\nw5BdRWOqrTpk8DLwCxYO/bwxieidocaBhUufDZFPqooxSz/s6HaawQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByVTg0MzMrcEZobzFFaVVv\ndytJeVFjRnVuR21vTlJIUk9rUHVBbFFiREFNCmxxMHQ5bjRqQ2x6Mm1yeFN3Q0Yr\nY056bXZmSWVuQUxWaitIN0Q1RE91SjAKLS0tIGZCZm9yTE1tcHZoblBrekcvQndn\nZWgrN0FyQklCUHBFSWpheS82M3ZKR1UKD5UpmL6mPXVDyOP++o7+MTRq85omDmbg\nINDnSX/CiPfLb09GukRLMymcaVvBJqKTmySalgHSC+EKTo5uXBHehA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3NU94L3BTczBuekoxQkxZ\nMnQ2T0ZYcTdrYWZqYSt0RFB1Z0ZRODBHUnlFCjVob3JuVHJ0UXFBQmVaT0ZJRHVq\nZ09ScWpxaXl0Y2ZJZnpkVk9HSE1FKzAKLS0tIHA4YWJ2Um1QeUNlaFhuQksxQ25I\nM0VSbmlLVktWYW9aWmcyS3U2WnRiTWsKqa31gg1zZ6qTkwTsgmqM/Rbd0PSk44fA\nxVN8wL4dQNM/JvSYLggxV1vPvUW9Y6f+Ch+moFrtcKdOy8NDipNHKQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2022-09-29T11:28:38Z",
+		"mac": "ENC[AES256_GCM,data:SvIBnGuNXzR4ZWlsIJ8e1J5UoYciQ+howQmFFqEDcu/lZupvv3Ns+YZ/J5nm3Zpl0j0YGoAXUBBvENfi4TS38AMqkA0ZxX7fqfd7I9+RgCMaKyo/JGLwO7Ef6+7wvwiNVV4y3OpPkZC8AB7157d4QEczb32X1aQtRdisWQnaBBs=,iv:huJ6Rr8dWW2GiYv06DU133iFUHpxzpzI50QRlFbaeb0=,tag:of3scYamp2AFXN6h/cY1bg==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.7.3"
+	}
+}
--- a/secrets/universal/net/home-bedroom.nmconnection.bin
+++ b/secrets/universal/net/home-bedroom.nmconnection.bin
@@ -1,48 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:CxIMcl3XWttHWj+itIiQLg10SCZnODo9ORLxfRpkktoMMk7/Uk72ndjOM4TQX+vSnNkjm5Pb7i3dIsmX6jJCtUXjEEJMZou3DjDLcQh4TkXJ/yoEJkZhcucNmI8Q9lhtEtlVarM8B9l2DU6Ltl1feTDv4CqELw+ai38dBoZsw6DHFQfUuavNR/yc4rQjlh9ZzJrhGtMD3Pv0DLPrrD2O/IiGHgFxUmRktiNZGmH2QS9hUq6zYdiT3VY8ApIKnyCWGoxBxT/JIwggvLBuYOT1R+50WCpATR4H6i5QSiHAzdVYihtpZBOydpiI2BpP5yXUH6kIOKQ+NYihiAAQ+jgF8hCx2cVU8879zRrywFrKlaYEAxcifjwrx1TQBY9hGRdthkeTDVe+/71Rl0DEhKJ5s65nmMtRx26gKp2UMBNMRJ4kuslfjTk=,iv:t5vjs2uKDETv8xrQrlz6J8YQKnVmpiIxcAHLcmTASW0=,tag:wjiIsqT53lwNEmo1NThJVw==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnVWo5QmZ6ZzJpMG1oLytJ\nZDVsQzU0VnN6Y052QmduRHBMM21wWXdmaEM0CllhZzZxVkhBMFNBZDUxSnhJaUtL\nRndYd1NPaENJUGxFWUN0Q2c2OGlJcGcKLS0tIGF3Q011SXRWTCt0MUljMk5KZnlS\nS2ZQcGVobGJ2cWZjVDFNNU4yZUFRQlUKYsIGUx7V6pwKBzI507ibtc2UfehwaYkJ\naiGoTk0awOF1Dh+QJ9iIix0yvlFVR1b58gzV8L/IzoP862x3nV5Ixw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuYSs3WThMNVVSV04wczZt\nVVFJOXR6M0lvSXNTREcxeTlnTDFFUTQ0Y0RjCkVzMEEyWUl1eEg2Um83bXFGSENU\nT0xpUTRPUzNBbUxDc1FJd0RoZTFZTVkKLS0tIC9JNk52bGVUa3pIZ3lSb1hYd2dz\nMUN1aTVKMldGUXFQVGVkWXRORzFGeU0KMXI0kKQ+LUjpfnijok5IFeU4eGJy3EgE\nWzyHN1e5BgyqsXHgayTKcM+PPghKje7W1MFQm4CFJlDfdkAOpY2TYQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlbWpVMVNpNEtXbUswdnV5\nOTl0VDUyamhmUGxNenRNRmZXTjVseCt6RndnCnBVWjBDOFJZNTZMeE5tWXF5TVBj\ndHV1N0EwUHhzNmpCSWF2RVd3NFFvdUkKLS0tIFgxVW5sWFBFZm5tdzVMejBwWEE1\nalc5aEErcmZYMVkzKzY4QzdIbXNUZUEKzjNtuYud4Nzeut9eDU0qXF+Gvcn4sOlu\npDL1ptq7/roDblMeM1YmBU3MDyxqdy0MKrsCUymRwOxndmBhV3hDnQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5S1hmQ2E5YTB0dE8ySit5\ncDRlLzhDV2FIMHcyVGhvQjNiUFZ0WFlyUUdBClpMMXhlQ0ZISitMV3VnS2JBVldD\nT1RPSXRlcXhoZVdRVFdiWm4vQ2duRFkKLS0tIHFhRTg2Z0UzWld3dXFvSFVaYkdS\nVC9MeVFUdW04U2h0UE1VV1p6VkpHYmsK60UwN8gc1Beo/y7SwTmP9A/d8fDzWC+z\nEy5etxod2CBfJ8RfDJutsQH0otyEbWYqz6FfLqaLWn8KG1m0x8rnUQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYSU5WTHZLUHJYVmg1UkpL\ncjJscFJ6NnNkclFrT1FJSjNtdUxLVmFvWnc0ClRZZzRCVmxpWktyaGNVdkk0WUpm\neEpLdDRLNG5iK0o2c3A1R2xPTndwMncKLS0tIEY1R09FenZOcTFFYm5ucHFGSWxB\nbmloZVlZc2RERHJxOTNVNzZkVWN5ZHMKXfZq2ko7IiazDukSRvRn4floHMa82utc\nco/sx/saIf11UaKrsEnEzsAMCRatR+YHb9GNlVof7ZFEDUsQ3tToOA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWR1VjaE1CSjJkdkpYVE1G\nSTMxRENkSzg3bWZjNXBkS0FaYWYxRklnRWg4Cjhua0xZR1gzVGxBZjdTc1JvN2sv\nZkhhbUlzNXg0QTQ4ak9ETHNNb1ZPUE0KLS0tIGh5SHh4YXNMUndnN042eHliU013\nTGpKNzc3b09CUWQzRHBjK2RVTmJ6c1UKNu8SdhNZoNsbisjKvg9KbkluMAjblkaL\nnR0SJ8QlNvBa6wc/mj9y5pSaCgj9zROvjpDd9zQgy71WdMXVhHN7Hg==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzY3M1dnZUcVg5eDRUTTFZ\nQWM5TXloUGhCNk9jeFZWcDhqSlNWVGFrVHlFCnNiVW1XekxnNlVqb0phVzgzb2pv\nR292NmNBMjIyY2YvSTBMY2IrOFNLNXcKLS0tICtKdWVzbzNrWENLQTUwUTVNRXV2\nckFBeHFady8xYmFBR0VjbS9Xdk1IaVUKJfC8jx/iCkgHa4nPW8uv2H1F9W/RhYGt\n0y2rDSklVYx574Oh1mMSpps0GOjEXiOgbGPyfz5eqgycpU6q5PprDQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1Y2s0Z0NHL3VxMVpWSTZ5\nSzByWDAvSzNDOU9OQzBaMmR3OVJWWGdsR1Q0CkdmN1RITUc0b095SVBiRDhKSUNP\ndmhRWVFaRklVL0o1V0szcGFtUEROczgKLS0tIGtDeEVLcGlKVktqME9idUovcXVU\nVEQxWUV3Wmt4Rkphb05YSGJ1bWlCeEEKdAuxFMMYSnzt5vSwst7ZfxZcc8O241u2\nJJt+b2uU8iaHcLoW7FkaEUh+42+yit++uCzTlYh+m2Mt9H0UHXg1SQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2022-09-26T00:37:28Z",
-		"mac": "ENC[AES256_GCM,data:u1Dox97kcWqhqLPtXGF6lbkn7oSMVkX1Ls4CRNebKNO6gO84WpO+Bqcvx2Zy+OYrh+o3iJ2W3IM6Sot5LiTgamiCAoiZmYxgNSI6IJPy3b0+F+0RtlaZG9mUrV7r1NEeq84iMKqxjglafTlZbFAsrl4C/sOac1KK8/OigxNHl6k=,iv:Y9JYeRNFcwxWR6qhTTMwDc0hh5Y6eX66djABynaBMEM=,tag:pJDUProGl+flqA4sVpR+4A==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
-	}
-}
--- a/secrets/universal/net/home-bedroom.psk.bin
+++ b/secrets/universal/net/home-bedroom.psk.bin
@@ -0,0 +1,48 @@
+{
+	"data": "ENC[AES256_GCM,data:X5RxPa26vyMk6+z0HB6xwXqTmPeR0MJ6nR5oA4GSEL+s/7SrCn8wWbdaM8iGE2U4ljyC1LJgyd4lZc4r1V/u3Gg5Ynmr3tIRhQ==,iv:rlguW/Aev3Q64lda2bxES7RbZjngVGo8l8CX50nuESQ=,tag:6kqdDV3f7QHiIEif16EEUw==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJZzg4QXpkSExIYUptNkRC\nMGFuNHEzN3drcEZTbEl0alBpS2FDM2ljV0hnClZJMkc5Yko5TTI3Q0twQi9UNE02\nemV5RTNNL3N2S1pOcXVqNGVKWWp5c1kKLS0tIEYrMElhM09zSFdCMnV0SnRBMkQr\nWitjSktQSHJDV2lhajhlaHVXdkYxTkEKPK7SY2zesUHKmLHrt62vFwm8mOZ8n2DY\nb2hZFcA8r2Ozc6+BY62k+rr4PTkE1sTeeTPY4nvL7+k5lvFPqwZ34Q==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArb2cvN2VaTnMzRW5IWGpU\nRm9KZWVpcXNTZVhGWXpMNmZGNFdCc3dJTDJjClVhcVlhQmpLRmZSRWJEQVJWMVk5\neUdOWEtUZGs2UWRXZXhZTlFPY0swd2MKLS0tIENKKzlEaFB5b1VGbEIrT2RjUzNU\ncHFvbEJ1a2JnZDBmd2llOHptUXBERGsKMzgbI0h4ewsb3dmgXEjqKHLxr0ZzQGiH\nX85GwYTDh/UU8mol5xMHEj//uJnKumCaPdNZeM8uoHOCOnMZcOBj2w==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5ZmlYY1p0UE9Oa3BZYldk\nUmpWbVZHWVdtRG1NK2U1eXdjdHYybTdFM0J3CklFdWZBM01BTUY0ZzU0eG9KZjBE\nd3lucWw1aFlhYUJzT3JQK0FOS1o4OWsKLS0tIHV0dVJMdFlVL1BXTkJUWnlDaFlN\nc3QyOC90NmVTTDlEOFZxMUNSWTR4QTAKQ2I2cYMJOzGHaou84UQ8jsEBlcZK+4nS\nVEBkcArZpfxDlYSajr1ZJ9Io5rdFFOs5gEjHh43ScLf88+Qs/QW9TA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzTHRtb1R4QThKd1c3cnZx\nbDFVbzM2azRabEdzZFVQbzlpcGV1U292RlhrCllBWWN3UXc4U3loQUg0M0RUVDlp\nalNFcVg0eUF3Rmc3NVF3UkNRUUF6NnMKLS0tIHV0bzFsUzAyY2Q1WWRIWWhDSnFU\nMGtxT0JmWmUvQnVQOEw5V3ovNGpsUDgKbYso2M273aaZhvlRQuRcGHq/9g3IK1Od\nqBXpSmEzPI033gVo5x0r3ShloXzG5/7j0Oy/JdWQifQZuzhUTYsA5A==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdmFndHY5Y1NnWk9zMys4\ndGw3eXM4UFRNVUZQTkNCdndWSHFxYjFjZnlZClI1ZlBlTlpkREhKOTRXTmJJSHht\ncFhSOEs4aDloVWZ1R241NTJVNnRhV0kKLS0tIGFIbGtSMFVZKzc0MUlIajIyRHI1\ndUs2YUN0Q3pnN0Z0N0ZTcTZidzVobVkKUvE9wpyUnG59isJfoAzrKP+wqIO871XQ\njV27WpKOqwtCq6Jv3Fv43soGITpb6Tylv1pYCBvL83knlGNMzvvZnA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2VG1CeU9WQURrZDIwdXlD\nb05iOGIxNzZTVmZlTGxyZ0pFd1ZhdGU5ZTMwCml5Z2s1aWp5NGJNdFcycmVGR1pK\nN1dwOCtkNHlWbmNGQW80ek9LR2R3YlEKLS0tIDlZRElhMktiUzhKUEQ5Tk0vVU9F\nRGJrZ2IyaGxmOVlEKytSOFlDaThZU3cK9zUGyA+0FDXnh1MhO6oM91DODp0Fpb1M\nGhO0uCxk9k23IumgWvRfE9bwM+bQ0QToBSIxfbdFq1QVdqgz3Z44IQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVS3BiVUdFSTg3UW5nSWQ0\nRWFZQXZMZ1lxN1hPeU1kWng4QU9EVkNhMFNRCkRuSXJBdFo1N1NPdmNCM2VjcHRk\nOEdzTWdDZ1F2clRmTHFqRTRNb3MreHcKLS0tIDJZZDlQdWNSNVJ3SEdWbkVPSnM2\nM2lqMTFmN0VBRHQ3bUNGdDJMSmlBNTgKqVXysfSFxrdMUDVv66JZRPape/M6Im6S\nj1f9VN/ZNrwnRU0ZzPtFWeMyYWIc6c726cweP9xB7ZGoGw2Qfiy8EQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsRk5qdktjQnFJNTgrcUR4\nL0VhcHZCT2VjMDNZeWRSUlZoMXRiY1FEYlVJCjVSK0J4WGFOcUErTE9GWFAzNFNY\ndkIyRXZYVUlHTmJ0L0t5TnIzbS9sYnMKLS0tIFY3NDZBY0IwU2kxSmhvZEJ3Uk5N\ncDdDTVZTWi9pTmR3dkdMVTR3cWRzZ2sKfsRBXdxnjflGnfMexej0rJDRVfnKsPYO\nVGHcl26QJ+7aF3eVhiNmReuQn0i8mqbrcNMKSp+XXLiFyfu89IfoIA==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2022-09-29T11:29:10Z",
+		"mac": "ENC[AES256_GCM,data:DPQZVQfAh002aE2X/qgVTuQoWD3AkcbxNU8NAuVY5sgPFhoLtjbm0vNtN0ql2h1HUVENS+BpNsHpLQej7musTL+mJ9KSlHtoUfK0sY56Gx/B0OxMzHF8EHQyYmM/IOtWLuzzMYpFVM2gCeQWgHYZo0W7zNDwZaBVLTAyWN1lAhI=,iv:bTdE+Hma+IIzwy3vMhYW8Rc3sfDkQamW1QQK+bBzELE=,tag:Zd56FoS15pmuoNhCvjckwQ==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.7.3"
+	}
+}
--- a/secrets/universal/net/home-shared-24G.nmconnection.bin
+++ b/secrets/universal/net/home-shared-24G.nmconnection.bin
@@ -1,48 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:xk7sFZVtyR9hg5Rm4gidqH7JfvPa1xCKOE2lAm51oPRVq/A2EKrLrnLyJTJ9dwF9D5yqkxv9QA9SbCHV6QKH/HDdLr6+f3CSsCbgt3SIR5ol3CBPfiMMNQs14dE46ZH9sqo8BWCjzQxS2UU9KdpVz579fvMCSk+uDUE4H5JHiCnyi7f56BTOGhV5sPdsMjX0ktKzNPeQPYe1RtNtzVljlZWTM7L9AYCFhY4nnhJ7abqBZM8u0Do14pkdKj08HofzYZONAyb7U+4JPcNOYwsAWuXNPbTD6UMduw9mVF9rqjb42IGvB1v3mH3a/hhTfJfymaXI4NhJQLkpIahwCfxzZdK2yH03eYcw44kAAcwji7VW5tTurl4I1A9EnwouJ6HEBM2RUqfhlaVN5nu0AlHPuK8/0Vd6wuesUfntszl037yPCbB9ItrC5xVK/+BZRJujm14fYCUmMXHmtyMdZIFL,iv:v9xkoM9ed0nVkXj1Nw3MrF0b5qDktrA6tuEaHNDaJbo=,tag:knNHMNx5pJC6E+wFyh9qsQ==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOZTAzUFZnWkM2YUpJSXV3\nVlFZdDBvN3hxK29GYUZYWnlMQVQ3Rm1JaG04CkhsL28rM2p5RGdNNW9CVkdWS0k1\nT2NsZ0M0bXE3U1dIaUdaMm45V3JISUkKLS0tIG9kT0kxbi9BVUFRRDRNZjNhbTlQ\neVo5dTJLVFlkWEhmZTgzMEtoR3dvRzgKvdrs0hNdQWMpwmeq3D4SU9PIHeUVymj3\nqK/vewO9NR0EDTDxjJvDY9CE1Hqs5KjbTWNBJt6e7r78OCGfeNpUAQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQUlFXUXJnOHdmTnJDSkll\nb20zeERzRitXRHhpTzA2OGlYTVRvZGpDV2swCkZmcWJJODZZcitrTnBxK0k3SXB3\nc0NJUVRwUkp3cVJjenkwMFNKZGhnMVkKLS0tIDRmNGVXRFduRG43Qm9IempCSlRk\nN0xSSG53czZJazJKaFBRZHBJdjZDa0kKGbgdNG2ErBrMRZpojH8PMoLAt3m25Q6p\nuEzWTiksKCU/FS6DnAn7tvB+mOBzpbhjcb+m6c+E3eggCdFKgqW+YA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSRm45SFd3cDIyNUpwSGdP\nNVg2cnZiTzBIQ3dpem9VQjJLNU1BQnFLU1I4CkR6NnZOSENrdzhlUUc1T2s3c3Bj\nYWhXYWtCNkVrY0hHell3RUg1YjI0dTgKLS0tIE1rS1FkSnNpRHdPNGtra0lKbmRt\nV1hRNDVzeVZGZmlhMElsdFkvWkZ0WnMKqsZ5UKR3eoz3392OB9485y4/TjNM3D5M\nm67Abn6pQPjLiZsham8G5eoiGwKgJAeXIiUBxg5ihahKKGy5L9No8w==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOellsejZiT3crbFhNM0J0\nQld4RUxFbVdWa0VsL1V5djhlbE94bFFoT1dBCjBFSFhnK1hwR1RxQzlmY0ZIblEx\nd2lWZ1c2UENqVDU2KzlwR2VTeE4rcUEKLS0tIHdwWDRHRHBvZ0FxNnJyMUQrdE1V\nVDlpSGVrU3JyRTR3dy9UaVU1cExBbjAKqGFpzoOJcWDpRQiXhpPV4FTkq97VWxHr\nlIUefxXABGKXnA5p24/bN1jYVeP5s3WO2w2laO/JQmD/bTknjUVj3A==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBac2xBRkhJUllSemhGVU1E\nRjJHSFBwbEVRYUVPZndSQjZvK1l1ZVFicTA4Ckt1a0wvdVAyV0s0WmZUeWxxZ1FL\nU2RyVnpCMVVBb29oYmxuMTl2VERhejAKLS0tIGtNK3k3dkJKSk15YmRhZXVPblRa\nWjhCWDFtakhpY2ZJYk9zQ0NYM0RjMzQKAa8NF7fsNnYLDLS8exAZd6GttvLOV2hL\ni1sCoCr+MD3Y2XJvD2yoWaPwMtlbJD1QxnjZ/Ac0gDDSNdPA425yBQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFQkVJSWNlaWZxRnlJKzdQ\nTFVvWVhyNURlYlRTWFRsbVU3dllFWkxtdFE4CjQ4WDQ1T2k2Tk5yZk4xNnJmRmMr\nUjE5VlNDb3dLOGZwRnR4SDZFRXBqa28KLS0tIDVqWXphcGpmVTdxOVpFaWhaZEZw\nMnprWVZna05wVzh4T1JMRnNGS254dWMKXRFXOQkDhnZbansO8zBIpoTLx0dk1gKw\nylEJR7uaC7QWBG8Flb5Jfyy2SDMYNZqujTWm3eaZy0CkgTp2Z3bJvw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFdEFQenp3OGJWS1FnZ09n\nZUZKVVZQeEp3ZFFYYXBZcVM3MXdEYkZ0TmpJCjZncHdTOTUzbnNOYVNGUzBPSW03\nc2NSbjhRSG8wK1J1d3V2SVdSU3BHUkkKLS0tIGZsalBtdEtWSktEVGdYSnFTVHZq\nYkFlc3FDdFBtNThKdzJwTlF0Nk9Wc3cKn5nRJPjhKLNmq4DSl8CGN6BhmTrelN5r\noran8wSzaDPpELSFdhnvF8ljW1ETafZavck8y9I429W31n/xq21n8g==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjcE5lTExBaWNkdzVwcU9x\nSmtxTUJjbUZkb0p1NDMzTyswTGdMOUNlVEI0CkVEZU1PMk44UExqdk45VEppKzZq\nQUtaYUQxQlY5cWVTaUdMWlhKODdhdUkKLS0tIEQvd0hFcTJmT3RkWEh6RTIwWFlx\ndGZHQmIrZkJuaEozVnFOK0ZXRXBiRzAK53/YP1rQ9VVuLzRYCGmmo9HqLpZmgOAj\nImFr+OpzdNpXDMN0JRorJfZ0p4CRob62zDIt1FDZb6jxmHa4PwLfhQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2022-09-26T01:02:32Z",
-		"mac": "ENC[AES256_GCM,data:y/9UiwCrOwC0BzcBj8pdeLTKrbsivyY2X3y7CbB+loRvFINql6VVgJ3n5Bu+kIwwErdfzCeouhD0RBv8pf1ygzG3tj7H8nhzeqFXrnUGuKCYb0Co0HJD5ZdprHyIq5jUxi/btRNKuvRkno+GSitE3uu1IPGUeu3viLl42SCCBKM=,iv:TfofNHw5MnhsJ+l8ZWVCz6gTGvhupsnfaRZKYTPY29M=,tag:IwN8TuJA4SPJgyEraU+8Bg==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
-	}
-}
--- a/secrets/universal/net/home-shared-24G.psk.bin
+++ b/secrets/universal/net/home-shared-24G.psk.bin
@@ -0,0 +1,48 @@
+{
+	"data": "ENC[AES256_GCM,data:U0EwYI7Y0s6SO0lCqF0J8Zw9dyAiaiUBUOMh6tC8cLP2dSbCCptKeL6r64zhjZM1JHJ7MK/DbGVyq6c9osh8OtU=,iv:6wElrgQM6r+Cm/FNGrQeWOVUG2m5TXWiEyMkiCLtnXM=,tag:xjDgGK6QCWw6UlKxvyv52A==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2d1JLZkNZeHBFNGVTalk4\nNkRDYytGUXFYQVNSNWlOV0ttYTgzZ0lQZ1VBClZKaTVadjFlVnJPRWZXWm5hdjJh\nTGgyNG9sd2hha242dzZ3dkRPYklVQU0KLS0tIDZzNGpTMFZKMzJYeUpnV0NqSjI1\nRm4rY2ZVZ29UdFhXZEZUWENVNkFCYVEKbmeZAn5yA6N8WrftBqpnfdtA1UHFyT4s\nTjQ4uDBGBNAYZzG3X1Dj/W9BBOqT/ErOVKcgeP/oSTsno4kjCnW4kw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOWTRwazVzRTVuUkFRQmdy\nNmpMeHdxQk9WeEg1SHJxMncxT3l0SnBqUzJZClpoN1RLdlVBRmNWMTRSOUNOY1E1\nOEJEYWdta285czhCRTJ5cCsvY2NrT00KLS0tIEVIMFE3aEFWb2VHc3pXNjQzSE14\nQUhjTTBURVBGYW5PSGh0QUdnd3R6SXMKqyBEOod76LFDheCl5FHlj8eqBEW6b5AT\nDkc83TH9DRm9g7Y3sgVBJAm1mPOhTlnAQuYvd70P3t2Joj33yO4AyQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoRFF5WTk1blRQWHdjbnRt\ncVFLZGlyWkdTSzNrb1k5ZTdWRm5xN3ExdUJJCng4ejdIZytsSzBaZmxsRUlwNEZW\nVnJoZlMySnVFUWFsZnRTWDF2V3pSREEKLS0tIFRuM28raTJkaENneDJFQVpxNGNx\nY0tiY0NpS05XTXpVdzJJMHJaRHg4UzQK/YPArPdC8KwdAz4lui6zhhjbJJNWgp3X\n/CfdVr405/xuNJxnshVr81a/wEog5HmuosAGEy60d/mFh4gs2BTmjg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJNGp4NDlaR2E5WXFJWTJ4\nN2cwS3Q1cjJSaU1aQ2k1VGpFTlRxN09YNkNJCjdGL2dGcHZzS0lxMzF3UXBMbXg3\nVjVrS295ekExb056cHZ1UVVvZThjd1UKLS0tIGZsRkR0TXlEaHpST1dMZHE3UWNX\nZGpGOEE0WnB3MlZISzdWVGMxclZkdDAKSo5iN8AuUYGgmCIMx89ou9muZkW71FRb\noX4Zkht/v9RtxKp0TGjujQeXnjC1iT97wFdR0iNTWjxLyUl9TtkIXg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwaTNhdmhSSXFrcWhUMkQv\nSlByVkh1akw2RU1rSEkzdjJ4bUp5Wnpjd0VFCkJIZmJZZEdXNEtkaWw1OWM5OXdn\nWHV5NE9JNnc3QXpyay9mOVN3QXNrcU0KLS0tIDRMOFpTL0JuNWlUWUNwTDNjNEVy\nNnZQVUVlQmRyaE11eU5KZUw4azlTRXcK50EEoR+iOQmgMNNI79bVd02UkOr8hEDL\n1KTy4s3MErfv8kGH8du12iNvCPRNYOulyk/CQEkYaUksP59g6k7mgQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRZ3VNcmJ2T2dzaUNGU2FY\nZGcvUHI2OHdrNTNad2Zoc1ZtUk5HNzV4ckY4Cm5YSzdRWDdXRUdFOXBqZGE2YkZE\nS0ROVDJFL3ZOWEZBM3FUME1tdm45U0UKLS0tIC9xNDRTdTJFcURPT3RvQ1J0MDZ1\nRnllMVdiNmU4ZDRLclZVL1lubGp1aXMKskqFVf8FPrBOaW9GPfm2gLnE5Zyq7Dq2\ntBGN6U4wXivLdC10e6BO4MrGjyCIeiuOJyE5f3XpkQ6RqkGl4P/P0A==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrdU82c0EwSUR2aFJYMVhS\nZ2c0WkJOUzJjb1Q2N1BZakdZZnhyQWdERVdvClJmMkREQlROZi9TdVhGR1lndUhi\na1FOSFdjWmdybHRVaDFFTDlIN21GTzgKLS0tIHFKK2VUUjIyRExwUDFGUjkreVhh\nSjdGcGpUU1NFRXRHcFNXSEJuS0gyMmcK6oMgKmwsstDNCyoVuhXU9z257+a5Hs4e\n9NsiKSd6BJVtfUBrBOAgRlkij9/x/zC5BvTd3tCNqNL0HUWxhdXPyw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVTQyV0o3eWtQTEsxTXNZ\ndGJjcjQwWjA2QXFubmJSdGwyRHliRmtQSW1VCmh1K2l0NnVmNUlMUjdmd09IeG5a\nTVgvOWh1RWZZZnB1RkNHMjVSMG1pVG8KLS0tIElNbk53dnJxRE90WHZSbFVYRVAr\nNjcraVhhWVdpTDZJOG9uaUVmWFF2T00KGyNISTg/g7v1+VFlCg0MjDTjbcahdSQk\nQpxdjvqQ3qtcfOS/+OO5CZYEJIVp6YybXyHJ4SSbaED22YtTJGmRNw==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2022-09-29T11:29:49Z",
+		"mac": "ENC[AES256_GCM,data:LaNUZ90jysY/2qR7UpZ14wS40AMtFYb9U/siHNRxQgWAz/6jIEWAbKm9AgkT0rA4swQoDlmcDof01UtFTrh9whfKjiOovjuqVUzeflZbKECjvbTh5UPbMedTaAJ3LU9HrO6JVB4eGlsXhO8s75larG6tRNiwvXzrVS1icRS6ebM=,iv:/uypXokTQu4IkqNyY10MBQj0XXLLtWYNmloY3rttqfw=,tag:WXX1aUnOZYUVEy8QgQNZHw==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.7.3"
+	}
+}
--- a/secrets/universal/net/home-shared.nmconnection.bin
+++ b/secrets/universal/net/home-shared.nmconnection.bin
@@ -1,48 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:dAvCfwoUc5h+WXdRKjSQWWLwhQmEzH4qEcSpmmlVY/Bec2fMSmO9R8i0S1XiYs2e9kk/DXP2BiDTDQbhpYBsFa0+nTv3jJ372XoNyInQoAvbiQpIZqWN2hpBcK0RnfpYXrsXw1vnCgB4EYDXBmrXc0uJ4db3WuFfab7zTaKBegpGJstY9KthBTKMacbLvDTXvmm9ozvSrrHnWV14a7z2+Qz0MF5vYkJm463vocTpw8chak1N7eWTBY+sqJ8AMAGCIh3+rUxJN87D77/jCDiefYIB73nLLdsuo4fz8eNlA7Xi29tujDEcjVnE9iYhu4YNB3EPRSdTCiEj5p2oh7bqL/rOkWzkrPaGSJ+kp/XnmmKoUhf7owSlAzHC9qxpxOZltK3rvgVWYCyczI2khtAmhX+lgsZJ1LEYM+dOP/Msfa9SvN94aFDq3chmr6Hd2ookAVSqN10ECV7zHLeeGPZhLhI=,iv:8pNdSXfPeRvH/W3+qkQXySkpz29/yqIqGwMOl42XYbk=,tag:2d1ImDpxL8gikl3q6H7HLw==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkeGs1RHhHQkxLZVNDbVhV\nRG1oMVJRdkpnZlptakNkL0ZpT1FIUFdoNzBRClFqUXZDVyt2M0RkVFVXVE0wQVY2\nWUJ1Q0l3OGwrOWRKK2VOQ2pMSjZUdjgKLS0tIE5INjNkUWFiS215YzEzcFpPQ28z\nVzE3cEJBTGY5M2JtdHBScWVqZGc2NkUKoVw4Tz7keycFG4OWkz3QKOKwyLbnjooj\nxiLKkFhebTypzNhBdd0zPHZBHbbkbkugGHJRUM3vf2IT8DEAEdNQ4w==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEZDZkTmxDQ0crOTRxR3dY\nVDlEK21UUGx1Q1pTVGdPSkl2MVJOaTJoQlVRCnd1aUhQeUxYZmhpSmRVYkNHUXNW\nYlI1QitlSkhxNjZHektDTzdNTjlYUk0KLS0tIFBDNGFKUkhRWTVZb0ZOcithUGZh\nakFETjdTb0JDblRjcWlJeHROeURpVU0KCkSsGQCIIKcdeKKUFcTDW+05kTAl3YR+\nEgXnCFI8TlADKlCGu3UmlpAJ0IVSsBbHviLlCn41W/0yOSyRTZi3zw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByNndPNks2REdPaytZQXVF\nRzFBWm9OYzJSRzRnNS95TXlFbVVjaEJ6emh3CjNQSytLNWVUOW4zak9aeHpqb09r\nbXYyY3NNUGI1ZnJyd0Nzbm5xOUk4eU0KLS0tIDhRRnVzRnk2OXRNSlBPQS9CZUhz\nUE5MMzdVNFpoTmtXQVZzdkVUUzRhbVkKRrDRkSqwbslLhNgHU4qyInL+LZvIc5RA\n0PC61EK7qIhgueZfxW8AMp5Zxs7id9jdfkKJw43cbxqGQbhdCUNSGQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBd09oRFlxVDdXT1V0N0sv\naEhxUlFFcVF6VXh6d2hEWUtQRGN4VnpCSWlvCiswbHdQMFkxNmZJbUFyNm51YXVt\nVndKSTErdXUvV0kxcGtrWm43VUo3WWMKLS0tIEcwOWFpeC9ROFMreGV5ckUwSm9R\naUpRTnBNcjRYaFhJRnpkQ3RKMUhOWjAKUTEsTX2H0pAii7O9Ftcy8uVazM12wiEN\nhB4Lt4uAeYOYr3wZ85IevVkamdPQC8N/Q8F+MtUHOklx4jWFti4jbw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrVnZGd2o5VDZaMFpQZUZn\nKzdhR3A5ZkxjM3M5SE5DSjFDMXRrOG91Z2lNCmFqYUJTZHlCUzcyVkFlTy9HUXo4\nM1JrL1BLRENpRFNCeEdCeVBzaXlQS3MKLS0tIEp4blVxcFludEZRSUNSRFhjZE9I\neDFpQ3NubzZTZVVJbTNHY0ptVVcrQmcKDBmc98NY0UczeMlJm8nrTVbUmcsWjcwn\nK+oSVmPXJzaGylVsjfgaxopfshnQnGoJ3Uh6LLCA7NYZFsrwmqKFqA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIRitVYTIrY1k1S0ZUT0c0\neTJzRHBnNnFGMHN0QjhRU3UzU2NnZGVaZVRjCmphT3l0T2JrVmVDSXB6T0YvaE1D\nTmVLREJ4RmxlK1hwNG03ZWh6amVWSWsKLS0tIDMrekdmZCt0c0Ewbzk5MzdMckJx\nSG9vWFh5NDluKzlQTnh3cjlUOW5RYXMKfOUdWQoAyFMFltYIt2lwjyUQLsr7BEyV\ny35DGau+yZiZPhxmGXPU09y+zmlyjXj3njIgsUkDTOnTJVvPmm4iJw==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnZE4vdWdIZnZ1OGVhK3Zo\nQ29jcThwSnkrZzhoWU9kR1l1Uzc1MC9CMGg0Ci9PQ21ndVpQNGwyRDVuZFpWcnRx\neDVTMWZCV0FOWjh3K1l0MC9sdkxkKzAKLS0tIHRoOE53NWdnQXNBWEFDTFp4U0pP\nU1djU3NoMUVhM3cvT05kbVVPSHNHNTAKZ5MR2SGFvr0lU2FvxsqveX3PPk8B3aXJ\nQgNIg8chqVpycYTU4tLMBUUHFinX1e5WueBWOnd8OrBowMmb1UZtbQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuL2lOMmt4OVNkTEwwbmtI\nY3ZOb3A1andqNTRKcytoVjQ4OEY5M1lJL0NnCkR5RC9DYVM2c0hSaGpEbHVZWjNQ\nZ2hjaHk3WmhZSXhjNzE0VVJheVNTS2sKLS0tIGU2V1FqTjZ5YUFqL0pSd3U4bHNy\nUW9tRFc5Ym9wam4yNDFLdDN6V0w3ZnMKc5RCncbzmEKdAjaYFDq5UALIYkkszrwu\nBKlaUqpJf78muazrIcDZkaFtlZGWRjwE3d78e97ZJLYigi81Q8xRRw==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2022-09-26T01:02:52Z",
-		"mac": "ENC[AES256_GCM,data:Rq50r2L4ABsmblGfeWI/9/nN6wvsX1Nz+GaAN3ph/8ScrzMhy/l8sMZhthaNGn1ENC+UMhuakgwwgwKic0Ut8Y+cS5ZazUWH5M9pqINEtdFYT+wZrw9dGaeEISdROxa+/oknAXeaRb8LNQKpOTja7/Lj0NidnrpOoqzv22ZVWGE=,iv:9tR8K89thHaJd5LFEmBtCAb8FjSYwbsETJjeNSAbUnM=,tag:tLBDl4+LGQY0MvDgTv88vQ==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
-	}
-}
--- a/secrets/universal/net/home-shared.psk.bin
+++ b/secrets/universal/net/home-shared.psk.bin
@@ -0,0 +1,48 @@
+{
+	"data": "ENC[AES256_GCM,data:SFlFGQxJUdMADvYgSMRB3zNsC8f3FmUbFtVylyCRt20T0ZBzxmkfApdPcpok3lXAKJ+EC042Aac9zEJU,iv:fxEsrF543nRrkfriVgdhUSJMi3FhXNTMwK4+4qzSM+w=,tag:fygQgjcedtPCZfdMOHnuEg==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvNzNHZWcvTmVVaGFabUU3\ndnZwVFdVcFBXZkoxTFA5WEZMMnRvUDBsS1NrCnRKUTNDZExFL1drSjBTakw1VmZW\nYWJzTUtVN0lrWXdiRk9QaVNmZmRqSjAKLS0tIGtHTzNUUnlnU2duNDF6UUlzUUJa\nSXhxQmRXZEZKK2htenF6N1kzV1VvancKP8jZotJe9188kId6cwVzITNwtELegpzi\nOKrWPWuIveSdMGmMsRDAcQbL0xVN0qd+Y4qsZ9l6e+cVAT3cHb1vDg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLemhLZUwzSVJLNUhYQXQ3\nY3ExU1BJUzY4a24vUjRmazhtc1RIcVpyem1jCmFEVzlIZkxjSUc0RTdqQWRLTGNS\nL3FaRFhjdnZqNFk0WDFSY0xOTENxMkEKLS0tIDVzK1lPM1FlWmZLZFA0ZDlPKzla\naXRqTk90aVNTRHlNZ2FmcVY3b1JKbEkKTu8tiEKyab1bOsgdsRlEWeG9wzdg/d/s\nPfh7rnvf7Ex8Jl6qSq6xMPkv+19EbSpfSq0FRtCue/Wcce3cUmGToA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyZUY4OW5UNXFjOXQrUklu\nK3poU3RNVnBtc251TmRtMGJ6Z0ordDFhUGhjCms2a1o1Z1plNlpwSlYrUEEzRDZm\naHdEVVIzRnExNVhzci8vN0ZIODh3QzgKLS0tIGUxZ2gvbGM3YnMwVXU1RnNOSlBO\nVE94UFdKaDkwbmV5YjlBWm9ZZkk4Q0UK6CaPAtRrXKUzR29ZfXV8MvqszTu8LkT2\nQPlNJ4ckgTyivyseukR8X5fPKrrXIVtE+C6Xk5mJ6nGKD+oLprhpag==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUUk1yL3dLUnBpNWNxMzQw\ncDdVa0szNjBVNnNXdmZwNVNEK1RwUzJTMlhZCm9oV3NaZ3k0SERKMEZCQTRtRUI2\nVmdzWndQT1c4UUh2MzQyMEErdm96NG8KLS0tIG1aUElzK2VjUTNYOGRpbkpZTDVz\ncG9jR0VzNi9jYmdCTU1qMmJtNFNUaU0KkrIx2BKjj7l+52Kk/L8rNZYAsa87z9UH\nDtxhLTnQu8DPtm5o2sbGdEZgt9qKPJiylLNKVne3EyscMaehdB17RA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUSUtONWlzZ0JQbDB0L1FU\nWlhCL0p4d3lpamg3YWdIUVhDc1hVRWR1MVhFCkdZbEhnUG0vYTJVZnphdTZNSXBW\nVGdpemc5Q3hSenN4V09ZbTFOK3kzK0UKLS0tIG9ZWkdSMHhzTGJleFF5L2RsdUxK\nSEdtSlB0L2d4TTVWcDJWaE13NjFiTkkKWgfem58/ZKqVaXiL0UGVTjA7AhSkD8Fq\ne/i5HKN1Pvgv8TVPnZ9mtGP2gwwkoFYgxM8/0jBjJUm4QDbTkocVJw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNR05jQnJZZDNndmZnOVNO\nRFhVU3pLUzBxeC9rQlRoVWFCN1Y0bjhBM25VCmJKSzhkMjF1L3pGRjZmOURNeUZE\nTU8vN2pYVmZzdWdpaVdqcXloNGhTSlUKLS0tIGovSG84amhyTFZHZ2FNdTl3SzJj\nN1dObkd6K2J0Y2Q5bG5DR0VaUk1uSlUKxShDW7BD6sENlFjqp7/wFbV4g4gD7u5d\npidF9F+vXhpoBIwLlhruzvwyNXG4hQcKfWCnliXhVvNYbgaooDDhRw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1MkJ1RkVBeHJnR1FGeDVi\nN0htdHZ3cVNCcTJabnlkSUQ4aHUxRndvbVhZClk2d2ZRTlJIVTg1T3dkKzdMRXJt\nNXh5OWtud3gvNWNkRWI1UE1kSytYOUUKLS0tIHhhQVpmRWtTYVFjSUN5aEVYWDJx\nS3hDMlFkVGQyM2U5QjlJMko4OGRWdkEKG98s0QVSs1o4MQ9937okXDS4WH41S1Aq\nUSL8idmlPUJzgdHshuLv2Ic2RXVjJu8V508trO8bTymrqkNAQ0miMA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAraXJQOHR6ZzE5TjNQYmpB\nSStEQS9mcUpMSXlFQ05DcllFSjNOT1pWdVJZCmtSL3FkZ2Q1cU1Fc1dZbG13eXJC\nTXJkN0NzWTlDOEFMRGNQUG5HQUNUVDgKLS0tIGRwcmVxS0lNQ09GdmxKY2pkQ2Yz\nSkpZam1ZQUN1L1FZZ010ZlhUV1N4VlkKqsFAE+xZ24IMzIFjbsgANdjiGwVZk5rq\n66y00bjw+uj6WOwQuE1I9WcYDhCXEUQB9u4Q+hzejaFzCJ90N/WF4w==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2022-09-29T11:30:17Z",
+		"mac": "ENC[AES256_GCM,data:x0pSMtOrID2h1E0PgEHLBcESOYZvkJE07UpCK+TN3zqMfyUFoDRK/Ro335QZXekQ7VSdSKFj/al7bpgscYO+ZXHrCHoFIW/HF6YSOKRzobVT3SXP0e9u/1BpGQW8qtaOVwWb0M8jpgoJ7W+OwzgMHIU9DW3NopfxZy10al+48Tw=,iv:JiA8z9MWEM68Eqip0Bp7xQR65Lu12dhWZFvH43vbABA=,tag:LyIgygW8Cr9VCxs/aKoXGw==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.7.3"
+	}
+}
Author	SHA1	Message	Date
colin	469aa50b64	phosh-mobile-settings: fix .desktop file to display in phosh	2022-09-30 20:58:48 -07:00
colin	6dbd107a07	phosh-mobile-settings: remove unneeded gnome schema refs (for real this time)	2022-09-30 18:31:27 -07:00
colin	ffcc1ab49a	Merge branch 'staging/phosh-mobile-settings' into HEAD	2022-09-30 18:29:21 -07:00
colin	f78b06bc88	phosh-mobile-settings: remove the unneeded gnome schema ref	2022-09-30 18:27:07 -07:00
colin	b88a20b0f4	phosh-mobile-settings: link phosh plugins into the plugins dir	2022-09-30 18:21:12 -07:00
colin	56f484f460	install phosh-mobile-settings	2022-09-30 18:21:12 -07:00
colin	151fdad014	phosh-mobile-settings: init at 0.21.1	2022-09-30 18:21:12 -07:00
colin	16371a37b9	upstream element electron update	2022-09-30 18:10:18 -07:00
colin	034f29a897	phosh-mobile-settings: link phosh plugins into the plugins dir	2022-09-30 18:03:20 -07:00
colin	ef2d58a5a2	install phosh-mobile-settings	2022-09-30 17:19:08 -07:00
colin	b109bc5586	phosh-mobile-settings: init at 0.21.1	2022-09-30 17:00:05 -07:00
colin	434b299eca	element-desktop: upgrade electron 19 -> 20	2022-09-30 16:17:17 -07:00
colin	40e7a12ea3	flake update: mobile-nixos: 2022-09-27 -> 2022-09-30 ``` • Updated input 'mobile-nixos': 'github:nixos/mobile-nixos/1164f6bdedd68c633c1ac03bf64484bc586a709b' (2022-09-27) → 'github:nixos/mobile-nixos/b082416ae3169e00552b8b0933c9f38ae50f181b' (2022-09-30) ```	2022-09-30 14:51:51 -07:00
colin	77579733c6	phosh-0.21.1: point to upstream PR	2022-09-30 05:40:41 -07:00
colin	861defcc6e	phosh: 0.21.0 -> 0.21.1	2022-09-30 05:17:48 -07:00
colin	7d62212c24	moby: disable nixos documentation it slows down the build too much to be worth it	2022-09-30 04:44:29 -07:00
colin	120bb23f3c	flutter: fix hash (again)	2022-09-30 03:55:42 -07:00
colin	ccb442c875	flutter: update hash hopefully it's not too instable...	2022-09-29 20:23:34 -07:00
colin	aa5fc023a9	Merge branch 'update/nixpkgs-2022-09-28'	2022-09-29 18:14:44 -07:00
colin	487dfd3378	sane-reclaim-disk-space: add `--fast` flag to skip rmlint check	2022-09-29 17:54:45 -07:00
colin	2180361eaf	update nixpkgs: 2022-09-26 -> 202-09-28 ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/62228ccc672ed000f35b1e5c82e4183e46767e52' (2022-09-26) → 'github:NixOS/nixpkgs/854fdc68881791812eddd33b2fed94b954979a8e' (2022-09-28) ```	2022-09-29 17:16:17 -07:00
colin	d6e34c6e98	net: rename encrypted .psk files -> .psk.bin	2022-09-29 06:12:51 -07:00
colin	10c7a8d779	delete old network manager files	2022-09-29 06:10:35 -07:00
colin	3184c6cfb6	net: switch to iwd for better experience iwd, v.s. wpa_supplicant, has smarter metrics for choosing which wireless networks to connect to when multiple are in range.	2022-09-29 06:08:33 -07:00
colin	26c8d2d2d4	networking: replace env symlinks with sops native `path` feature	2022-09-29 03:33:48 -07:00
colin	13531744d3	element-desktop: 1.11.5 -> 1.11.8 i'm trying to get an element build that works well on moby	2022-09-29 02:04:10 -07:00
colin	4fd9650ee6	nixpatches: update outstanding sane PRs	2022-09-28 16:17:09 -07:00
colin	529e47a5fa	disable the pinephone proximity sensor it's just bad UX.	2022-09-28 05:33:08 -07:00
colin	83b27526cb	Revert "update nixpkgs 2022-09-26 -> 2022-09-27" although nixpkgs-unstable 2022-09-27 boots fine on lappy, phosh reliably fails to start on moby. This reverts commit `ae8d708018`.	2022-09-28 05:31:19 -07:00
colin	570619b097	first stab at switching to iwd (it didn't work)	2022-09-28 05:25:34 -07:00
colin	ae8d708018	update nixpkgs 2022-09-26 -> 2022-09-27 ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/62228ccc672ed000f35b1e5c82e4183e46767e52' (2022-09-26) → 'github:NixOS/nixpkgs/7e52b35fe98481a279d89f9c145f8076d049d2b9' (2022-09-27) ```	2022-09-28 04:18:04 -07:00
colin	b5cab38348	feeds: add Kaiteki commit log	2022-09-27 23:45:26 -07:00
colin	bb7e2ee70a	moby: enable hardware.driSupport not extensively tested, but the basics seem to work.	2022-09-27 23:23:37 -07:00
colin	ae220ab2e1	nixpatches: point whalebird update to upstream PR	2022-09-27 23:21:46 -07:00
colin	050c8d15de	whalebird: pin electron version	2022-09-27 21:42:56 -07:00
colin	af5834c3fc	whalebird: 4.6.0 -> 4.6.5	2022-09-27 21:24:39 -07:00
colin	30ef2b651a	zecwallet: 1.7.13 -> 1.8.8	2022-09-27 20:54:21 -07:00
colin	8d185f1bbc	update nixpkgs: 2022-09-25 -> 2022-09-26 ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/79d3ca08920364759c63fd3eb562e99c0c17044a' (2022-09-25) → 'github:NixOS/nixpkgs/62228ccc672ed000f35b1e5c82e4183e46767e52' (2022-09-26) ```	2022-09-27 16:00:54 -07:00
colin	b1a4fb9ccb	pkgs: remove dead `zecwallet-lite` pkg code	2022-09-27 05:29:00 -07:00
colin	8df4415218	kaiteki: build from github patch instead of my own source tree this helps ensure the upstreaming goes ok	2022-09-27 05:27:41 -07:00
colin	9a6e0b4451	kaiteki: fix vendorHash	2022-09-27 05:09:17 -07:00
colin	90fb89390e	pkg: kaiteki: fix up desktop and icon files	2022-09-27 04:52:34 -07:00
colin	fbc747fc22	home: install gnome-weather	2022-09-27 04:35:16 -07:00
colin	ad8da9dfa6	sane ssh mounts: enable `noCheck` to silence syslog warnings	2022-09-27 04:33:28 -07:00
colin	32036ec45e	flake update: mobile-nixos 2022-08-28 -> 2022-09-27 ``` • Updated input 'mobile-nixos': 'github:nixos/mobile-nixos/09e388c42298fa777caa7738cd8d8d2b6d1ac8db' (2022-08-28) → 'github:nixos/mobile-nixos/1164f6bdedd68c633c1ac03bf64484bc586a709b' (2022-09-27) ```	2022-09-27 01:14:06 -07:00
colin	90107c024e	kaiteki: update from 2022-08-31 -> 2022-09-03	2022-09-27 00:16:47 -07:00
colin	d466c0b942	bump kaiteki: 2022-06-03 -> unstable-2022-08-31	2022-09-26 23:20:31 -07:00
colin	8a6460e1b0	home: persist gPodder downloads i checked `gpo set`: there doesn't appear to be a way to configure the Downloads dir, so just let gpodder use its preferred dir.	2022-09-26 17:56:48 -07:00
colin	370ae917b9	home: persist vlc state	2022-09-26 17:48:55 -07:00
colin	b223a3a20e	Merge branch 'update/nixpkgs-2022-09-25'	2022-09-26 17:16:15 -07:00
colin	f70a62def5	home: configure app associations for .pdf and .md files	2022-09-26 17:02:14 -07:00
colin	7863d12263	nix flake update. nixpkgs: 2022-09-{24 -> 25}; sops-nix: 2022-09-{25 -> 26} ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fde244a8c7655bc28616864e2290ad9c95409c2c' (2022-09-24) → 'github:NixOS/nixpkgs/79d3ca08920364759c63fd3eb562e99c0c17044a' (2022-09-25) • Updated input 'sops-nix': 'github:Mic92/sops-nix/17f009daf09992d2342657f9bd7b44d877cd00e1' (2022-09-25) → 'github:Mic92/sops-nix/912f9ff41fd9353dec1f783170793699789fe9aa' (2022-09-26) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/72bdd03f0d5696412b25a93218acaad530570d30' (2022-09-24) → 'github:NixOS/nixpkgs/ff9793cfd1a25145a7e591af604675b3d6f68987' (2022-09-26) • Updated input 'sops-nix/nixpkgs-22_05': 'github:NixOS/nixpkgs/aee4db5b9eaccd3fb7f16c742685fef9dc355077' (2022-09-24) → 'github:NixOS/nixpkgs/00f877f4927b6f7d7b75731b5a1e2ae7324eaf14' (2022-09-26) ```	2022-09-26 15:41:14 -07:00
colin	2703bda28c	feeds: add some more podcasts	2022-09-26 03:46:45 -07:00
colin	68982b7f2a	env/home: associate audio/video mime types with good default apps	2022-09-26 02:21:09 -07:00