switch back to nixos yet again on demiurgeHEADmaster

19 files changed, 183 insertions, 214 deletions

diff --git a/home.nix b/home.nix
index 24ba54e..fbcf2ff 100644
--- a/home.nix
+++ b/home.nix
@@ -376,13 +376,7 @@ in
 
     git = {
       enable = true;
-      difftastic = {
-        enable = true;
-        background = "dark";
-        color = "always";
-        display = "side-by-side-show-both";
-      };
-      extraConfig = {
+      settings = {
         user = {
           email = "git@vineetk.net";
           name = "vin";
@@ -474,18 +468,18 @@ in
       };
       hooks = {
         postNew = ''
-                notmuch tag +13f0 -- tag:unread and to:"*@13f0.net"
-                notmuch tag +vineetk -- tag:unread and to:"*@vineetk.net"
-                notmuch tag +university -- tag:unread and to:vsureshkumar3892@floridapoly.edu
-                notmuch tag +openbsd_announce -inbox -- tag:unread and to:announce@openbsd.org
-                notmuch tag +openbsd_arm -inbox -- tag:unread and to:arm@openbsd.org
-                notmuch tag +gameoftrees -inbox -- tag:unread and to:gameoftrees@openbsd.org
-                notmuch tag +openbsd_misc -inbox -- tag:unread and to:misc@openbsd.org
-                notmuch tag +openbsd_ports -inbox -- tag:unread and to:ports@openbsd.org
-                notmuch tag +openbsd_tech -inbox -- tag:unread and to:tech@openbsd.org
-                notmuch tag +opensmtpd_misc -inbox -- tag:unread and to:misc@opensmtpd.org
-                notmuch tag +oss_security -inbox -- tag:unread and to:oss-security@lists.openwall.com
-                notmuch tag +tuhs -inbox -- tag:unread and to:tuhs@tuhs.org
+notmuch tag +13f0 -- tag:unread and to:"*@13f0.net"
+notmuch tag +vineetk -- tag:unread and to:"*@vineetk.net"
+notmuch tag +university -- tag:unread and to:vsureshkumar3892@floridapoly.edu
+notmuch tag +openbsd_announce -inbox -- tag:unread and to:announce@openbsd.org
+notmuch tag +openbsd_arm -inbox -- tag:unread and to:arm@openbsd.org
+notmuch tag +gameoftrees -inbox -- tag:unread and to:gameoftrees@openbsd.org
+notmuch tag +openbsd_misc -inbox -- tag:unread and to:misc@openbsd.org
+notmuch tag +openbsd_ports -inbox -- tag:unread and to:ports@openbsd.org
+notmuch tag +openbsd_tech -inbox -- tag:unread and to:tech@openbsd.org
+notmuch tag +opensmtpd_misc -inbox -- tag:unread and to:misc@opensmtpd.org
+notmuch tag +oss_security -inbox -- tag:unread and to:oss-security@lists.openwall.com
+notmuch tag +tuhs -inbox -- tag:unread and to:tuhs@tuhs.org
         '';
         #preNew = "mbsync -a";
       };
@@ -829,121 +823,121 @@ in
         cyan    = "${colors.current.normal.cyan}"
         magenta = "${colors.current.normal.magenta}"
 
-        # --- Applying colors --- #
-
-        # Completion menu.
-        c.colors.completion.category.bg                 = bg1
-        c.colors.completion.category.border.top         = bg0
-        c.colors.completion.category.border.bottom      = bg0
-        c.colors.completion.category.fg                 = fg0
-        c.colors.completion.even.bg                     = bg1
-        c.colors.completion.odd.bg                      = bg1
-        c.colors.completion.item.selected.bg            = bg2
-        c.colors.completion.item.selected.border.bottom = bg2
-        c.colors.completion.item.selected.border.top    = bg2
-        c.colors.completion.item.selected.fg            = blue
-        c.colors.completion.item.selected.match.fg      = blue
-        c.colors.completion.match.fg                    = red
-        c.colors.completion.odd.bg                      = bg1
-        c.colors.completion.scrollbar.fg                = fg0
-        c.colors.completion.scrollbar.bg                = bg1
-
-        # Statusline.
-        c.colors.statusbar.caret.bg                     = bg0
-        c.colors.statusbar.caret.fg                     = magenta
-        c.colors.statusbar.caret.selection.bg           = bg0
-        c.colors.statusbar.caret.selection.fg           = red
-        c.colors.statusbar.command.bg                   = bg0
-        c.colors.statusbar.command.fg                   = fg0
-        c.colors.statusbar.insert.bg                    = bg0
-        c.colors.statusbar.insert.fg                    = green
-        c.colors.statusbar.normal.bg                    = bg0
-        c.colors.statusbar.normal.fg                    = fg0
-        c.colors.statusbar.passthrough.bg               = bg0
-        c.colors.statusbar.passthrough.fg               = blue
-        c.colors.statusbar.private.bg                   = bg0
-        c.colors.statusbar.private.fg                   = fg0
-        c.colors.statusbar.progress.bg                  = green
-        c.colors.statusbar.url.error.fg                 = red
-        c.colors.statusbar.url.fg                       = fg0
-        c.colors.statusbar.url.hover.fg                 = cyan
-        c.colors.statusbar.url.success.http.fg          = green
-        c.colors.statusbar.url.success.https.fg         = green
-        c.colors.statusbar.url.warn.fg                  = yellow
-
-        # Tabline.
-        c.colors.tabs.bar.bg                            = bg0
-        c.colors.tabs.even.bg                           = bg1
-        c.colors.tabs.even.fg                           = fg1
-        c.colors.tabs.indicator.error                   = red
-        c.colors.tabs.indicator.start                   = blue
-        c.colors.tabs.indicator.stop                    = green
-        c.colors.tabs.indicator.system                  = "rgb"
-        c.colors.tabs.odd.bg                            = bg1
-        c.colors.tabs.odd.fg                            = fg1
-        c.colors.tabs.pinned.even.bg                    = bg2
-        c.colors.tabs.pinned.even.fg                    = fg1
-        c.colors.tabs.pinned.odd.bg                     = bg2
-        c.colors.tabs.pinned.odd.fg                     = fg1
-        c.colors.tabs.pinned.selected.even.bg           = bg0
-        c.colors.tabs.pinned.selected.even.fg           = green
-        c.colors.tabs.pinned.selected.odd.bg            = bg0
-        c.colors.tabs.pinned.selected.odd.fg            = green
-        c.colors.tabs.pinned.selected.even.bg           = bg0
-        c.colors.tabs.pinned.selected.even.fg           = blue
-        c.colors.tabs.selected.odd.bg                   = bg0
-        c.colors.tabs.selected.odd.fg                   = fg0
-        c.colors.tabs.selected.even.bg                  = bg0
-        c.colors.tabs.selected.even.fg                  = fg0
-
-        # Hints.
-        c.colors.hints.bg                               = bg2
-        c.colors.hints.fg                               = fg0
-        c.colors.hints.match.fg                         = red
-        c.hints.border                                  = "2px solid " + bg1
-
-        # Messages.
-        c.colors.messages.error.bg                      = bg1
-        c.colors.messages.error.border                  = bg1
-        c.colors.messages.error.fg                      = red
-        c.colors.messages.info.bg                       = bg1
-        c.colors.messages.info.border                   = bg1
-        c.colors.messages.info.fg                       = blue
-        c.colors.messages.warning.bg                    = bg1
-        c.colors.messages.warning.border                = bg1
-        c.colors.messages.warning.fg                    = yellow
-
-        # Download bar.
-        c.colors.downloads.bar.bg                       = bg0
-        c.colors.downloads.error.bg                     = bg2
-        c.colors.downloads.error.fg                     = red
-        c.colors.downloads.start.bg                     = bg2
-        c.colors.downloads.start.fg                     = blue
-        c.colors.downloads.stop.bg                      = bg2
-        c.colors.downloads.stop.fg                      = green
-
-        # Keyhints.
-        c.colors.keyhint.bg                             = bg0
-        c.colors.keyhint.fg                             = fg0
-        c.colors.keyhint.suffix.fg                      = yellow
-
-        # Default color for about:blank pages (or if the css didn't specify)
-        #c.colors.webpage.bg                             = bg1
-
-        # Context menu.
-        c.colors.contextmenu.disabled.bg                = bg1
-        c.colors.contextmenu.disabled.fg                = fg1
-        c.colors.contextmenu.menu.bg                    = bg1
-        c.colors.contextmenu.menu.fg                    = fg0
-        c.colors.contextmenu.selected.bg                = bg2
-        c.colors.contextmenu.selected.fg                = blue
-
-        # Prompts.
-        c.colors.prompts.bg                             = bg1
-        c.colors.prompts.border                         = "2px solid " + bg0
-        c.colors.prompts.fg                             = fg0
-        c.colors.prompts.selected.bg                    = bg2
-        c.colors.prompts.selected.fg                    = blue
+# --- Applying colors --- #
+
+# Completion menu.
+c.colors.completion.category.bg                 = bg0
+c.colors.completion.category.border.top         = bg0
+c.colors.completion.category.border.bottom      = bg0
+c.colors.completion.category.fg                 = fg0
+c.colors.completion.even.bg                     = bg0
+c.colors.completion.odd.bg                      = bg0
+c.colors.completion.item.selected.bg            = bg1
+c.colors.completion.item.selected.border.bottom = bg1
+c.colors.completion.item.selected.border.top    = bg1
+c.colors.completion.item.selected.fg            = blue
+c.colors.completion.item.selected.match.fg      = blue
+c.colors.completion.match.fg                    = red
+c.colors.completion.odd.bg                      = bg0
+c.colors.completion.scrollbar.fg                = fg0
+c.colors.completion.scrollbar.bg                = bg0
+
+# Statusline.
+c.colors.statusbar.caret.bg                     = bg0
+c.colors.statusbar.caret.fg                     = magenta
+c.colors.statusbar.caret.selection.bg           = bg0
+c.colors.statusbar.caret.selection.fg           = red
+c.colors.statusbar.command.bg                   = bg0
+c.colors.statusbar.command.fg                   = fg0
+c.colors.statusbar.insert.bg                    = bg0
+c.colors.statusbar.insert.fg                    = green
+c.colors.statusbar.normal.bg                    = bg0
+c.colors.statusbar.normal.fg                    = fg0
+c.colors.statusbar.passthrough.bg               = bg0
+c.colors.statusbar.passthrough.fg               = blue
+c.colors.statusbar.private.bg                   = bg0
+c.colors.statusbar.private.fg                   = fg0
+c.colors.statusbar.progress.bg                  = green
+c.colors.statusbar.url.error.fg                 = red
+c.colors.statusbar.url.fg                       = fg0
+c.colors.statusbar.url.hover.fg                 = cyan
+c.colors.statusbar.url.success.http.fg          = green
+c.colors.statusbar.url.success.https.fg         = green
+c.colors.statusbar.url.warn.fg                  = yellow
+
+# Tabline.
+c.colors.tabs.bar.bg                            = bg0
+c.colors.tabs.even.bg                           = bg0
+c.colors.tabs.even.fg                           = fg0
+c.colors.tabs.indicator.error                   = red
+c.colors.tabs.indicator.start                   = blue
+c.colors.tabs.indicator.stop                    = green
+c.colors.tabs.indicator.system                  = "rgb"
+c.colors.tabs.odd.bg                            = bg0
+c.colors.tabs.odd.fg                            = fg0
+c.colors.tabs.pinned.even.bg                    = bg1
+c.colors.tabs.pinned.even.fg                    = fg0
+c.colors.tabs.pinned.odd.bg                     = bg1
+c.colors.tabs.pinned.odd.fg                     = fg0
+c.colors.tabs.pinned.selected.even.bg           = bg0
+c.colors.tabs.pinned.selected.even.fg           = green
+c.colors.tabs.pinned.selected.odd.bg            = bg0
+c.colors.tabs.pinned.selected.odd.fg            = green
+c.colors.tabs.pinned.selected.even.bg           = bg0
+c.colors.tabs.pinned.selected.even.fg           = blue
+c.colors.tabs.selected.odd.bg                   = bg0
+c.colors.tabs.selected.odd.fg                   = fg1
+c.colors.tabs.selected.even.bg                  = bg0
+c.colors.tabs.selected.even.fg                  = fg1
+
+# Hints.
+c.colors.hints.bg                               = bg1
+c.colors.hints.fg                               = fg0
+c.colors.hints.match.fg                         = red
+c.hints.border                                  = "2px solid " + bg0
+
+# Messages.
+c.colors.messages.error.bg                      = bg0
+c.colors.messages.error.border                  = bg0
+c.colors.messages.error.fg                      = red
+c.colors.messages.info.bg                       = bg0
+c.colors.messages.info.border                   = bg0
+c.colors.messages.info.fg                       = blue
+c.colors.messages.warning.bg                    = bg0
+c.colors.messages.warning.border                = bg0
+c.colors.messages.warning.fg                    = yellow
+
+# Download bar.
+c.colors.downloads.bar.bg                       = bg0
+c.colors.downloads.error.bg                     = bg1
+c.colors.downloads.error.fg                     = red
+c.colors.downloads.start.bg                     = bg1
+c.colors.downloads.start.fg                     = blue
+c.colors.downloads.stop.bg                      = bg1
+c.colors.downloads.stop.fg                      = green
+
+# Keyhints.
+c.colors.keyhint.bg                             = bg0
+c.colors.keyhint.fg                             = fg0
+c.colors.keyhint.suffix.fg                      = yellow
+
+# Default color for about:blank pages (or if the css didn't specify)
+#c.colors.webpage.bg                             = bg0
+
+# Context menu.
+c.colors.contextmenu.disabled.bg                = bg0
+c.colors.contextmenu.disabled.fg                = fg0
+c.colors.contextmenu.menu.bg                    = bg0
+c.colors.contextmenu.menu.fg                    = fg0
+c.colors.contextmenu.selected.bg                = bg1
+c.colors.contextmenu.selected.fg                = blue
+
+# Prompts.
+c.colors.prompts.bg                             = bg0
+c.colors.prompts.border                         = "2px solid " + bg0
+c.colors.prompts.fg                             = fg0
+c.colors.prompts.selected.bg                    = bg1
+c.colors.prompts.selected.fg                    = blue
       '';
 
       "qutebrowser/redirectors.py".text = ''
diff --git a/hosts/demiurge/default.nix b/hosts/demiurge/default.nix
index 263d509..20fdefd 100644
--- a/hosts/demiurge/default.nix
+++ b/hosts/demiurge/default.nix
@@ -73,7 +73,7 @@
 
     zfs.extraPools = [
       "data_nvme"
-      "data_wd"
+      "data_hdd"
     ];
   };
 
@@ -249,6 +249,7 @@ ip6tables -X WG1-FWD
 
     transmission = {
       enable = true;
+            package = pkgs.transmission_4;
       downloadDirPermissions = "770";
       openPeerPorts = true;
       user = "vin";
@@ -301,16 +302,6 @@ ip6tables -X WG1-FWD
           locations."/".proxyPass = "http://127.0.0.1:8085";
         };
 
-        "llm.demiurge.epistemia" = {
-          addSSL = true;
-          sslCertificate = "/var/demiurge.epistemia.crt";
-          sslCertificateKey = "/var/demiurge.epistemia.key";
-          locations."/" = {
-            proxyPass = "http://127.0.0.1:8083";
-            proxyWebsockets = true;
-          };
-        };
-
         "navidrome.demiurge.epistemia" = {
           addSSL = true;
           sslCertificate = "/var/demiurge.epistemia.crt";
@@ -337,16 +328,6 @@ ip6tables -X WG1-FWD
       { addr = "10.0.13.2"; port = 22; }
     ];
 
-    # llm
-    open-webui = {
-      enable = true;
-      environment = {
-        REQUESTS_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
-        WEBUI_AUTH = "False";
-      };
-      port = 8083;
-    };
-
     # reddit
     redlib = {
       enable = true;
@@ -407,12 +388,6 @@ ip6tables -X WG1-FWD
       };
     };
 
-    # monero node
-    monero = {
-      enable = true;
-      dataDir = "/data_wd/monero";
-    };
-
     # searching
     searx = {
       enable = true;
diff --git a/hosts/demiurge/hardware.nix b/hosts/demiurge/hardware.nix
index 5fa707c..260a71f 100644
--- a/hosts/demiurge/hardware.nix
+++ b/hosts/demiurge/hardware.nix
@@ -52,7 +52,7 @@
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B259-F128";
+    device = "/dev/disk/by-uuid/9DB6-EB6F";
     fsType = "vfat";
     options = [
       "fmask=0022"
@@ -72,3 +72,4 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
+
diff --git a/modules/common.nix b/modules/common.nix
index d613bf8..981c548 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -25,7 +25,7 @@
       server = {
         interface = [
           "127.0.0.1"
-          "100.64.0.2"
+          "10.0.13.2"
           #"fd00:b0ba:cafe:babe::2"
           "::1"
         ];
@@ -44,11 +44,11 @@
         module-config = "\"respip validator iterator\"";
 
         local-data = [
-          "\"saklas.epistemia. 86400 IN A 100.64.0.1\""
-          "\"demiurge.epistemia. 86400 IN A 100.64.0.2\""
-          "\"hastur.epistemia. 86400 IN A 100.64.0.3\""
-          "\"iphonebob.epistemia. 86400 IN A 100.64.0.4\""
-          "\"lab.epistemia. 86400 IN A 100.64.0.5\""
+          "\"saklas.epistemia. 86400 IN A 10.0.13.1\""
+          "\"demiurge.epistemia. 86400 IN A 10.0.13.2\""
+          "\"hastur.epistemia. 86400 IN A 10.0.13.3\""
+          "\"iphonebob.epistemia. 86400 IN A 10.0.13.4\""
+          "\"lab.epistemia. 86400 IN A 10.0.13.5\""
         ];
 
         local-zone = [
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 0e97300..f3311e5 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -20,7 +20,7 @@
       "net.ipv6.conf.all.forwarding" = true;
     };
 
-    kernelPackages = pkgs.linuxPackages_6_16;
+    kernelPackages = pkgs.linuxPackages_6_17;
 
     loader = {
       systemd-boot.enable = true;
diff --git a/secrets/email_13f0.age b/secrets/email_13f0.age
index 5430245..b262581 100644
--- a/secrets/email_13f0.age
+++ b/secrets/email_13f0.age
diff --git a/secrets/email_vinbiz.age b/secrets/email_vinbiz.age
index 1759259..4010ef8 100644
--- a/secrets/email_vinbiz.age
+++ b/secrets/email_vinbiz.age
diff --git a/secrets/email_vineetk.age b/secrets/email_vineetk.age
index f2fdc81..5dabf29 100644
--- a/secrets/email_vineetk.age
+++ b/secrets/email_vineetk.age
@@ -1,9 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 AaF/mQ FK0Wp7YClNT8HRIdkz8mtEs0xF8rfTYyZp+Sdgoo/DU
-5X1V92sBjPldp8egKdnzbm0uslRZ2LMfdX1c2QgWtY8
--> ssh-ed25519 hc2ELA ZjJVBfiAmRM9A0DgAZrM/Jo9K7n8aIAdcQ3Qod9qMDk
-GjKHrPp8J6IA8Z92e7l/qJsENgY4vFAcCv6l/vl1QTw
---- jZBJA0D7Hw35YDWvAABwRwH549bYhvP3XF6pdsqZnHA
-��&����e,��o��p-�
-���5]������`�P�`��
-�!���u.����"��dH����"h`m�(W�|���P�4�~�j�
\ No newline at end of file
+-> ssh-ed25519 AaF/mQ 2xJ/ZWD3jNmtJnuNvS2SfeQ7mmKbsWhuOf8j4ljEM2U
+hbcKsAKF1C6S5h87mNPc/aHEhuC4EfBUCAIHvfiCblc
+-> ssh-ed25519 hc2ELA Ij2xOrkpLrvTIRYbtx4IGGiM4DPq4R6Ifq/zMLRtFCg
+tW4O99+trWf7/qBtacY8KjxA+mW6ejr2jYlT/MBg1NU
+--- gnqtU6MxJ/pjCHJIQQ057NzTaryvZT8KGU+P6uUeH2c
+��2��>A9��Dk
+T���'�c����(��n'Up�&�.H��������:][�W��8�ъ   �o^n�#O�Xf�*��"�z��
\ No newline at end of file
diff --git a/secrets/hetzner_dns.age b/secrets/hetzner_dns.age
index 6413b31..c52af5f 100644
--- a/secrets/hetzner_dns.age
+++ b/secrets/hetzner_dns.age
@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 AaF/mQ YL7+ucBetoT2UoL9qjF9DJteCiMtFdasQsCewT1BD10
-7Ul9wBD8q0+C2+EDXtIf1EJZiQILTAyKBDBBZLymwGc
--> ssh-ed25519 hc2ELA SRY6T7u+UPyVrXIMYe33XJCx9kufjKBQiEaa+b+G21k
-iurQl6gJUqlA2l7NYfWgmjSMiSYNwSmp2eYxfLwAg1o
---- lBjJlPWS++Wn8DuZVtPscOhY+oydziGsy3EmCSDk6b4
-�X|J=c�F�     >c-��`�,#�M/�u��e�]Agx���|�\�*���^�m:��Q��c[�1�
\ No newline at end of file
+-> ssh-ed25519 AaF/mQ EZoWz6bvEwme4wCZhd0WvCZugq4qlo+LWZKS7jc5bls
+YvISG/guzDZngWtfQk1K/fm9BUIumsClGZ+/nuuI6UM
+-> ssh-ed25519 hc2ELA vVduWfxA8OxT66d2ttTpBMHjL2V3zVEiWcJBgi2qh3g
+k+7yP9GKJxEr00dC8FmJv76x1i24jpp0PB36Cad/ZtU
+--- 3uX8njDRW6pSgpvsbZh9fRSMA48VcQCxhnujZ4y2o34
+�ʖ5X�H�����6>&gd�X�VC@B��(G`��r��)r�E>!�{�8@6��V�������*�d�
\ No newline at end of file
diff --git a/secrets/radicale_users.age b/secrets/radicale_users.age
index 0278c6a..7e994c2 100644
--- a/secrets/radicale_users.age
+++ b/secrets/radicale_users.age
@@ -1,8 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 AaF/mQ REehqZdzLtQRa8OvoEfSq6/vmppPxyOrSpjL+/gPIVo
-2K5Nlxu1htb4anjFCRA3fZGvJQe15tVC+6YGFX9kBTw
--> ssh-ed25519 hc2ELA PRHemmUIsiFsInBhgi1BR/Sw1P2evdztU9qiWxwR8g8
-qCbqCdPnktNW9lIJoJym1bQGZXEa6MGFPC19j8D7W4A
---- rr5vMsfpCamnpSFxrhoPqTpNL0JcE1+X3bfyMOAvTlI
-cF�v��Uߒ���2V�5��G��0�  wlBV�'��߇4��;a:'@�
-�
�.�2-w��=�=��'>�iR�0������/�h��c���
\ No newline at end of file
+-> ssh-ed25519 AaF/mQ wPUN3GS46PJZERS87wZuYyt2frFweZbcpVyznNj3yxM
+ms3dHWObEhRFDHrzz34jg4l5nOAhlMKyf87Cw/IErsM
+-> ssh-ed25519 hc2ELA wRjlpamPn0ArPbiPUuJ04JOo4OiWSSLJ8qKkmSeSzBg
+709U03nwlm6XvGEwHkQfu4mD/VOIJ3N/DnamjRII060
+--- XQbf1Z0kOPI5RmchDcjPfIppI3Sxq9lSbpP77UbIR7c
+�peT��c�       5fm
+Y�Rĸ��4g���t�X `��Ң�����Fr�=����������hys�`���E�e��Xvw�I�#p�����HO:��G
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 4bfeab9..e337113 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,8 +1,8 @@
 let
-  vin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvM0xCLziR+ZT/SYE1aZM6dklbw4fEC17TWqbADIZRH kou@demiurge";
+  vin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvM0xCLziR+ZT/SYE1aZM6dklbw4fEC17TWqbADIZRH vin@demiurge";
   users = [ vin ];
 
-  demiurge = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBcyABhvBR+UR6PhEmd7ygJqUPeytK6IyljypxkQbZW";
+  demiurge = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII5jrbNQUeG/eONqcWz4edB6T98u1oOzfozCfpDASw1y";
   hastur = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN2ZUuPSPpIRULzMscBo5DJmA0UbFtG0jaANuzHo5aSQ";
   saklas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7RCmfdgJKPnaBi336ZcvDWboxPj8lTtW1eDTN5qR2R";
   systems = [
@@ -19,10 +19,9 @@ in
   "radicale_users.age".publicKeys = users ++ [ saklas ];
 
   "wg0_demiurge.age".publicKeys = users ++ [ demiurge ];
+  "wg1_demiurge.age".publicKeys = users ++ [ demiurge ];
   "wg0_hastur.age".publicKeys = users ++ [ hastur ];
-  "tailscale_demiurge.age".publicKeys = users ++ [ demiurge ];
-  "tailscale_hastur.age".publicKeys = users ++ [ hastur ];
-  "tailscale_saklas.age".publicKeys = users ++ [ saklas ];
+  "wg1_hastur.age".publicKeys = users ++ [ hastur ];
 
   "wpa_supplicant.age".publicKeys = users ++ [ hastur ];
 }
diff --git a/secrets/tailscale_demiurge.age b/secrets/tailscale_demiurge.age
index a855cf0..0536dc9 100644
--- a/secrets/tailscale_demiurge.age
+++ b/secrets/tailscale_demiurge.age
diff --git a/secrets/tailscale_hastur.age b/secrets/tailscale_hastur.age
index 420e7c8..d664fa8 100644
--- a/secrets/tailscale_hastur.age
+++ b/secrets/tailscale_hastur.age
diff --git a/secrets/tailscale_saklas.age b/secrets/tailscale_saklas.age
index b654cbc..a405b34 100644
--- a/secrets/tailscale_saklas.age
+++ b/secrets/tailscale_saklas.age
diff --git a/secrets/wg0_demiurge.age b/secrets/wg0_demiurge.age
index 85d6e3d..5bf6b4b 100644
--- a/secrets/wg0_demiurge.age
+++ b/secrets/wg0_demiurge.age
@@ -1,7 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 AaF/mQ 8mtbBEikYRatTBx3ulZV4KeSsiH7OIw/GrDtbF9pWyU
-liYjeeUNddFsDfT68D/EacHK1zSVGIHDZXP5X1sMDFc
--> ssh-ed25519 8fETJg +XTbKFpXPrlNSLKf7eZWQMNhx+hlTpwFvSiBYoKYVXk
-78D/CEvi739R7pfbcXXBl8CS8vFFD7rSZ99nqdxk3c0
---- QJPOO68vtmqgaHk4yZ0mOx8psnKf9V7154pJo7kCgD4
-Y<������:��_�!�=�jeOmꛢ�M�Gy
�ӿ�(҈u��s�#���18g��22O�Q���9!4jOD�Ь
\ No newline at end of file
+-> ssh-ed25519 AaF/mQ aV/397WepnR2CrcMhPFBJmNktH+OAQUvRlr9NBw/NQg
+cobNDmv8dluPX8ozqanS5H6qoeb4dnnpMrUCGxzgcUw
+-> ssh-ed25519 qGsXnw +Utxd9BMUno03dGW1Vha1AW6BaJaROEnAtq0AqVWwC0
+0n3LQH4Mm19wmqwngRemNcejfnawHURC0o+1DIIpX4A
+--- E5H0YRS/jeT1DIMHHSm5ltlZFE9/M85d7TAAsAYPibo
+�G�T{��
+ހ�[� �c�P2Ց�|���������s������g�C��e�.�W��l��c5�A�ȱ���u�M
\ No newline at end of file
diff --git a/secrets/wg0_hastur.age b/secrets/wg0_hastur.age
index b58442e..5eb4898 100644
--- a/secrets/wg0_hastur.age
+++ b/secrets/wg0_hastur.age
@@ -1,7 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 AaF/mQ wP+33FStqbBWU/Y6/+IH/xp63Db32bBjdg1eHmlqxhw
-tvItMKy4hkhyyQP7ZSUafbYShslrAufUDvgpowZDhvQ
--> ssh-ed25519 CQpZUw cNpihxkJx0SNeOJoyiLXxljIJHPDtxp+PQU7WRh8KS8
-y77XLusUoW8i1qPb4v9EFv/YLCif+mwIiRVwjANlLL0
---- mFeHPan7I2otyM9Eg0Ww5WQoU8m0maNjWe0zXhK9ks8
--y޸4&�����]d�,�q(Zxj�=���!9��2�i�b�<P�y��d~�j�>y���G
#�͜g�k�5���F�
\ No newline at end of file
+-> ssh-ed25519 AaF/mQ xnUEcreMyBcCyEqbwLr/yJfX+IQfRzCBPvxFYbJ1nWg
+o44T000ofF01fDitVpy+SfOUvqzGJOdjwwp4Hhrqwrg
+-> ssh-ed25519 CQpZUw +fiyOqZ5Qnu76R9inUu043rWhubP6wNKR2cHzX0TxhE
+UCnoHDBG7AhWXow09lZttpY1cPY5UmbgCjiweUZ27KA
+--- rJWSFOletZesgfzN20Fq2/uMZ1KUBnTX5e7zKMQFPxo
+Q
�VBŠ
"4���FO7���c�6k�]#���'}���h
L��;^e2�o�e�rj�s��
+mZD+{�o$��}�
\ No newline at end of file
diff --git a/secrets/wg1_demiurge.age b/secrets/wg1_demiurge.age
index 42e254c..2afcfe1 100644
--- a/secrets/wg1_demiurge.age
+++ b/secrets/wg1_demiurge.age
@@ -1,8 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 AaF/mQ s5k0xBJHij3zt4XcBnYCRLTr3fMS917cDJFJE7kqu1g
-pcW+ATcSqS1xfBoIax6T5Z8cyKThDvXltYVpX71uqcs
--> ssh-ed25519 8fETJg KHNOh1VCLvANjtqspWLDcbkyoGP/r0EyYLPzUdNzWXk
-XvA4LzN96uMoCD0ZLffCFBNVKgYaZ420X8uLGW9yWnc
---- 4uATkKlQIj3nvgtQ0spcODHVsyzFbY1hRryq3gkKnso
-���Y����*["X����~O�aj�i*i)Pw(�qH�
-�r9C�
������^1j�_x�MH�iE�h����}n�F��
\ No newline at end of file
+-> ssh-ed25519 AaF/mQ PUyKgjT5LOM7I7ruEIaqBpijJ7oXPozndHTDmcGsO20
+KdTGqtJfZZXwmJ4rAghMmciB0iSjW/PpDocBC5aCTLc
+-> ssh-ed25519 qGsXnw Kqk732OSJ+5NGgGNqg9Hhf/lA+SDIXAa9Y8WtfBvWRY
+CD9SMTLbE5gGZYBZb377lUlQ21fq4leg6iRmJvKXHAQ
+--- Ix4uk93AYnNTapTLwarg6jJhAfIDDGDM8fP2b+iIwgo
+����Zoė��5��SGmk�   C7�,�[�òMf/!qU%�(��sK��+�ZN�6hCA5����ϭ�P��L���
\ No newline at end of file
diff --git a/secrets/wg1_hastur.age b/secrets/wg1_hastur.age
index 197c2fb..83daed7 100644
--- a/secrets/wg1_hastur.age
+++ b/secrets/wg1_hastur.age
diff --git a/secrets/wpa_supplicant.age b/secrets/wpa_supplicant.age
index 310e36f..e648603 100644
--- a/secrets/wpa_supplicant.age
+++ b/secrets/wpa_supplicant.age