chore: migrate disk host

modules/acme/environment.age

@@ -1,13 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw /sYx2CZG4l/oWbh9aKT4lFOcSiwY6A9SxwgX32mXqBs
-iK6qzFpI4xGh5m4oqmW18eM2v6OVj/z3t1aRslnhH50
--> ssh-ed25519 spFFQA S3tkGQbTGQgWcp8Uh625eMCnE/h4nFVeb/z1AVemBkw
-9RiAPo2w7PC+2abVofU1Aficcn0eOfvvOMgxGXRIL+0
--> ssh-ed25519 dASlBQ zuVu1QbtutWUG93M+i/UlVlkrmUdz71SrW8jhV4Pxg4
-OMEdnXV0Ix11FRX58Q3zH7nRG2tSkBl1wDmGY7J4JLM
--> ssh-ed25519 CzqbPQ XLqIYDBAQXyL4/khZ71XP6uajnkX2HhzA2Ksx1UTGiU
-MWrt9f1XjxECD4TRKbME2bN4XU1ns9VQ7btuqijXJYU
---- rpTCT+04nE+Jl+2qDHbocBGeYQYBtW/EcRiYHWTqcvw
-ñP3ÐÔ¢p
¸ŸQ¬^“¬­ ³š8lA<6C>¶Å»‰ÌhYQê±	Gü×ÿ‘¢ðWÐüÊ'ï&ãתHÐÉ;Ü<>ï ¼	á*3™­û Ð÷
-t€AõàOXkˆ>M¸††öiœ:!äo¸Ì›s9å!:£$£rŽ»ÿaŽ4"HUD
-Œ¾ËbHºôH£–w'Å Ì<C2A0>Ù±x·³ÌJ¨<>àXœYy«+å–ú¡P»(‹eG&&ŽTGÐ'ÔÍ8à:!)Ôª<´
+-> ssh-ed25519 +rZ0Tw DMMzxXSIPSsRLkIvKJAiE6OzV1z3EZ0T+od2iIxMiA0
+OHVLHmVzeiWlsVI+DQ5M+iNik+nsdiQBz4zcquygC0A
+-> ssh-ed25519 spFFQA TVqArtAoudQlrgAqshCP8ZU0YlVZoKwkvUVh968NqC8
+Cy7+Y1rTFiAoWp6Gw8a1cljCjWPHtNwXjlXWQyu8A8U
+-> ssh-ed25519 dASlBQ ui5a61Tg1JoJvR8okc8qKkDhrSE9dH84XZQWhLn7cCo
+5ehK2bvVgLZSYr5AstV1dwW7/qaVGRxs8PdzAg7sk4w
+-> ssh-ed25519 CzqbPQ wgktFhPRIAwX8BNJu8svEHDrpz0ZCOw94nR+M3FJCTY
+RAErTHg/g/voC7yPf2lB+ELmysNwQXre9jucw2y+ZVc
+--- AB7oiyhts6riNlp5xuWsFTzIx2y7Axn0CU4uCXHfVLo
+ê`8³ô¡eߧJ°SçT'ûBÄ›ýz÷gÖK‹‰Ÿ®üªÕ
¡zꚉWc¡Fݸ3ᇴGRÁ}’²¼R×™qü6Ä]¢òn€0bÖ<
+ãÉdàÔ´ø\EƒC”•MìUͱÀØ¿3ü X{qé¶ö<C2B6>jÊ<6A>ŠEŠ0&MìÙë8x¸t‰öʈ¢°F	Ç}/Oáqž_<C5BE>:ýªÝï¹ÒŸ0£ö±ßá(•I/hôËKH„Ÿ„K\ÊÏX\'(ÒgÀŠ†b±A¶ßÜ<>

modules/common/ssh/config.age

@@ -1,12 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw 6O4kuzuRQRYphZTIWeFHBxZ8iRImicVWzISKkRDpkHU
-e4kCn+CEtt85NtnEik+GwHyP4VxO926URUgUSXPKF3E
--> ssh-ed25519 spFFQA lzDLZiLU3qfjGEIxLVk6ax+UqvEDsBzyDEA5oBXl+1k
-fA0ObL1S1V19XSv+Wj+sZlxxMQoVDTgMvncn4y56RHo
--> ssh-ed25519 dASlBQ qZALhRmOTNN4Q/rKN6MQkEUFfFbGBZdwrx3rLtC3Xis
-+cNLajIY16dErY3W5jyQt1q/O+AZ08pgqxbxh2e6MV4
--> ssh-ed25519 CzqbPQ YnkQEcf1jOm9/voAlbqmjPdTlNFeyW1eeHGC53V4n2c
-RVtx1VD0yzSGFwBJ7y5nNWBA0qEt8VXwKjCw3c5iMS8
---- j7fj7Ke05D5Q7xr9LhM6++la9TW0gn2R46DxBztXgGE
-˺Õ_´+‚=xMvy¡“Qœ¥•
-à+-‡¶©te{2Ìÿ¨õ.‹§©æìØGÓ2¦ €’Ö¨Ž<>¢ù}#²ùeA²ÞųAT-©u€Í’ÃÊs†
+-> ssh-ed25519 +rZ0Tw ifhIam0q2bs/Y59Z7OcOSOLoTL6+ZpEnnSp+NV6M7wU
+iW4MNMvME9OoYs98bofV5yIAzkRnEC/r+VcI9oDHWGU
+-> ssh-ed25519 spFFQA JwTUt4N7UUYn2DS6BIXceJTxnZSssFh8eFRcg9Fz+18
+aah1QHiAM2qSkKoQPxzNTDQVxyxaJUNGtVXJSNv1n48
+-> ssh-ed25519 dASlBQ jeeRHlJ/5hqyDX2GiQYk1ZRgkpBid9jzZ5qeqVzByyk
+OawpP+fHhVqoB4OFw1ATbc53TZcVMR4EGJ2xcV67xq8
+-> ssh-ed25519 CzqbPQ a2f0ztMO4RQdadwdHbb70javzdF+loMSA65ts+crexI
+inoxpsQcz/ZintLwIsvtOeCdRJ/gqvNdDGRyyXPFBEw
+--- m4JEHQx5W7mCBUSctSb2U9CJSFKEu6oROraAR2pyU7s
+vÐŽþ«ßÂ4‡<34>ø ‘J$·âðÌSú<53>¶#sÖQÜËÒ\ôPîô?Oعâ`ìVRIÿ.ÖÚ™™C¹Ñ£žQ9ù`*DV¤T•PZÇø¡BÕJȤÄâèqí

modules/common/ssh/default.nix

@@ -40,11 +40,11 @@ in {
         #   port     = 2222;
         # };
 
-        # disk = {
-        #   hostname = self.disk.networking.ipv4;
-        #   user     = "floppy";
-        #   port     = 2222;
-        # };
+        disk = {
+          hostname = self.disk.networking.ipv4;
+          user     = "floppy";
+          port     = 2222;
+        };
 
         nine = {
           hostname = self.nine.networking.ipv4;

modules/linux/ip.nix

@@ -0,0 +1,16 @@
+{ config, lib, ... }: let
+  inherit (config.networking.defaultGateway) interface;
+  inherit (lib) optionals;
+in {
+  networking.interfaces.${interface} = {
+    ipv4.addresses = optionals (config.networking.ipv4 != null) [{
+      address      = config.networking.ipv4;
+      prefixLength = 22;
+    }];
+
+    ipv6.addresses = optionals (config.networking.ipv4 != null)  [{
+      address      = config.networking.ipv6;
+      prefixLength = 64;
+    }];
+  };
+}

modules/mail/default.nix

@@ -1,8 +1,6 @@
 { self, config, lib, ... }: let
   inherit (lib) const enabled genAttrs head mkDefault;
   inherit (config.networking) domain;
-
-  fqdn = "mail1.${domain}";
 in {
   imports = [(self + /modules/acme)];
 
@@ -19,8 +17,6 @@ in {
   acmeGroup = "mail";
 
   mailserver = enabled {
-    fqdn = mkDefault fqdn;
-
     domains           = mkDefault [ domain ];
     certificateScheme = "acme";
 

modules/mail/password.plain.age

@@ -1,12 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw yK5fuqcnE1yO5tTAudZ/TXDvBf0sn4eCr39j/jZgil0
-+hTr80COfDui7lhRnaDjNB2c2gtNOKQaiW4Yiz0am/A
--> ssh-ed25519 spFFQA kDMyjjSxHOaLZ6ocr/q7MmRoqrXHdzHFzbZslaA0hlE
-jurwi1z6m+weYx5Wr3+E8+2fbYgwPFTKOPOuAYjt8wI
--> ssh-ed25519 dASlBQ 5CYRg+Sw+jDk+S1EtLEG+PXf6EKJwx/Re9e/txOrs2A
-vUaTfOS9Fuce2x/qL5Pg3L0ZHZPBrhr63W4UT0n28uI
--> ssh-ed25519 CzqbPQ 1uz6duuPfhpAjWjGdjwUGr7UHyqxG/zKn6rCVPgxSF8
-y5t/i2p08GqDOeaC27CJE528br/qU4i+iUEvMXDdX4w
---- mGUus7T7rcsjt8LRCBc0vr5f3KFLSZweFYvaaNen+zg
-iOﾐ2ﾑｻGQ
(o
<0A>X3=>ｮ:ｨｲﾉ)m鄂
-ﾀﾁ削"[炅ｻQ
+-> ssh-ed25519 +rZ0Tw e/Myh9IdG3mTDdO2Y6dQX1xH7O/wXFXeu5J/3L9AZns
+FflORBOBRxFu+BxdFocuYpAMROBks9S+n/jo+fGYzNI
+-> ssh-ed25519 spFFQA VjBxKfyWeNSLlyryeQ/XHtQZIrYOIPaaGsir52DBAn4
+gI3kBrmv7za+3n00TeUXAlA0rHLmwFq3rcd4XjUpZu4
+-> ssh-ed25519 dASlBQ YNcwqwyyyjqthVG1U51b8ZlWJy97oaBhspAloOyG2Sw
+OjdM1z/V3OOIIJCQfslqvUq2UAoZMBLTpjRhgJnvUSY
+-> ssh-ed25519 CzqbPQ Zg6rZXjzr4SBL7C9Ns9OgIOh+Cu4nMN9g8k7p64kuAk
+vgFArTTOqj72QjbfKnstG9rOUcFygZBMPKFPFlpeAok
+--- dougaYMQ93Sk/8K3EcxZJCLLpikrKytfNgWpVbQ7yYM
+Áâ÷êÀÆr™E©vЫ®_#ëQûŠk|â<»³
+ˆ#vbã4Õ9GaI,F