add vps again

23 files changed, 156 insertions, 149 deletions

diff --git a/.sops.yaml b/.sops.yaml
index faa725f..015bfac 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,6 +1,6 @@
 keys:
   - &ivi age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0
-  - &serber age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m
+  - &serber age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v
   - &pump age1tzsvgxaxwvh4874d977fk0z7ghm4mqpm0c80vhxft87dv46p5uesq7mk42
 creation_rules:
   - path_regex: secrets/[^/]+\.?(yaml|json|env|ini)?$
diff --git a/flake.lock b/flake.lock
index 67b2f1e..55107e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,11 +92,11 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -301,36 +301,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-22_11": {
-      "locked": {
-        "lastModified": 1669558522,
-        "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-22.11",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-23_05": {
-      "locked": {
-        "lastModified": 1684782344,
-        "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.05",
-        "type": "indirect"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1713434076,
@@ -381,11 +351,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1670751203,
-        "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=",
+        "lastModified": 1709703039,
+        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60",
+        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
         "type": "github"
       },
       "original": {
@@ -427,21 +397,18 @@
         "blobs": "blobs",
         "flake-compat": "flake-compat_3",
         "nixpkgs": "nixpkgs_4",
-        "nixpkgs-22_11": "nixpkgs-22_11",
-        "nixpkgs-23_05": "nixpkgs-23_05",
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1687462267,
-        "narHash": "sha256-rNSputjn/0HEHHnsKfQ8mQVEPVchcBw7DsbND7Wg8dk=",
+        "lastModified": 1714720456,
+        "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "24128c3052090311688b09a400aa408ba61c6ee5",
+        "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-23.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
@@ -495,6 +462,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -514,12 +496,15 @@
       }
     },
     "utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
       "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0a59281..7522b0a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,10 +13,10 @@
       url = "github:kirelagin/dns.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     nix-darwin = {
-      url = "path:/Users/ivi/nix-darwin";
+      url = "path:/home/ivi/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -62,13 +62,13 @@
         mapAttrs
         (hostname: cfg:
           mkSystem ivi.machines.${hostname} [cfg])
-        (modulesIn ./machines)
-        // {
-          windows = windowsModules: let
-            wsl = recursiveUpdate ivi.machines.wsl {modules = ivi.machines.wsl.modules ++ windowsModules;};
-          in (mkSystem wsl []);
-          iso = mkSystem {modules = [./iso.nix];} [];
-        };
+        (modulesIn ./machines);
+        # // {
+        #   windows = windowsModules: let
+        #     wsl = recursiveUpdate ivi.machines.wsl {modules = ivi.machines.wsl.modules ++ windowsModules;};
+        #   in (mkSystem wsl []);
+        #   iso = mkSystem {modules = [./iso.nix];} [];
+        # };
 
       darwinConfigurations."work" = let
         machine = ivi.machines."work";
diff --git a/ivi/ivi.nix b/ivi/ivi.nix
index 853f1a0..7622da7 100644
--- a/ivi/ivi.nix
+++ b/ivi/ivi.nix
@@ -145,8 +145,8 @@ self: lib: with lib; let
               "core"
               "server"
             ];
