Fix WG configuration

baldur/configuration.nix

@@ -159,40 +159,109 @@
     shell = pkgs.zsh;
   };
 
+  boot.kernel.sysctl = {
+    "net.ipv4.conf.all.forwarding" = true;
+    "net.ipv4.conf.default.forwarding" = true;
+  };
+
+
+  services.dnsmasq = {
+    enable = true;
+    settings = {
+      server = [ "1.1.1.1" "8.8.8.8" ];
+      interface = "wg0";
+    };
+    # extraConfig = ''
+    #   interface=wg0
+    # '';
+  };
+
   networking = {
     firewall = {
       enable = true;
       allowPing = true;
-      allowedTCPPorts = [ 51235 80 443 ];
+      allowedTCPPorts = [ 80 443 53 ];
-      # allowedUDPPorts = [ ];
+      allowedUDPPorts = [ 53 51820 ];
+      # interfaces.ens3.allowedTCPPorts = [ 52123 53 ];
+      # interfaces.ens3.allowedUDPPorts = [ 53 ];
       # extraCommands = ''iptables -t raw -A OUTPUT -p udp -m udp --dport 137 -j CT --helper netbios-ns'';
     };
+
+    nat = {
+      enable = true;
+      enableIPv6 = true;
+      externalInterface = "ens3";
+      internalInterfaces = [ "wg0" ];
+    };
+
+    # wireguard = {
+    #   enable = true;
+    #   interfaces.wg0 = {
+    #     privateKeyFile = config.age.secrets.baldur_wg_priv.path;
+    #     ips = [ "10.10.10.1/24" "fc10:10:10::1/64" ];
+    #     listenPort = 52123;
+
+    #     # # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
+    #     # postSetup = ''
+    #     #   ${pkgs.iptables}/bin/iptables -A FORWARD -i wg0 -j ACCEPT
+    #     #   ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.10.10.1/24 -o ens3 -j MASQUERADE
+    #     #   ${pkgs.iptables}/bin/ip6tables -A FORWARD -i wg0 -j ACCEPT
+    #     #   ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s fc10:10:10::1/64 -o ens3 -j MASQUERADE
+    #     # '';
+
+    #     # # Undo the above
+    #     # postShutdown = ''
+    #     #   ${pkgs.iptables}/bin/iptables -D FORWARD -i wg0 -j ACCEPT
+    #     #   ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.10.10.1/24 -o ens3 -j MASQUERADE
+    #     #   ${pkgs.iptables}/bin/ip6tables -D FORWARD -i wg0 -j ACCEPT
+    #     #   ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s fc10:10:10::1/64 -o ens3 -j MASQUERADE
+    #     # '';
+
+    #     peers = [
+    #       # {
+    #       #   # baldur
+    #       #   allowedIPs = [ "10.10.10.2/32" "fc10:10:10::2/128" ];
+    #       #   publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc=";
+    #       #   presharedKeyFile = config.age.secrets.baldur_wg_psk.path;
+    #       # }
+    #       {
+    #         # odin
+    #         allowedIPs = [ "10.10.10.2/32" "fc10:10:10::2/128" ];
+    #         publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw=";
+    #         # presharedKeyFile = config.age.secrets.odin_wg_psk.path;
+    #       }
+    #     ];
+    #   };
+    # };
     wg-quick.interfaces.wg0 = {
-      address = [
+      address = [ "10.0.0.1/24" "fdc9:281f:04d7:9ee9::1/64" ];
-        "192.168.10.2/24"
+      listenPort = 51820;
-      ];
+      privateKeyFile = config.age.secrets.baldur_wg_priv.path;
+
+      # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
+      postUp = ''
+        ${pkgs.iptables}/bin/iptables -A FORWARD -i wg0 -j ACCEPT
+        ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.0.0.1/24 -o ens3 -j MASQUERADE
+        ${pkgs.iptables}/bin/ip6tables -A FORWARD -i wg0 -j ACCEPT
+        ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s fdc9:281f:04d7:9ee9::1/64 -o ens3 -j MASQUERADE
+      '';
+
+      # Undo the above
+      preDown = ''
+        ${pkgs.iptables}/bin/iptables -D FORWARD -i wg0 -j ACCEPT
+        ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.0.0.1/24 -o ens3 -j MASQUERADE
+        ${pkgs.iptables}/bin/ip6tables -D FORWARD -i wg0 -j ACCEPT
+        ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s fdc9:281f:04d7:9ee9::1/64 -o ens3 -j MASQUERADE
+      '';
+
       peers = [
-        {
-          # baldur
-          allowedIPs = [
-            "192.168.10.1/24"
-          ];
-          # endpoint = "demo.wireguard.io:12913";
-          publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc=";
-          # presharedKeyFile = config.age.secrets.baldur_wg_psk.path;
-        }
         {
           # odin
-          allowedIPs = [
+          publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw=";
-            "192.168.10.1/24"
+          presharedKeyFile = config.age.secrets.odin_wg_psk.path;
-          ];
+          allowedIPs = [ "10.0.0.2/32" "fdc9:281f:04d7:9ee9::2/128" ];
-          # endpoint = "demo.wireguard.io:12913";
-          publicKey = "AY2kVl9Znp79wrgHjmTUX5aagJKay7barD4BcMir5SY=";
-          # presharedKeyFile = config.age.secrets.odin_wg_psk.path;
         }
       ];
-      privateKeyFile = config.age.secrets."${config.networking.hostName}_wg_priv".path;
-      listenPort = 51235;
     };
   };
 

