cleaned a bit

hosts/giupi/default.nix

@@ -17,13 +17,42 @@ in {
     ../../users.nix
   ];
 
+  boot = {
+    kernelParams = ["ip=${lan_address}::10.0.0.1:255.255.255.0::enp5s0:off"];
+
+    initrd = {
+      availableKernelModules = ["igc" "r8169"];
+      network = {
+        enable = true;
+        ssh = {
+          enable = true;
+          port = 2222; 
+          hostKeys = [/boot/host_ecdsa_key];
+          authorizedKeys = pubkeys;
+        };
+
+        postCommands = ''
+            echo "zfs load-key -a; killall zfs" >> /root/.profile
+        '';
+      };
+    };
+
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    supportedFilesystems = ["zfs"];          
+    zfs.requestEncryptionCredentials = true; 
+  };
+
   variables.hostname = hostname;
 
-    # Set your time zone.
   time.timeZone = "Europe/Rome";
 
   networking = {
     hostName = hostname;
+    hostId = "49350853";
     useDHCP = false;
     interfaces = {
       enp5s0.ipv4.addresses = [{ address = lan_address; prefixLength = 24; }];
@@ -86,36 +115,6 @@ ${lan_address}	${hostname}.devs.giugl.io giugl.io jf.giugl.io yt.giugl.io s3.giu
     '';
   };
 
-    boot = {
-      kernelParams = ["ip=${lan_address}::10.0.0.1:255.255.255.0::enp5s0:off"];
-
-      initrd = {
-        availableKernelModules = ["igc" "r8169"];
-        network = {
-          enable = true;
-          ssh = {
-            enable = true;
-            port = 2222; 
-            hostKeys = [/boot/host_ecdsa_key];
-            authorizedKeys = pubkeys;
-          };
-
-          postCommands = ''
-            echo "zfs load-key -a; killall zfs" >> /root/.profile
-          '';
-        };
-      };
-
-      loader = {
-        systemd-boot.enable = true;
-        efi.canTouchEfiVariables = true;
-      };
-
-      supportedFilesystems = ["zfs"];          
-      zfs.requestEncryptionCredentials = true; 
-    };
-
-    networking.hostId = "49350853";
   environment.systemPackages = with pkgs; 
   [
     neovim
@@ -170,5 +169,5 @@ ${lan_address}	${hostname}.devs.giugl.io giugl.io jf.giugl.io yt.giugl.io s3.giu
   system.stateVersion = "21.05"; # Did you read the comment?
 
   users.users.giulio.openssh.authorizedKeys.keys = pubkeys;
-  }
+}