-            ipv4 = [ "65.108.155.179" ];
-            ipv6 = [ "2a01:4f9:c010:d2b5::1" ];
+            ipv4 = [ "65.109.143.65" ];
+            ipv6 = [ "2a01:4f9:c012:ccc2::1" ];
           };
           work = {
             isDarwin = true;
diff --git a/machines/pump.nix b/machines/pump.nix
index 4fbada2..87198db 100644
--- a/machines/pump.nix
+++ b/machines/pump.nix
@@ -36,10 +36,6 @@
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
 
   boot.supportedFilesystems = [ "zfs" ];
   boot.zfs.forceImportRoot = false;
@@ -48,6 +44,7 @@
   fileSystems."/data" =
     { device = "zpool/data";
       fsType = "zfs";
+      neededForBoot = true;
     };
 
   fileSystems."/" =
diff --git a/machines/serber.nix b/machines/serber.nix
index fc4bb26..6a0f045 100644
--- a/machines/serber.nix
+++ b/machines/serber.nix
@@ -1,30 +1,51 @@
 { modulesPath, lib, ... }: {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
+  sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+
+  services.syncthing.enable = false;
+
+  environment.etc."resolv.conf".source = lib.mkForce "/run/systemd/resolve/resolv.conf";
+  services.resolved = {
+    enable = true;
+    dnssec = "true";
+    domains = [ "~." ];
+    dnsovertls = "true";
+  };
+
+  # This file was populated at runtime with the networking
+  # details gathered from the active system.
   networking = {
-    nameservers = [ "8.8.8.8" ];
+    nameservers = [
+      "1.1.1.1"
+      "1.0.0.1"
+      "2606:4700:4700::1111"
+      "2606:4700:4700::1001"
+    ];
     defaultGateway = "172.31.1.1";
-    defaultGateway6 = { address = "fe80::1"; interface = "eth0"; };
+    defaultGateway6 = {
+      address = "fe80::1";
+      interface = "eth0";
+    };
     dhcpcd.enable = false;
     usePredictableInterfaceNames = lib.mkForce false;
     interfaces = {
       eth0 = {
         ipv4.addresses = [
-          { address="65.108.155.179"; prefixLength=32; }
+          { address="65.109.143.65"; prefixLength=32; }
         ];
         ipv6.addresses = [
-          { address="2a01:4f9:c010:d2b5::1"; prefixLength=64; }
-          { address="fe80::9400:2ff:fe53:8544"; prefixLength=64; }
+          { address="2a01:4f9:c012:ccc2::1"; prefixLength=64; }
+          { address="fe80::9400:3ff:fe46:c7bc"; prefixLength=64; }
         ];
         ipv4.routes = [ { address = "172.31.1.1"; prefixLength = 32; } ];
         ipv6.routes = [ { address = "fe80::1"; prefixLength = 128; } ];
       };
-
     };
   };
-
   services.udev.extraRules = ''
-    ATTR{address}=="96:00:02:53:85:44", NAME="eth0"
+    ATTR{address}=="96:00:03:46:c7:bc", NAME="eth0"
+
   '';
 
   boot.loader.grub.device = "/dev/sda";
@@ -32,13 +53,11 @@
   boot.initrd.kernelModules = [ "nvme" ];
   fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
 
-  sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-
-  system.stateVersion = "23.05";
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
-  networking.hostName = "vinkies";
-  networking.domain = "net";
+  networking.hostName = "serber";
+  networking.domain = "";
   services.openssh.enable = true;
-
+  users.users.root.openssh.authorizedKeys.keys = [''sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIPZHOBNQdo5oBnQ8f147QtelhLmYItiruoNfoHF89qrJAAAABHNzaDo='' ];
+  system.stateVersion = "23.11";
 }
diff --git a/mut/neovim/.hotpot.lua b/mut/neovim/.hotpot.lua
index 118f0ac..4accedb 100644
--- a/mut/neovim/.hotpot.lua
+++ b/mut/neovim/.hotpot.lua
@@ -1,6 +1,6 @@
 return {
   build = {
-    {verbose = false},
+    {verbose = true},
     {"fnl/**/*macro*.fnl", false}, -- dont compile macro files
     {"init.fnl", true},
     {"fnl/conf/**/*.fnl", true},
diff --git a/mut/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl
index 05fbdac..d2d4929 100644
--- a/mut/neovim/fnl/conf/init.fnl
+++ b/mut/neovim/fnl/conf/init.fnl
@@ -112,7 +112,7 @@
     { :workspaces
       [{
         :name "notes"
-        :path "~/Sync/my/notes"}]}))
+        :path (if (= 1 (vim.fn.isdirectory (vim.fn.expand "~/Sync/my/notes"))) "~/Sync/my/notes"  "~/sync/my/notes")}]}))
 
 
 (do
diff --git a/mut/neovim/init.lua b/mut/neovim/init.lua
index aaa1260..bf643df 100644
--- a/mut/neovim/init.lua
+++ b/mut/neovim/init.lua
@@ -1 +1 @@
-return require("conf")
+return require("conf")
\ No newline at end of file
diff --git a/mut/st b/mut/st
-Subproject d0cddd9c9e004f794c3bc5d63b1bf1ef7d964ef
+Subproject 42ad74281ace2c9ae385a35d65c51d4cae4fe47
diff --git a/overlays/suckless.nix b/overlays/suckless.nix
index c92cb70..f49357b 100644
--- a/overlays/suckless.nix
+++ b/overlays/suckless.nix
@@ -1,7 +1,7 @@
 {pkgs, home, ...}: (final: prev: {
     st = (prev.st.overrideAttrs (oldAttrs: {
       src = /. + home + "/flake/mut/st";
-      version = "0.3.1";
+      version = "0.3.2";
       buildInputs = oldAttrs.buildInputs ++ [prev.harfbuzz];
     }));
     dwm = (prev.dwm.overrideAttrs (oldAttrs: {
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 3788da7..9434fc5 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -5,8 +5,9 @@
   pkgs,
   ...
 }: with lib; {
-  programs.tmux = let
-    cfg = ''
+  programs.tmux = {
+    enable = true;
+    extraConfig = ''
         set-option -g default-shell ${config.ivi.shell}/bin/zsh
         set -g status off
         set -s set-clipboard on
@@ -38,13 +39,7 @@
         bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
         bind-key -T copy-mode-vi : command-prompt
       '';
-  in {
-    enable = true;
-  } // (if machine.isDarwin then {
-    tmuxConfig = cfg;
-  } else {
-    extraConfig = cfg;
-  });
+  };
 
   hm = {
     fonts.fontconfig.enable = true;
@@ -119,6 +114,8 @@
     '';
     };
 
+    programs.alacritty.enable = true;
+
     programs = {
       zsh = {
         enable = true;
@@ -306,6 +303,7 @@
       enableSshSupport = false;
       defaultCacheTtl = 34550000;
       maxCacheTtl = 34550000;
+      pinentryPackage = pkgs.pinentry-gtk2;
       # pinentryFlavor = "gtk2";
     };
   };
diff --git a/profiles/core/syncthing.nix b/profiles/core/syncthing.nix
index e076d8d..b736379 100644
--- a/profiles/core/syncthing.nix
+++ b/profiles/core/syncthing.nix
@@ -6,7 +6,7 @@ in {
   ];
 
   services.syncthing = {
-    enable = true;
+    enable = mkDefault true;
     user = ivi.username;
     inherit group;
     dataDir = config.ivi.home;
diff --git a/profiles/homeserver/acme.nix b/profiles/homeserver/acme.nix
index 5092d63..1880db2 100644
--- a/profiles/homeserver/acme.nix
+++ b/profiles/homeserver/acme.nix
@@ -2,6 +2,7 @@
   security.acme = {
     acceptTerms = true;
     defaults = {
+      extraLegoFlags = [ "--dns.disable-cp" ];
       extraLegoRunFlags = ["--preferred-chain" "ISRG Root X1"];
       email = ivi.email;
       dnsProvider = "porkbun";
diff --git a/profiles/homeserver/dns.nix b/profiles/homeserver/dns.nix
index a93425d..917c8bb 100644
--- a/profiles/homeserver/dns.nix
+++ b/profiles/homeserver/dns.nix
@@ -23,7 +23,13 @@
         name = ivi.domain;
         stub-addr = "127.0.0.1@10053";
       } ];
-      forward-zone = [ {
+      forward-zone = [
+      {
+        name = "_acme-challenge.${ivi.domain}";
+        forward-addr = config.services.resolved.fallbackDns;
+        forward-tls-upstream = true;
+      }
+      {
         name = ".";
         forward-addr = config.services.resolved.fallbackDns;
         forward-tls-upstream = true;
diff --git a/profiles/station/suckless.nix b/profiles/station/suckless.nix
index 2814b8c..cbbf7df 100644
--- a/profiles/station/suckless.nix
+++ b/profiles/station/suckless.nix
@@ -11,11 +11,11 @@
     xsession = {
       enable = true;
       initExtra = ''
-      ${pkgs.xorg.setxkbmap}/bin/setxkbmap -option "ctrl:swapcaps"
-      ${pkgs.xorg.xset}/bin/xset r rate 220 30
-      wal -R
-      dwm
-      dwmblocks &
+        ${pkgs.xorg.xset}/bin/xset r rate 230 30
+        [ -z "$(lsusb | grep microdox)" ] && ${pkgs.xorg.setxkbmap}/bin/setxkbmap -option "ctrl:swapcaps"
+        wal -R
+        dwm
+        dwmblocks &
     '';
     };
     services.picom = {
diff --git a/secrets/porkbun b/secrets/porkbun
index 07fc4ec..d21f11d 100644
--- a/secrets/porkbun
+++ b/secrets/porkbun
@@ -8,15 +8,15 @@
 		"age": [
 			{
 				"recipient": "age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0aW1UQzE5cHFQWFkyQjl2\nSTZaMHAxUlJ5MlcxVlRZallIM0F6ZEVXOEE0CnVwcXZKZ0h5Q1JnY3dwbFQzYWsy\neGlpNmpnZm9icmFYcGg4V0Urb1Fid3MKLS0tIFhWc2NaY0xMa0VLR1d5UlpzcDdE\neGdOTTU5Q3VDU1lLdnY0VzU4K2cxZGsKzCHLyTGTOwct6qH6jy+iXyY9UArBvvPk\n7Z+6dGSE4z/qsrRmzWpV6M66fl0gaNVDgXDPP5lNzI966zqfnQ4Nog==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvVk1tczJNTUI4Y1lJcFJz\ncTdYRmNyQk8yeWcwM3VTamJ1RWNlVWNxWFJJCkZQenp4WDhDZTdKNkNPVW5XWlVR\nSHRISWJoZExCaWNONjNacHl2K2pWckkKLS0tIG93M2J0ZjRxWGJtZjg0d25SZWxE\ncFdnQ0RicDgwSlNtUWVJQVQvSjh0RHMK2V/MG+0dppLnuk+IMe0hzaIZu/2jKjzN\nW6rl6PYgQ5szCrZC8iPa5LZZxNCKsmNAOR98J/yFSC3TU6x4RFFu+Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4NUJXTGcvbjhMVFVSU1ZS\nT1VsVTdLVFoyNVhoaEpjM21XQTZTL1F4cUJRCnIrYmpacnJyNkRCajgyVktNSTVn\nR1hXV2FNREp1bzFvNHZmM2h5ZGVTNlUKLS0tIGVPSE4rWFdjUkNlWmlJeGZWOFFN\nMmo1cnYyQzBUaWRxOUd2S1VlblFHNHcK1g4+wF4CWS5Qc/jBwGfKOEhhh6tx0434\nkwPa0GeXM/LKBwE9YH4gZ8eRx3SrEikzp+55dy+FsLbXiI1USEZU/g==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoL0tZZjFjN0d0VHl4Z0lX\nV1RRSmRSNEtOK3NVWDB2TzI1SXZpR2dVc25jCmNrR25PQ1JaNG5IQnlXY0V5c0tl\nY0doNzZiVkgzcmsyUTFuTFd3dmpVL00KLS0tIEdxY3JGenIzenNIeHZYb1cyaDRY\nNHoreGxxMEpQS09JNmhmdmpsaU1nYzQKgJi/yxe4gaVu6fM2JMkKE8TgF/vbJ4Nr\nmUORdA23xXVlwZO6iE+T/REnmSrnBnOtFgMklNLH921MkUxhkPR3vQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1tzsvgxaxwvh4874d977fk0z7ghm4mqpm0c80vhxft87dv46p5uesq7mk42",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYaHlEK2xLTjd3T2thdHU0\nT2JXQnhnMDRkQXlpODkvRnZGbGFsVC9RK2tZCnc4cGd3V0FKNEFwd0NIWEFvdmVn\nM2ozckMxd0tRUld6UFdqNkZVOXc1eWcKLS0tIHFyUlllbU9yV3JSVTl2VG9HUkxG\ncmJKQndaNkxWenFuaEpqRERTa0xUWEEKHuE6nfwKRS7gsbf8IuISXrWanrLTvE82\nnnwDIA4kgt+2sFbgygYhTO+duvMSVkGflc7SjZMNiIm6gklC1A5yPg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqZmpqSERsd3QybmVSY290\nWUUyNkpSUU9UeWFOaGkzK3gwRUI0azVERW1FCmQzSXVZUU1xM1VReHFVK0VxTFFW\nTlpsNkE3dVZrakdnSWFaajRlbzlEUUkKLS0tIFlBVGM0Z3BVaFhGdUUrZVl0UnA0\naGRCUUpwSHg5TmRoa2w5aHlIY25naUkKUlCfzm3WYG0Ua50i1nnjRgzVcMxWrz14\nvaTqnC1SW+/0kbK3HWBQZyrYaUgOYY1zIJGjErvQ1qZB9HlnIef0ZA==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2024-01-09T00:22:54Z",
@@ -25,4 +25,4 @@
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.8.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/secrets/root.yaml b/secrets/root.yaml
index 3bb8ac0..65d5d81 100644
--- a/secrets/root.yaml
+++ b/secrets/root.yaml
@@ -11,29 +11,29 @@ sops:
         - recipient: age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3SXFYYUxwa3FZWjBTS1pO
-            NUgySEFVclg1QXowR2dud1Y3ZmJ0a3BVZDFzCjRxaERzbVloMmZBUEJoeEhYb0hW
-            UGlzNmY5M1lkQmo5cXZtdi91VCtSV00KLS0tIFZqbVNJNkV4S1Z2YStOakIrZW5J
-            Q0YvakIyZW05K29zRDR5Qm1hUzdhdlkKuuQBr5JwPpUy6obJHNSMkTP7eAyNHiNW
-            gTnhkoQkngskhd0evg3jdgip82JxVo/b/nzuih5fHxjrPxMH0aIqBw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOd0xmbldJZ00yOW4wZnNr
+            RlNUY09qYmdzNW9TSnlqQTlqTjYwNURQbFdZCjZmbkVtc2NnWDhtNnZPT0c0Q1do
+            clFvR3ZBc2doLytGZE4wckVybXJUbDQKLS0tIEtSRXJxNlFGKzQ2RWxXZGNEazQx
+            OWVYc0dvaFRJWTRwMkJnVytxc3ljd0kKVvgQlHF/ajIv430u1FPHnh+qct7Rsclp
+            vEIs/R01Hj9IeNkW+MdNT7SIO3TlbDM9rGs10Y+tzB18GlusgC0hsw==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m
+        - recipient: age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpNHJObGJKaEVXWVUvbERU
-            VHFhWWYvdHB5cXVyOEhWRkovTllYOTBWN1RvCkpXWG40VzkvQXRNMmRaRjhLb3pn
-            OWR3ZnpKb2thbmVSc1FRVERGNnRsUjQKLS0tIEh5VFlmTVAwWjZtZExueDJCeWdt
-            MEVqQ0RLVm9BdE9LTE5ZWTdxM0ZXcFUKQglVwJZX+nQ5JwAz+1Oj7uvf7mLrJxZC
-            K6KJCWZItDJ0fx2eQC2fs1IqktZxmWdLlv88meeNfknyUZxm+9wUAQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0alhMK3RSQ1BzdEhXSDEz
+            V3Vob2wvWHIza28xNTMyNVY4UGJ5cmUvcXdFCitKTkZzcXdMdE5HZ1pIK2xxc3A0
+            K202bVBlQUNXVmxyL2VqZnd5elRRaFUKLS0tIFRkV1Yrd0JvL3kvYkFtYXEvWmpt
+            RDk2TGVsOEpoV3JxTEFrTWZCZENNMzAKA3zRgeq5ocuO+q/atXgtn1ijdRQ0eNNe
+            IXkw+v3mJgTq9ukgkgmgcbjZvBqKVKm9tDML8XhoBtcCAKFINuH3Bw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1tzsvgxaxwvh4874d977fk0z7ghm4mqpm0c80vhxft87dv46p5uesq7mk42
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBocTJ1clMwUC9NVzUvQXha
-            TVRKQk1NWDhxeDB4MzJmTFFKb3VyYWpCZGwwClloSjhKVWxneHZ1M0xxMkdFZHRp
-            REVRK0FuTUc1S21obFJoYWxCaFZWcE0KLS0tIHhlcnIvSnA1Z2FYNTlITFVYUlpx
-            c3VOK3h5RlU2WlJ1RXVaM25ZRGVMa3MK5vIL3iafMql0xUw4RxmDA562UFbVK9rs
-            sUTxHfOHbZCrdzPqW2rECZTsWeyq+Ay1+z3NkmJTQVhZz6ePiZPD4w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEWVFaajJTa0FBZnk3VFhj
+            anpwaWxaazFtenlrdjRCNmNZeUZtSWowZkM0Ck9rR1c3SS9BOXBoZmY1TERVS1Mw
+            dWRHS3VKWWprNTZZZURzSFRUUkNpd2sKLS0tIGEwVDcweXpRb1dwR3dGODhhTEpr
+            MEk2L1dEMnNOVWtsZmZPeEpYd3lNOEUKgd61tQUwe9bMItjEKzQ3LPoNphM/aYV+
+            gf2yIwMCHXzbY1B5e3zsFyVR1W9x2DhqkXDoehCKoDpFoOz+R8b7Kw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-01-09T00:06:31Z"
     mac: ENC[AES256_GCM,data:a09Hj80Pb2MArNf0qBoQ4u3NDjXjBAuIsJIuMcMopaJOYy8a6Uqy8TqavMLvr94jcYGA9zOSQJ+cfq2EdFwLnTe6BBol0TP0Qonk7GjYXUdviQuiletTDNHhQT3q0WJdDUhbN/6I1CE0zaTts/GV9gWVALtt5wTvtMfw4gSiJU8=,iv:0LbmlKaCvh5p7vh8D6clsVOuI7w2fxap12AYqBXoV0c=,tag:TP6hzonQ7iRW9x0cdL1eAA==,type:str]
diff --git a/secrets/sabnzb b/secrets/sabnzb
index 3a7d33b..66326c6 100644
--- a/secrets/sabnzb
+++ b/secrets/sabnzb
@@ -8,15 +8,15 @@
 		"age": [
 			{
 				"recipient": "age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2c0dEWHd3OEt5RmFNWnZy\nenNaMGRsb0tUK2RYZWVHRmRZakFwUDNBaVNrCktOVS9hdzVDUWI4R0d5UGJaV1FX\nd3FqRXl2MGhmNmpUMHh1ZVFIeUwyQVEKLS0tIGFtYlRKVkVkSXdQaDJiaE9JN2Fs\nb04vSmd3d2xvekpyVkxCM3FwU2NaS2cK28L5B9KzJPR/XFkj5W51nv/2XmaYOQbB\nsZZrnDQOS/3MY7an24aNXgUMKGRhi+dymEupUiUjY6Kc9GpN3O0Jpw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtRkw0SytGZTVYSGpmN2tj\nS1BXU3lnVHlYMFI4TnhReGtGdXZaM25pRGk4ClhNWDhGSHB6Yk9kL25oYlFvaHg1\nQVNtR000akVzdXBEZkR3cTQ4aFlxU1UKLS0tIFNlejdFSkdVTnMxRkJGZUU1ejY2\nZ05GUVFaSzErTGE0MVk4OEdsVEg3QmMK6aiT9L6gSQmA6qLiGWQJ12EZ55/ocVWI\nqsEd7YhgbYrUParORvThuL82yf07L7Rti1sXy9EqWIpMrJkbh/ONTg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwQkk1aFBiYTZaVnFCRUtv\nR1ZUUStoUFZrSkxYZHFkaWdpaUx1b0RDU3c4CldJeDRQdGVmbTdBNWlsRi80c3pR\nWmdKWEZzL2gyeWRGeEI0dHpvVkxCWUUKLS0tIDFZVk0rZnY1VlZkRmgrRElWejgv\nT2NocUFuUWdJUHg0dTRUdS8vZFlJUU0Kh0jragJJUAg2te038Il+DKcq+tabX/U3\nfWXCgjN9pEnWgndguxWdJb/hjAHaADi8ZJpq6F6lym9qxYqNV7x13A==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6R0hzY2M1Y3JCd1lqOGp4\nay9aNktXL2IyeHNmZkhESHp2c3JZRTYwVFY4CjE4bDRsbmFTQXpLVG8wT0p1UFRp\nc0ltQ1NIdzlvaUtWY0xDVzZrcFhKclEKLS0tIDVJMGRtK09OZXREenU1VnNOYWxs\ndktYd2hkMGo4U2k3R3pnbkNlREFuTG8KyT0ZWtnqUKFEiLYTFaIHcHTi+My9aZ6B\n6DHbpR+GwtU16W58rusJ1o/l7L8OffZwxL5EuakCIA36DA75GNDIiA==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1tzsvgxaxwvh4874d977fk0z7ghm4mqpm0c80vhxft87dv46p5uesq7mk42",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSNTZqUzVGblB0TWVuem9H\nSzFPdFZKVTZNZFpXUDBRRHFGdnd0ejIrQVhVCm96Rkhudld1aGpJTGk3N2k1aWhl\nWDR2T1RNUFBPZU5LZzQwK0Q1Y0pLUmcKLS0tIDNycXU0czlaM2lEVVNHNmtPTGNs\nMlJNU0huUkhKeEs5UG9UM2hxNVhEcmMK8Y51YrwKtD3SbnGYegGBcPCaac9GDyL6\n7fwZ7YLr42W0I4Go810U0tN6bVu7T32Ssmh5eTIAHZ/WgM3rPhfu8g==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqWHlUSjdXKzlBN3NHNkZ6\nQnRVbEN4Q0NPeVJhYzIvNTAxKzNUUUw4QlNRCmFBc2FvYTNiYjJJY3M2RG9qcllU\nVG9uOThYTFc1S3ZzUjAvZDNpOWhNMFkKLS0tIEkrV1pqQjFtVHlLTzNZMk1ZVTA5\nMmk4Um5KbXVXZkRIZ20xZU5uNmdtdmcK1Sl/LOiW15mW8DMZPw0nIPrqsSv5NOGs\nVtGDI5DLKVMAejd8dk+fM/RuG1dm1Ao8Qs+2of6FbCYF37KAwg4qug==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2024-01-11T00:28:27Z",
diff --git a/secrets/serber/ivi b/secrets/serber/ivi
index 439c58f..2692d0c 100644
--- a/secrets/serber/ivi
+++ b/secrets/serber/ivi
@@ -7,12 +7,12 @@
 		"hc_vault": null,
 		"age": [
 			{
-				"recipient": "age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvVnUwV2lTUVFtaDhUR29C\nNVUwR1pNUytpNWplQWRCcytTQ0VRSXZ2b0c4CmdadXUvMTJzNXdEUmpiS1JvUFUv\nZWswWGR3cjJ2VENoLzRObkJ0bUxlemsKLS0tIFkzcEZpbEFUOTQzUHhQS1BTYk55\nUXRlOHJYcXAwUVZiOWVpS2tUYTkwcWcKCTrFi+TW9Xmcntzu2Jw2IdxxO4DxdJ2D\nntBIGeaiQR4Q2fn0hHdn7DZPJuPy4sNNIoOtpK5a7eZye/zDbQqCEA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGamJFMm5xZ3NCTFI3c1pC\nMnQxUnhBTUhpMEVUa2dhMnFBVXB5clJxU1Z3Cm16a3hPMEhVeXRoZHQydjZXRjZC\nZjdKYndwRlZ1cWZYaFNJa3VKVTBpNDQKLS0tIFBaUS9pYVRxSUo2YUhpcGthb0ZQ\nV3QyQTZCWCtZSnljeTdYQnpBdXE1YncK8hSuccbmqav9p4SzRIJXHqfxMon+1/YS\n4bWoK6v+75iatFrl9s6p+Z2Z7k8adFLVNoETXvpMHNZXQxCa/hg1Kg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjS20yQ1ZqY0pyN2VweWhl\nYjJqQW8yYVFhS2c1QW1NZ3QvZ3liMVpHRUJnClpPS2FLakhyZ1ZpaDFmdmZpaGZ1\nNlExS3FqVlZWVGNnalY3RDBaclExQTgKLS0tIERQdWFZc1loUjg0MStOVkM0U0oy\nbEYwRStwVGF3azQ0NEpmU0srdElQODgK/wSfMo4OvwyC4QonKP7LNn+c0WGTVLmr\nwBYZkaA41Pom6sZ21u3BpAR4/hfGvsteAoKaNjY9CffDssmfsvAOjw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjYkZOT1lTQTNqZG5odXpL\nbTJyWXBrclRqZ2FqeldZQTZiSHhhbWYrTld3Cm5kVlczcEZ5TEFQMzZlQnoxa0hL\nR0JJcUdxeThUWFhyVE5XSjV1VnNMUkkKLS0tIDNCUHdGa2hvSkF0S3VZTy9vZzFh\nM0VjRUdHSEdwZmF4ZXRBMlZicDc1eG8KgqOoSiW5LnJrg7GkcDSiXCKsS7NejTpl\nhodvS9OdiV/T5xhkhzFQXj7rgTbVw3wAk22LvymwHKBD5DWpN16Vyg==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2023-10-19T19:27:04Z",
diff --git a/secrets/syncthing.yaml b/secrets/syncthing.yaml
index 8276d38..fc05fb9 100644
--- a/secrets/syncthing.yaml
+++ b/secrets/syncthing.yaml
@@ -1,6 +1,7 @@
 lemptop: ENC[AES256_GCM,data:3dmcPh8EtBYe2KQQ1HMddLey5Qdhtz7kGvMFZaqidMZ099ycd+EnXrHsJIRHoWFrGsRbBs6vgWytKX49JBcrl5im8u7Jw6AbFtCh81XOau8+EaKD+Z+uynRhbJ31y+AH5MTGIniM+7RviGUDeBM8oZAvtazbaiswckFkR8HrJ8WcGOi2xkq+HY/OIqTnBpy83Q7A0oD6YPfNjvFJUB0LJFU/mYfrbmADEkobeKQz57sHc22scjrfszWmxcgcjrriuqRReucClU9uQ3GO8bEMvWFT7epjZAkwht7Oq1K2U17kt6xsrqTWRPNwQsB3P2w7i5YQMBnGAtz0b9VC5hH8GyZJGBFLRkk0fzxhUL9SXRid2wvTKrCAoMnjWTCw8K2D,iv:ojRT/RzCcxQlGh2FFz5tdUYOq4bekGcmE8Hm9tUSrDg=,tag:jd/g0vpTCOmf2EdQCcpcZQ==,type:str]
 pump: ENC[AES256_GCM,data:2Vu1idorw/kMsDThT2ywGmdPMgQdDHQItpZRukpdiapcKxMa65U/AQzshkbuQVTN5AaDkMNnLQrrLt8qQY0QxhTpddc4+y1kLaVAE5G+8di/2GJiGKUAjHOwyX72BXqjkAYOZ6u96PThOs3PmyhHhiH5ge9ZpOh1zOG2CD4dzoMLHHPHgSv8NLuhZ3kuc3yE3a/YgMgs9NjCvL44Pks8ktVq9DZAJfJB+eRGJPA9k6sN1NP1vMW9RKnk6dI+ZwOz1OHnQvfyVqe/vJxG96m4ALq4oeqn003+me72GB4DO9GLx2IkAsK0Jw9ZoiiJDSfEMVGzhH348mZXfAsTTb2coN9+834V5tBIT9OVDx+cJfHF7+7sm1FHH+fkzbteSH4q,iv:2IY08X5IYjGPEEZYqB/Sa8B1GOkURQg8nqgRwgTJs5c=,tag:ey3TMSDpt5xuEB9eH1ylOw==,type:str]
 work: ENC[AES256_GCM,data:Kfw00ljs0JUEMET3Ii+pQwdNAe7A49oZUB+f5+rKU/doKqW5KC5T4vRV+AY2xIle6Gz2qQI4tN9ffdFZnKS6HvS/aoSnPwSrZo9VYyyBFlhcEwqfdhtzspu+oDkz6EQtqOxZAqzKP5mEPN5YRT0FWTWT99oYtXEHtuG7h80ivZbnY2gjQgkGGieq/c2TDVotS6Av/ycUd5ZQrd9iNXgeuHuQbfLF7/xhOZweYgcDuTqcGNaPdz4y/TRWQa05VkhkcByvHZ+6fG8SkZ7RjUuRsAC5D6ErJqqQmRznOZ6E6RElLWZdkIr2ahXtdU8t7VCDsInA8ua15V2vTEcVNoNYRFjDCAx3lbgO0pelHUno1bwXah6YFEPCMqlieSOMtT3p,iv:jsPrGHem6Qq87/ePRjGLcPWfAqWcy13yNCuZjN2I8pw=,tag:ED7trfDcmuIB/ljyqPMB8Q==,type:str]
+serber: ENC[AES256_GCM,data:iQTU+w==,iv:FbnGkujV72nsFIk74CerwT7dxmHPQNuSMFx4vesR5gQ=,tag:xCsJYRRYwhD5r5kf2buOTw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -10,32 +11,32 @@ sops:
         - recipient: age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwbUpEZUdYcFBnTGpBV2tj
-            S3krRktPSGhNQzZzckVNNnBnNk1XNUc0WlVrCnk0UTcvWlBkcys3YnBXSlBZTTYw
-            U2I2VWtoOFJrLzM5YU9MWGRRMTIrK3cKLS0tIGpTU3ZpcUEySmV5NEU0Zyt5U0NG
-            VWJBNUN4TWpvSERKaldodndkUkExTnMKMnp+JKihjhpiJVasD4eh+DK74Bmz1UdD
-            qGhLTZmRFnLTARQW+ozeOalNTtB5SdMgwsu3ewbb1eAUp9YcN8yuPw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHU0hJNjJ4cVAvSGpjZkRa
+            aGt2TEpOaWhSazM4dWwrKzljcUtVdDBqUVFjCmVQcm5OSWJzSG9ibmp3U1lYdGVv
+            SFJML0p6UTRBR2Vncng2dlJ0eGcrencKLS0tIHZFMmt4M1hoYTZEdjZzMU9FeWFF
+            Nk5wWnlrZEZzYnVEbzlFcHNKSkdWbUEKN+daKhXayvBqMbSFnGzTwhaM9ux1x4zd
+            LUN4ocbYWmCcJ2CQZS5X4eJzuN9GKcw2eIrbf6SKgexDAvZWgAbOdA==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m
+        - recipient: age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHbFVmbGlqSzFHQm94ZTZW
-            Z3F4TkljY2dRckFuL1NoYytHTEhKV1YydlZZClpYaFB0bU1QSmMvNkdhOVFYci9X
-            UVduQk5IWG9TNy9yM1lzOGZaZzhIc3MKLS0tIGtROEd3c2pIVUtqd0Y2MUtMZUk5
-            c3F2QmRqRGExR3Z6REF4ZGp0NlZwRGsKWKI5YTuSYpSafW9VRfOgBOai11cGWQ2U
-            FOIKHinuvRQtHCGWTE5NMRpYYicNIJJ4w6a0q9p+1jTJ2xP7sgAOiQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSeXBMTE84U0RndFhLMkZ0
+            a1R4ZDdrcGxQc0JQM0Z1Z2JucGxpM0tRZEFZCjVSaTRNbnY3M3VXR2wrdjdUc3pI
+            Vi9yWkJZenE1clNQdzdKZ2k2aFFUU0EKLS0tIGxZSTlxRWs4d2FHbWgzeERHYmVz
+            Rlo3aUZRN0J4QzZvK2E2SUcxVWF6R1UKzyCkTzozx1H/9jyLhlTBda5zb9sCFv28
+            xz22HqPQKJNwoj6dzHlrfLYyursBFQsnIGmNThoKn7v2RXp5xe2RQg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1tzsvgxaxwvh4874d977fk0z7ghm4mqpm0c80vhxft87dv46p5uesq7mk42
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjaS9yaDV3dHNOQmVNd002
-            emZoU0NuaUNUckdBV0FkTmpaSGM2Zlc1QUVVClp1bnZvWVRrTUhVS1FHRWl6T3BQ
-            YTJPalpYV3BlaDF5NVAxZHkxaWNSUDQKLS0tIDl2NHhwSVdpWGloMjNSTnk0UDVG
-            L1J2UnNuT1pFTkJFL2xvVTA2Vms2c28Krpo5CfIjPvPq1zduh3CiALLsCtjkx6Hv
-            py/kzJ8BGgTiwP25WfP62nhIctU/G3kLHhFf6eppS6asqsK/fRSwtg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsTjRSQ1ZGQkN3QzZoN25Z
+            Vjg5WlRJakhsSnZEYkthU3R4WUZRMEdacVZVCjdLcEY5QXhNS29yckQvOFlUWlR5
+            cmM3dHR4ZllqMGhiTGUvUTk2V0sydlEKLS0tIDBGaTRlT0h6ZHc5MSt4ZERickE4
+            WUUxdCtNbHhtbWo0NGloY1NSMHFEYzAKZG5k7qu7N4SyUogiO+qDQIoEXcT2B4zQ
+            L7bA4NDUJBFNfekX6R/VWTuOdPHHIZkcbjEj79iEbFSo4DBeSOatRw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-11T17:26:59Z"
-    mac: ENC[AES256_GCM,data:bPiEENY5iGWOTSwbeBX67ztTbUn26kkt4y/4QTMEjES/kfbPdlpfIXGGPTV0QSfsWAJuKWUPLnTYAMpoHDc9i/F7xTANadrbco58iPv75g57ShpTvOj4HrtY0XQ23xTDkA92iqPv9A+ahcFoc38LEJ0WTjm6fenEFzj2dtcTLI8=,iv:iMqBGjCVdGj4RnDBr29wJDq5LKueqIPazKTsuTWQ9y0=,tag:9ae92gQeoFiRa155/eNqCg==,type:str]
+    lastmodified: "2024-05-04T15:28:12Z"
+    mac: ENC[AES256_GCM,data:dZWLIx940OneSMprfbV5gyrKdJngb1mDWEu7kP2UGaJIdFQTiSsg4hlkhZqMb0sG9WIeBuEre3AUmk7a2WudehMzl+WD/fZ/os3nStkY6kHGbnPIO6r2D6YRobtD0WPOFQNXaQ9xdyIByHjeP7hDnlNsIRSDcfmlfYHYLeFY/n4=,iv:hjTLx4kQ5NCrNkUBZTnTaCIaHLbpsm7PmXLTX1msSc0=,tag:jfGqAu9RjvpJllg2lkvFvw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/secrets/tailscale b/secrets/tailscale
index 09f9a9f..eebe44b 100644
--- a/secrets/tailscale
+++ b/secrets/tailscale
@@ -8,15 +8,15 @@
 		"age": [
 			{
 				"recipient": "age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlemVIVGRqb1ZBNXBEOTdL\neVYrSWlCUFd5WG5XNTZUUGN3Rjc2ay9WZlUwCk5iQk9WeklkN3JGZVhmTmZtandw\nTWZnVmtqVlBuY3dkclhpZVRiSytqN1kKLS0tIGRucHRQanZ6UEpXbCtRY21PeVdY\nNHN5L2U4d3hRcTdNN1FySEk2WEttd0kKKR5M+XwV73SQCVj2BjQipy6QU4N7LLKj\ndoPpktkchld4bujb7CbadiRwA4btHty8y8KAdjcVW0vipLKzifQwgw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEVVBpemUyOS83OTczeEta\nSjBtMk9oOU1PTzFkSXVpSjdDQURtaWlDNG40CkFTWTRDZlJwOWJnaTI0STFGanhC\nNUVXRGgyTFdVMmZmZzU1THpUTzIwVjgKLS0tIHpYYWwvZmFuNG9LckxtUmRtVGFQ\nSTZSZnJYMzI5eVAwYTRSVTczZ056c2sKTS5nL2/rA3IrhjTLu8wlQZJYKliglFLo\n7nxiLkuM+WI7XKNDY0yp15vn41H4p53DgmWpfmLVYxzY1uFReDBxPw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpQWlDbUZyMW55TzZzYWVP\nbmE2WmlxTWFvL1JpK1BhdVBtL0ZmMlZhaXdFCjZqcC9FNXpYbmhFL0dzUmRkM2Fz\nVXpwZU5Tbm5Tam1QQ3pYSXZQd1A4UGsKLS0tIFFWZU4rRXIrZ0NHeDFYdzhWTkpJ\nVDViaEhUeEFjd0FrNlFxWTRHSEFmMXcKfRiE7znlNXMD7Mh8ENHqermvXbVTV4sR\nT7OqGnt2cI4a49HnyDpsBjnN2KfPY54p+eayuwIvjJG+kRhWAYG2Rg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCTnV0R2Q5bE9JLzlIZXhI\nVVJBYnFMWTdNOGNhUkpZUWp5WEpUYnV5N2lZCkxucVRldGdZcnpXczE4cnY2Znhp\nVVZSQmxSMGZiWG5DdzNIM0dJc1NnSDgKLS0tIGZJTTdCNE5HRWdFZWJtUlN1ZnRn\nUVFhRWQvZEV5ZHByVkdUQkc2Y2FtL1kKYqpsvYckyfVn5y6Gq7urhbgbK2gSvPl9\nuFPSb9DxK+uhYg/fyAiYngscVqHdtX1fbrR4LN3/klru3i0n9pzJdw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1tzsvgxaxwvh4874d977fk0z7ghm4mqpm0c80vhxft87dv46p5uesq7mk42",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMTU9WVlMraHYxMXE5ck00\ndWRaMTdCSHZwWGg1d2hMRjgxeDRxWXpnZ1FRCkhaQ1ZBT0JIejBpOWswQ01Zb2to\ncTAzdEw2RDYyNmExcTlsTmJCblFTaEEKLS0tIC9Pc3krYjFBM2tneFZqckVORlBK\nNTE1aW1kV3JoUE1uTGtEUW1maUZkMHMKzQFvUGrb3uyTfqz0L/E5SXaIj4tJ1aQ7\n5CR5H5xOR4qemBy66xBO3zYfduXVNSvgNCsl1wHiM5mnmuv1Z8EYJw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTZk0zbGl3cE5JTldVaGU1\nZ1AwMVpod2swejVsVDFjM3VQVEtqRjM1VmdrCnFsRzM1aDVhZE00YnFQTnozNG5h\ndGZYNk1WUU5pdDZkSWZXYVpPekM1clkKLS0tIHZ2SThXMjFTdzhicjE5SE5qd3o4\nZFZPQytCaE9QTUtLaHFHZHZRSkN6cGcKS4+8Y7maCbuwOtjQKc/M4l3w/L6M1ZVB\nFVClHX5Ru6IlfPlfZhjIiWV1IqKExsIJewmAxP9EFMw2y5ex0Qxj9A==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2024-01-09T10:48:16Z",
diff --git a/secrets/transmission b/secrets/transmission
index 71a441b..6016952 100644
--- a/secrets/transmission
+++ b/secrets/transmission
@@ -8,15 +8,15 @@
 		"age": [
 			{
 				"recipient": "age10q9wse8dh0749ffj576q775q496pycucxlla9rjdq5rd7f4csyhqqrmkk0",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZY3pSSVd3UjdnK25WM2hx\nRGgxcFIveURzemlSR1c0L3VQendFWmtUMHc0Cm0wNWpONXVpQTNkTVlTZGROYjVB\nMUZTZEt0UGlYUHFTZ3NGdDF3eDF1R3cKLS0tIFBMcGZTN1FmSjI4dys1alJjNFpS\nUDFSVmg3QjY4VTRHTW5mam13ejV4MUEK9tCEn5hqBPETk+3oOyLoEySNZ9k3zcib\nWUGY+dxgq7ejBlkQUPK4L6flYw6MvGf6IVMmOORkXBjExiu0ElADBQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1S0hRMVA0cTI3QTcwbUJE\ndGdUYUtlQjZKQkJpOGdTUk5WYVgzTGdZRjFFCmw0eTVLaXY3SXZWeEhuK3IrVmNi\nY2RwbEpSVng3SDd1amZsdXlZdy9mbzgKLS0tIHZDTEppeGRGa1dISVQxZlM4d2Iw\nQkRPVWwrdWdpUUpXRDV0Uk5yZWxTbmsKSfQgFfbtqTyhPhoMOYHzObalLAvRhluT\nnMwqYB8A8PXYrVujSbmfJVTPpmCjEm9hLk5Q2wZBEfhGMjhiSdfJ/Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age1vvr5amtuf7cyhsmc8ge8ujlzpuwvwhleqafrjg2e8mcevnq2zs3qzzqq5m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZODVhSHAxVFo4em92MEgy\nOTZYSUE1ZG1BQ3BEajZHNk1KNHUwWVorQVhzCklzdTVxajhPb0dIbTA1ek1MZ1ho\nT3E5VGRHYml0VUZFWTc2SkRiY0VvckkKLS0tIEh1OVYwRTBtbnpnT2FpTnZBSktq\nTE9mNWkyZjJlWkJxT0UydDczTnNqOEUK5D+TDISQRIOz6q7t3zbCM1lqzRcBt3Yq\n8OPVJH2PQ9ZJj0Soy/OfzcihG0YPq+byuCDaCmZR7I9JXhOT/77UfQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age1sjqz54u07jv9ykpmg6s5fqms2jqyxzdwf7q940veapqzuafzr5es9nnl2v",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLQ3NuT2V4b0tNTStKYTR0\nL2dWTFQ1N3lzcktrMy9JeElCanNTcjU2OVNZCnVQWjBMYjNvbHVMd2dLZUdiRWpk\nVHVtZXBqU3AvREM3ZzB3UW5POWpkQk0KLS0tIHFvKy9oRkI4ZFVlTENLK1Brd2ZT\na3FZZUM1VEd3c1ZJK2xXMXRPM1FmSFEKNqpyLR68SgZZd1Yn+89oWEeCsslNxHYH\nXUDImp5gln4bPJw8nzyDdpEtKFutD5CRnUEGJELNY2FyIIJyuqF+Sw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1tzsvgxaxwvh4874d977fk0z7ghm4mqpm0c80vhxft87dv46p5uesq7mk42",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5aUVidG8rQTBvN1UwUG5C\nVlo2MTFrQjAwUDlOcTNpTVlpZTlzVjlJMkhvClJ1MnRvSkowQWtKVHBsblZHQ3Ey\nemNYWUxoSERmdDI5Tjl2T2p5ZjB1aVkKLS0tIERzUUx2ZjhDNk9xSktpblRBS1da\nZWQrVHJxRlFDN1NwY2VDS0RDL21VcHcKYGkO537Iy/x3FQZb2JvA4yCE7l7M60I2\n/8SvsCZeEa+f/ZIk9w6xWwkaMQ1OklK227ixn1tSayVFqnrqfvhewA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFUVFaRDE4U2psU1E1Z3BM\nYXYyaVEvK3pOYk1MbUN4cWZHWllYZW9pQVRrCldUL3dlQVUyaFJyWUNiQmhKQzNM\nMHNPejJJdlVwNk40eWZNdkd5eVVCcmcKLS0tIEtBUUFpWUFGK0dscUJLcGk5Vm1a\nVDBpYjlCK096cGZBYmdoa09xb0x2VGMKUdJpHVXVxl4YysnTwt6mIw28rveDWyKI\n22FLXv5jUsCOYxUSYa5tEPGRhecmc7BXMK24Nnea8yagSBYvzW/Ufg==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2024-01-14T13:50:21Z",