odin/common_configuration.nix

@@ -41,6 +41,26 @@ with lib; {
     # firewall.allowedUDPPorts = [ ... ];
     # Or disable the firewall altogether.
     # firewall.enable = false;
+    firewall.checkReversePath = false;
+
+    wg-quick.interfaces = {
+      wg0 = {
+        autostart = false;
+        address = [ "10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64" ];
+        dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
+        privateKeyFile = config.age.secrets.odin_wg_priv.path;
+
+        peers = [
+          {
+            publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc=";
+            presharedKeyFile = config.age.secrets.odin_wg_psk.path;
+            allowedIPs = [ "0.0.0.0/0" "::/0" ];
+            endpoint = "baldur.bertof.net:51820";
+            persistentKeepalive = 25;
+          }
+        ];
+      };
+    };
   };
 
   services.hardware.bolt.enable = true;

secrets/baldur_wg_priv.age

@@ -1,25 +1,27 @@
 age-encryption.org/v1
--> ssh-ed25519 lC44xg eswmM0Q9AbLRCsQQq1ZlTnFzZAq4m3IjCBYy3GONuH4
+-> ssh-ed25519 lC44xg h0Z/EvkZ17aqQu8cqjBDDdrXdBH1k8hXKC9Ii4svGkI
-s/5WMKPYoW4oflZacxkkLkodch60wMbQdbKN9fIPkVw
+86IeYO7LLAv39TFZxwGORYfwpcS66W/2u+5gzba3nic
--> ssh-ed25519 2L7QNA dkOQottCMaLj1iQSCmiyZpwJdJC/erUNAzf1aXB7RGA
+-> ssh-ed25519 2L7QNA o41vbzjSTMjTW6mH4bqoMHY5ra8lxnAhuQy64f69L1Q
-GEUo6TNwN1jJXBmuEy8iTN3xVYYa1vZJF+tFdz5sEZs
+HGxg//jr06c8EihQ39qV3XfxcGxgPb1tPnPwwhqxUVE
--> ssh-ed25519 sNAOqA 0elrCKGKgQzyBd3mqVxTVq4bboiBJJKYi+UKNS5ZozA
+-> ssh-ed25519 sNAOqA nY+ZqIv0j4B55XWaElHE28ug5+Wedg1EA3+a+MLiEhA
-K71ijRpi7hK2lqxjMF1LUKy0q83FbT1NovmDf+Kkk0Q
++OL9Kifz0RiUtiqvEd5M7efUWG/PJP/VgoPdGHPBUQo
--> ssh-ed25519 13iwjQ tyC3lOXD830cFLGHc/Ae4ZgF2HhHb7iTlbmPQoJ+HBE
+-> ssh-ed25519 13iwjQ oSFqAYxDCeXP9mZoz7c5CnLYumJHoZtOmJpkQio87Eg
-EIgi/nWMEFYIFhxFiZXYFm53Vm/1pBhhRYdru790oiw
+KKSN9FGS+hqHGc6t1CBj0e1M/hqyNGu73OUu4ZEYdCE
--> ssh-ed25519 7MB20A +GrWTCkLWOa9uYnQZi4pgzLSJJiqKsZMX3Cq4ijlQBI
+-> ssh-ed25519 7MB20A jII4JhzKeWGtC0aP5juMC7SgTc3GjmOqoJD+Ksle/xw
-SxW5c3Txd/IaKelHc7VGgKnkqNVn8w1m+VyDqGTJYvk
+Tb0My897zy/xLLz565KYp+LaoiDveVydhrrJySbPtlQ
--> ssh-ed25519 IvyYug CycRY3+o7lg6UWNjwd+VLApOWH2Mktl7Ud+pBBzq3yw
+-> ssh-ed25519 IvyYug RlUAZCXrsnBROrRwPOgXQVqY8q4LDqqgWvZPsbbo9nE
-3mF23XkJ+cCB9kMEWkF+oYBNOKIQcDvHJIQ0jo7gWcA
+yBxdspHy/mVVXC3WI/Pnoy7UA/DHzQgMiu4WkXybY4Q
--> ssh-ed25519 v7O/FA CFZvpkvFPOdw0ass4KPU+oLNUBAe3m2+9AAiHFA27Dc
+-> ssh-ed25519 v7O/FA a/7GwdHIEYsvGrDbpT7s/zidqaIsms14sYhEiabG5RY
-IRONev1DEc+lD5kwveZdX/Ey8TlEQiATaiTDG5XjJUg
+bwCiiHAVfUmrt61VbrZXPVsRf9LzgdiZaNjOGRveqU8
--> ssh-ed25519 Wzv8ew GhGJdN18tBkCk/Q0zqrfwp6MJVNVx20+z/l03m9BbGg
+-> ssh-ed25519 Wzv8ew eIzF4pa0+t2RcdGP/bU60FKPVj1KlAi5U0nqXIDsNEI
-IkE2gHSfeSUqB4vu0kXZPw3+bMYYc2KszChenmR8z18
+UYm8HG5I9lM4mD+jqbztio9x+m5QnOmISjduzlKtDRs
--> ssh-ed25519 XgC3XA 1zEjnAUysdOuIm5dYKTwXD3sPDyLh8GWsonKxYw7hWo
+-> ssh-ed25519 XgC3XA 4+kbJbxKHpMcyr6A9r+44DrnvxUpgDaEF9RPa3JxIhY
-/sxObfeZiZXTGQgx2tsga1ykuyweERwYkV7auvuR8bU
+Mey1lA6tHMs2G1FoLBcJ4PjgOz0YB9obmoqZF2TYXj8
--> ssh-ed25519 l795CA B3WcfrFFNXFQjPKZ5K4M/prj7RCKKPkP8ktZ0XVghBM
+-> ssh-ed25519 l795CA Nviz4/yx5SmP0XFnvKCdzFZKG1BCpiVdAt7Z+5bDH0U
-hQhG8C3xd7QR4Eev7X8S94d5buxaJYXtNpzzLfO9jeg
+W0ZcHXefVkC+qlQSuwdlv8q+78SuyJ1r54p1gX6OlAQ
--> vbUD;-grease Pu.[?[PM 2v0J'W_e EXW(UE
+-> /%x]-grease 74x@ */qH$/LX j2Y]
-3VQcTpfcBjiL9iIK0MzJ5KAsg1p+ZX2hxfBwwrfY7Fsn72NeWH/MSxV3RRIUCOY
+ZtgMZTxVVEzFm8teWT72jQnw33w9EBRTB0bvOsNfZDEQTSMUoWhpLBUpBl4Auktn
---- uooL6VvAvEpWbcnuq6gGDKpN0wOHympu0CVPZWyIddc
+OjDFJJw1cTNf7XwAJa75+fgKKYwa
-zc»¸{¬<>³‹<C2B3>…Üg—3v¦RžNÊ(î<>"ßÒ-jNÏc0z.¾cE4¨ƒšü.Ø¢Ï~hñw<>ܪ³¢äðò­k¹ôБ7Ù»Xü
+--- DlH1MiEQB5kcPiSHdCLn9aoWp61S5Dur7OX9sqf2Th0
+ªŽ6BÛ·xEê¶ü±((iÜi€^Š? 
+©‰wžèÃ
ÜéÎsLŽá™Læ‹3)Kµ8º|ÿx<C3BF>{¢>öÍG#3xŽâ=J

secrets/baldur_wg_psk.age

@@ -1,25 +1,27 @@
 age-encryption.org/v1
--> ssh-ed25519 lC44xg K4dWWJ1lPXfhlAIRAybZOkBQp/LRJxRGmbOy5jlvi1I
+-> ssh-ed25519 lC44xg siyicGezmHp45yWb72O5RifDMUe8cnNR/8rlMqkRLmg
-BX9GP/JpsDjoG+cxNDqpRn5KI/YUJbsOLXHTBDwyUjA
+xA8vPnJazAWVVKJTzP2ngi/xHt/0V9n+9ijECsbXTgQ
--> ssh-ed25519 2L7QNA iXXL+Yb8hZvh3RYRDHtBUTtqHHY5oBKEtqmWhHlkt2o
+-> ssh-ed25519 2L7QNA QcYCyrqUHqX5CE8KmVzMM+oaXOzCaEAyuy8JBYsJWwY
-0XgMpq6fHAYeusPS++Fc6HmFH28M3xNAY1N7ubaEHN0
+WljidAlaPXxrfsZKtmDi5iGNqOBs3Tm4hXPeJB99vos
--> ssh-ed25519 sNAOqA 9NOzTgetjETYpwKD4HruFt2zyrJ7fAcNn70Oq38N+Ww
+-> ssh-ed25519 sNAOqA /vCQydAHoSTaWDbjP9/NmM+CkdUrtO/XJjPCoN21xmU
-qJUthhdhGxBZ5jxjh6LbDR7aO5EY0opS1Z56jZpG3jU
+QsWk9YqL07P3UNkZt+5Xd4dZw7SENGOUAq/iHFee2nw
--> ssh-ed25519 13iwjQ pPze3cWfSczM8n4WYY5CJcjIU/DGShpioJ9p885P7io
+-> ssh-ed25519 13iwjQ oD0OpKZ+Vm0nWmworan8dWOAlUQsHDvpm3bqGrOxIQc
-WuI/QZG7XTxP3BVo0wOACyKTtgRuLe9StVnherNethg
+pJL9YhA3sXjo38fRvYraL/gLn1rgSKspMizDUuEChYk
--> ssh-ed25519 7MB20A vtho1nIxUgJaIMo2LMCn4rmTSR4yWlT9AxNJ/cDWOmI
+-> ssh-ed25519 7MB20A 7kq62RnldRIwC16RKEIsSwPTbn6eH+3FtfmVJucnAyQ
-TtaLb344pbQq9k29qFMM3ee3okePsQav+EUt4Q31OTY
+EdyaTv+I+oA8/Y3RvaGTHwpLyzshfnVF4dq0nmo+IoU
--> ssh-ed25519 IvyYug qKOrg57dpDecShTU2TMjMjrZCwXmpxGTiiexYujLPVE
+-> ssh-ed25519 IvyYug BwwnIO+4eduO4rVu18pA1P3EWwA+9W0WtTlIGNlQ8EU
-hgTCdKOpyyHnPbV8eXXWskxd3nGFI/U2rHmhdudYuec
+o++5xPZGMS3K1ACfwbbnQ9BVj8+GNRGFXsiIrWxz1hk
--> ssh-ed25519 v7O/FA gQJcXXvDefLoFAjj3Vep4qiggkDX8/nCCQh2w6sS8Xs
+-> ssh-ed25519 v7O/FA MK70P0PK1SeatEb/xbK6wU/1cfiYF4zzYpBHHwx6t2k
-B0BQZdQIc+hWMfNVz54tAdFCTjcLSw1t+htSwC5MKUg
+y2iwBptLaMsNeRn00vuy2SfdQNRnXHTiBouZo5BBExs
--> ssh-ed25519 Wzv8ew MdVlkPiVjagW9qgp6US0on0ctihFEtA0ISpHbf57i1k
+-> ssh-ed25519 Wzv8ew N2K5VjuHs3/RvDkh9Hlrf+ZVfAAKNcLcQmp3k6Tym3U
-83jmpZXFnyIY1tBKbgmfpA7inuPkhlTK3s43zASmwwI
+9ghaa0D4Bpmzd9Yvx+Er3qYFGuC7TSgIirto0uKZRZA
--> ssh-ed25519 XgC3XA BthsRj8+CBrTySpWVTfxbzpE5RqjUKGlYEWehRCOKm0
+-> ssh-ed25519 XgC3XA CtfNLoBAYMvcyt602EkEqPB4Fz3CRQG76JC0N/qtvFw
-0XtGkYD6e2t/bzpXgMeKiw5NwRPUZMZ0Hpwf4c90Nsk
+X60izqbZKHBqW0+L905eI3Ya6sKgHFU2HevkQfep4LQ
--> ssh-ed25519 l795CA SEp14FlOLzdCydp+1QEpbpbMuuzhM12ritcpZ4xDllg
+-> ssh-ed25519 l795CA F3NiNkDDNR3PTKnS5OwMLY7s+/3NGNYMS5kiQcV/mRI
-FKKaCHlg74KBscVsH8E9H2KQyG2N9xxwp0oOG3oVTmU
+8jVt29DIRitRGOFPUV9ncHeFmBJflUcE8g9EB1C0pOk
--> y[|Z-grease )j`~y"},
+-> Vb6Y-grease lf
-AjmSyODTMq+EbK0kDQs+Yw
+kGMEIpGP8XAGzA6XQgKWZ72fH+9KEjQs9zDiE+nAxJX9uQePckfa++O23ZAcfseA
---- FxyOaPmh4fQDzD/XGykiw6PwySqaiwyvuo1YSN/ULaU
+Hrs6EFSwE+9UvhUHBY+/uuaxKhYGLG9p7ALhut+l
-q–Õ,‡‚XêÖ–ydß­7ˆq¶‡2Ÿ¡¸Ÿç¡°²¼Ó=ïú®JáüÔŸ9U~x*À—
EúþÔÚ­jgȷ܉BåÀ	öV8û
+--- 9TLi7lo+ZYZtWSsjavBdUPkkEZF+j14+YJ8szI/Dp5U
+i‰,šðwDƒÉ€ùBxþë`–ë猖ËRètúº–ü´¿W&<26>îj6¿L øëDÐ	‘Xø»=<3D>¬ˆNw3ïò0Ž€J
+4؇”0RC³

secrets/nextcloud_admin_secret.age

@@ -1,25 +1,25 @@
 age-encryption.org/v1
--> ssh-ed25519 lC44xg 91Drbhm8rawrH1Tf4i6sY3b4dV22PUCkXasYJDjnVBk
+-> ssh-ed25519 lC44xg hgRWUZAWUYenogx8j3ihmAdlzn3jIguiuCLBSS8usRo
-JP/im4nu9fRvC6lBmuZqtjK/MONa0QSBX9Je3tcMZnY
+H9eaZBZmMbqvBUcM2gaCU/s0p5pd3crSYNmmBsQ07ig
--> ssh-ed25519 2L7QNA p7gDPKqy1aSZo2l049BFUYzozamZe6xy0CZh8xeWBlo
+-> ssh-ed25519 2L7QNA S1qNlCc2lsD+ZbqyFJzuX+M/PnIyuGbVYOnuoUJscWw
-xlC1v+bF9nJQkQ54ObXfi3Tvj3yVz4+JbHyxmIQGsDI
+Q1lUu6IUBb29R2MonRuXCOfL2ABpm+VNa6d7R14U0xQ
--> ssh-ed25519 sNAOqA OsIskIft3nuF89TJ66Gsyj64oV2G5+JJhd0tFuFLsGI
+-> ssh-ed25519 sNAOqA ysOne69AMx96VnpX+25myTQPe/MlEaVc9ki9CS3zHSA
-YkMztKrO0OtEtCdqnhNe3YkX493l+jSJT+k9sbScMKE
+rKBqGwHamQb0LEbO+3ZzwIB29s4G2oXuqNipJBaQEV4
--> ssh-ed25519 13iwjQ 7PzPPgN6r8f/cUdSfTp5E9wWF1574yNwAtmuX5i3FxE
+-> ssh-ed25519 13iwjQ C0G4NlBw2d/mRzx3wKL0zYMB+E2L/WDEdy+m98F5R3U
-jfkjBP4GBmghOCaiQ6FGNaqoDvLlCt0Bbln4TxLNYiY
+hvLV5TXiQGJLu/dWnU3S/157AD6b4YmswqAsZAQ/uSY
--> ssh-ed25519 7MB20A Fwbdkqeecc6cI9EN67VWSlT0kE4/IJIiANX9dtM5pA4
+-> ssh-ed25519 7MB20A PPBm3aS2eN9oD8B2NlycSoBjcVvWAb0ouh83vfmksVo
-8vMUxIxzQEwn+IB0QP4wxdixOd5fnsSHzVn86yearVM
+rQ+TkOW4Tg1ZdvF0AtlFKrZN7AB2kPK55kMZJzTw1ic
--> ssh-ed25519 IvyYug OUah9hhgBilrcgdR/8u+POTWSwujWsp8AA+YiPmvFCs
+-> ssh-ed25519 IvyYug NFudbv3ydIUIaHqjaOl+ex/DvY5FmEE7fmojBsD6SkM
-arwEHcpNqCwswlob+KZlIdbmS5YHLfWUXKDfsWoU6dM
+h7Njl0B8thH2X0JlVoxj0yVP18Xxq1/UD0ktlNCmnVI
--> ssh-ed25519 v7O/FA yq5SYgje+HOJwZ9/bKITPv244Ao3aZCsLNkUw+L3dkA
+-> ssh-ed25519 v7O/FA hCzkPx6QmEr3dOQ0mBrpEU4aN8BXrEfNy8F76jP2wGQ
-2pU1nqZgUTLypnpbJ1prR59rMyfBAHhgK+8ddxQjKMs
+HmC5T2cnKDZZUnHMqDdydbpQHW+T7L1o00mxhNYCCJk
--> ssh-ed25519 Wzv8ew y9fZuZAtknkDiZmXYn4ZWyDHoVZ3R9sm3vlzh4I7vhw
+-> ssh-ed25519 Wzv8ew nB8Yx78CFxPc19J1lP6y0NpkPT1noU8gYtXyY6IUPxE
-EJAnK5hjNK6Atz2VoQZeO/niZ6Coi3LywbGvxtqP3Bc
+aGMKo06LGXRN8qMIMZdMmNUI+U6QkmqTzifx/OVTrXw
--> ssh-ed25519 XgC3XA z2WuzBfJPnwKJOY+fkgLsOEIArIPgUFtD8O2mLGg0m0
+-> ssh-ed25519 XgC3XA Rd4aeSgVK0Zu1+lgL6OAlDv+GJtzx4XwWYb+HBbY5BE
-cK8bD/QqVNJerThnAqtn91Q96TaLsKYSTG4yDNDFKaY
+uJnpQOuo+GbtCP1jVfCyfGfeGS4YD0kUseJfP/YYF3M
--> ssh-ed25519 l795CA tNto7MnYOtTlmjl/bhSZEcKDjqnn8ZlbW9BBQQDuAmA
+-> ssh-ed25519 l795CA vVo3ZA3YjOdinm9zfNYiqx1jIkJ3d6/PCffz24aBJGI
-43kE1/kjso/penSuM3MBSsURVG4rFJpsuCjxKJtWAHY
+xwNj/848sktIKeElNyoQ89R9IxdAHnpPeOrZ8bUKI84
--> ,|t-grease
+-> R:[j4-grease u![ M |OD$ c
-KOs7pQc4KksrMBNIFip3hz44UmaNEB6K+N4wX2/Oz7ayTQr6vg
+dtVFRIPWAomxbhiJ7J62wRAz7CgylRR4zmNPmIM1eeZoXG7CMg
---- 1BqdPneo6efppGPNy9GpeWxCqXfDPsKwj15gUVWDY0k
+--- hN2apSK9SGGUxwRDTto5B9X+Q+1q0zJdwxjRfHwBV+s
-9¶»9ÊümʇRþ#ÐðÎè¤[o„»Q<C2BB>ŽŒ¤Ð€ˆÔ¸=ól
<0A>mõÑvÇ•eF{P!¡ª”aEÄ(§d<mcç}W·j£Í3Tç¥í±tãÔ"ì
+î",-ÃQl¥å7«‘Û\ó\´ë»Ä
…:øl•º¸{ê/ÌϪ³“BíÌ‹R¾–ÑT{Ô#͘ÿ.îÊÕ]Ŧ‚½ç$¿<]{&’Txƒ‘

secrets/odin_wg_psk.age

@@ -1,26 +1,25 @@
 age-encryption.org/v1
--> ssh-ed25519 lC44xg mdip3HBP+qEHMNFgw+bCXJRr35yCxEqPg4V+pLdZMx0
+-> ssh-ed25519 lC44xg sxuYE9qrczPu9f7HguM6FS+24q+c6awYijsW75PaM1M
-yMbZYirQlZMmr95StdYp/1wPjXaxjsNGX472ex3SMfc
+lyU5kWLbhh8DtYqOdAwhD6ichr8tXaojvaks8N7uoDQ
--> ssh-ed25519 2L7QNA r+tO1POIf8Ayi8PC37rLf0p7Y1O5z5CasCHkRK7BtGs
+-> ssh-ed25519 2L7QNA FEhfHUdaVct+NguR2covi+uizBwJabG7Oi2Kx6XED3A
-Ts/86q2fOA9BQyuKTUZ8eac39MnPQ3MJM9y2XXVV7RA
+1Uge6BVi8Q9Wobg8mbCCg2QqtZFprbE2ucZM2qTz5Do
--> ssh-ed25519 sNAOqA DLcdzGd38r3t4mLvbAFAD15evjuVVMlhgSD2md0HYRw
+-> ssh-ed25519 sNAOqA RdSNYpDBjrdCdGbqviLC/3jNUpQlJVcVDJBZsYuSeGA
-2B3LGMJWeVPhkPMmQx8A7aF5HUf6zRMMFG85GX/8e90
+X+pXWiBGoaSbJx5IOS6TF+vbSunhsjViLk54os2Ry1c
--> ssh-ed25519 13iwjQ jtSOmjgGcGh2XqIoc58J5cgcH5M1O1Z9ZJS0M3TFrgI
+-> ssh-ed25519 13iwjQ yD/1bxrjpl+U4x6EBz/BNZKwarc7O99VKN6CqD09CyE
-M9EJKUUWwayAYhhGysvpJ2LVWyedn1k0Q9hT5kEt5MQ
+2fCHX+tX4bbWgqEERk6SYl1Ati67q4AtwELJ7iyoKcI
--> ssh-ed25519 7MB20A kqYtQSu3sYRHi4bka/lXMimez0AFGFU5BqoFlGqKmjQ
+-> ssh-ed25519 7MB20A 3sdcbYjpK8ySeMjz8pOLFIaWFemso5li9lGyTQHQpmU
-Kmk3rIxRw8xeGtfC7cabLiP3DXGhd9oc7vwl/BUFvTQ
+9yTSX6juV9OBtWisz/q4cTDpRYJe2sUbqHutx1pOJN8
--> ssh-ed25519 IvyYug gMJj5DWImX/iNW+cY39tE4UJUbQlUqfEl0hMQjcS6lQ
+-> ssh-ed25519 IvyYug Mv0oOpFUJOFLaPQbGju5JW4yRbLTonz31mLLk4GwYE0
-u3mqyt2QmhkrYWAL02b5Pv81tXAgDif1QRZJLc61Nvk
+2Pof++UU99R229ovY+jouIr+Ty4u3ysw56iLC8+j2Bg
--> ssh-ed25519 v7O/FA mzDFmhR9wPZT/Wj9Rra1d/8mIXMZfMqMKZ5Wroo9Ygc
+-> ssh-ed25519 v7O/FA 4GV/vYqiRqLSUvtg+IdmQCd7xXUuJH0wqEuPw+SC4QQ
-Cz1il7hvvgJFqu4cqFSHbr3FpJAnMvE4RY2BTutXiqU
+hupPjtZWH1A88DMA+aw2DoyyHLPLzvHejA5ohqCje1s
--> ssh-ed25519 Wzv8ew qv3oQQMhCw2UnZm6GRE24OJ47N9h2wtO4ayM80it/io
+-> ssh-ed25519 Wzv8ew O8GUxPSc8+CRD2so4nMsMbtjDa6QVnqSj+czUFcs3ww
-oIg6KVKFY1bh4HJkj6bUhXq+ThO1kl2w02GhMqHjFz0
+KsTescNrPtapbAzgQ4cxXteyok8JG/fPYsbSnOysdL0
--> ssh-ed25519 XgC3XA P2CmO1HJLq3WzfKFv2gkgfyOQ89ks3Vjqv5lvUHRcDU
+-> ssh-ed25519 XgC3XA vNZvFuAycFWyiSpAyjQGfVH9Gz9OEL5AOqrZ3ChBv0E
-lNTqncVz7Eg2jVjzWGav50twa5XdN4oRhptjdGgUhrs
+IOOU/ru6k93kSpaHFjgPLyTViOcQQF5Hhe+Rx0u0t68
--> ssh-ed25519 l795CA Kw1lASAR6zB25xmAzatCH1TvkEWWQtSwS8c9lvvcFAc
+-> ssh-ed25519 l795CA ukyFdc58fFZlyzT56cwuTq+yzD30/aUfrjIkcsqHlSA
-HTBNX95GqBFtXV6mgGCtfh1lXlMDdwNaIp8i60cOfnQ
+hGru5mUwFbpAhgavMmm/fJmVzhDlhhi3HvPiSKPObRo
--> 0*Wg!:e-grease "7]bbwxk :0H<{U;0 vG
+-> hD3?-grease
-zh1b0AW0O2PICiREGYcbQ8/aktTtuGY6ppsGioeao53t
+
---- LoEv/DfNru/GjqqHLww788WIV5nvB7z5zAhByyRkKb8
+--- IuZjNwhOjNv7HLoZy0MlS50zvRKTNSVM51/Qjdv4G70
-]°¤vnDP¤®ÒòÁýÒ+ØúvBS5¿w¨yžä]»øLfÈ2u-syl“±sæl:#]
+^k¯õц)=?"S|s7¼?uÞ©aÌØ"N½ƒ—KãÆ+(´h|ÅáÚ¢º¸ì+â—Å
šôeÓŒêÏÇ„Íí¶\È@éžkT9U殩
-dh)«fÞ³[œsµ-ù…{ØpÓe×!Ï

secrets/spotify_password.age

@@ -1,25 +1,26 @@
 age-encryption.org/v1
--> ssh-ed25519 lC44xg fNZm17lZ7I9OF+9KzG5CkE20zykUWfNiVqfinwfaT1E
+-> ssh-ed25519 lC44xg NIQkDcUuZvOwjoYDeS6nazRZRMEZzuBaMBkoFYP13hY
-YIf4M7hFVDHxkdbgj9YIkjan31NV298Ne94/5mm+lVw
+bI2U06gidJOPQlF/vEmUjAGPaYeNWhLb+yCh+sTitWU
--> ssh-ed25519 2L7QNA CVA8eZ1QVvcI7SF5Qf7UlG71NbNHZF0XzEPe7YsZFgw
+-> ssh-ed25519 2L7QNA B/sm9v1N86NOsxLnhc+RVod7F/x4XG4XeDNZxDjfaUI
-9YX+T2GKTXbJNzSPLoXE27q4oV6LQ5HubgoCwKGxS4Y
+jbt3F/EK+cT457WIfPRK9YZHDFnUd9ZRAMmBJ35eQjk
--> ssh-ed25519 sNAOqA lJ4QkGtqdcUn9ofknOG/HaCHm6Ya0ZD/UsV5o4GDVkE
+-> ssh-ed25519 sNAOqA dHO1dOYZdSerazDq+QaS+SWHR4To47v/h2fcUC0oxXM
-RmKwFfLGnJmNcnC7fAF5BEHMYEjmW2PyUUpJIqtcRKQ
+WOvcuwo+RzcwBa5dQu9IOk0aGcPxRK/FCb/mTuQoKxY
--> ssh-ed25519 13iwjQ 1uvoQrLZ+DmBhHvei8rHTWsUkDnJVHq7IJQXeZ6Y/Dk
+-> ssh-ed25519 13iwjQ GLj8P8yN9QazLvtTeV4uJOPY9m6G3IKZgLSz4qriaHg
-dwMrSGWryp5pw4bjHAJciVwq+HtrAbu3n/BqZdlfq2k
+BPQeyR2LG2Jrj4Rhmt1H2MAQR1VtYfQdouu2RX3+CZ8
--> ssh-ed25519 7MB20A Xmx38wKS0U/yHhCh30ovmik/9g0ryVLgg89DFx4bH1g
+-> ssh-ed25519 7MB20A NOZeTcMvJXd65aKyl/kj3E9AzEmzrJgehIw6ubNMmiA
-xzrwGBJrmK8e5jNGkDEQ3AxkJ7t7l6qMatSFHwP3i9c
+RCPIwXmO4Li+YTZ6dSpqZrYWuMwMwTT/6cRlX+Pirpo
--> ssh-ed25519 IvyYug /Z3qxc0ETc8hjTYuRT8n0jm3ASLsHqWcDWmqHDiqY3w
+-> ssh-ed25519 IvyYug /+DfO93aLrySU004zFMIOjy+DOIjf8iP8rExspblCD4
-8oNzoP8oe6EbxXoKRScpd9ioRMtux+a9wQXLuFO570I
+RFHPk4sgHRrE047JQKR4ccBRx3ZfzvG9YrFg01EBcr4
--> ssh-ed25519 v7O/FA R4o3qe/Hdr8NU5/Lh5XWI5PcwlAqQhEDxnLax8woc2A
+-> ssh-ed25519 v7O/FA 2vmbVPa4ZVZ5JXYt9pnNPpqLYf5kLHfW76MLsSOUGCs
-yewsVadr1x6aOjodDC5AJiAaJ1UZErlwhJrgvKLy4UU
+uVCAaF3O9DIr7JUR8UN9LIZ1s2cva50BiokWbpiVYSI
--> ssh-ed25519 Wzv8ew G0eVpxoMIMQsGZw+bMYMHHs/zlLiYtfdLrMHZztIGWc
+-> ssh-ed25519 Wzv8ew v2MKEJwgcpNwDh9ppwaUck8tXpksr3QyLmwumwrfrx0
-Pe8BgxqumkizijWUzX4pnnow5oZCQi7byRCd+qNIobI
+3HB+QGjjQNAgT53Ft6QiiI1mimruZodu9LccT/Rf9hE
--> ssh-ed25519 XgC3XA MJWNf+zH+qO1F5uRI6nsEXbeE+8Yq+gSF2RFq0kF0Tg
+-> ssh-ed25519 XgC3XA agOnAlZ4mCfdE5OatNel1Htxioq6PZAWC2VLhLbuIzI
-Wfqs7UtrwBtCH8clxv44mAXaYCLVJTHSpsP1OD9Py2c
+yYCMrxTgjtt/aXMbhwNlRRm/XWj8FnznWe/lwfvK3eo
--> ssh-ed25519 l795CA VRGxjEzDM3Wh6PVbl609EAopcPPc5k/74j7J14el1lY
+-> ssh-ed25519 l795CA Zefi4AYzfEdbBFne59wKi8zS8R5j0BS9711UTp/AmVs
-YtjcGN40o4R3e5JGlD9Vtks5Aaa1SvjEW6yjQJeiX1A
+JbUX01jBByQihptYhcbT9Swg2pmj8rxuCJO0pQzvQaw
--> &-grease ~#1cr
+-> -3=CGi4-grease F SeK([U fUNnx-A nv
-D7H4Rvbgs/yp9b8X
+nSRW0O5NweyggNFkjRBItvvmfnL5e2AkYGgxfUTebQsayYlgRQp3h58LnQxcvxxs
---- uHnGjluN/BbsC3f0jQuq5SaOU2woJF+aQLBL6cKPlGk
+utxluLJHJw
-äØüÄ¢¶ú I å†öY-‰_`ÂĊ܉ä8žíuŽOÝÁ{œhƒøûë0ãº
+--- +DEy9ZdW46fBBq6B9BQyNt+cMaAD9xvoc5Z+HX2D4V0
+”B¿ÄÖGäì‡1þ´-TéÍ[ýXXµavƒW#rIf3¶êÉ×Ó#qÖjÌjÉ7