architect: Module cleanup

hosts/architect/default.nix

@@ -45,7 +45,6 @@ in
   ];
 
   time.timeZone = "Europe/Rome";
-  #  system.stateVersion = "21.11";
   users.users.giulio.openssh.authorizedKeys.keys = pubkeys;
   boot = {
     initrd = {
@@ -60,10 +59,7 @@ in
         };
       };
     };
-  };
 
-  services.fwupd.enable = true;
-  boot = {
     kernelParams = [
       "ip=${network.architect-lan}::10.0.0.1:255.255.255.0::${network.wan-if}:off"
       "nvme_core.default_ps_max_latency_us=5500"
@@ -130,17 +126,15 @@ in
     '';
   };
 
-  environment.systemPackages = with pkgs; [ cachix ];
+  hardware.opengl = {
-
+    enable = true;
-  hardware = {
+    extraPackages = with pkgs; [ vaapiVdpau ];
-    opengl.enable = true;
+    driSupport = true;
-    opengl.extraPackages = with pkgs; [ vaapiVdpau ];
-    opengl.driSupport = true;
   };
 
-  services.das_watchdog.enable = true;
-
   services = {
+    fwupd.enable = true;
+    das_watchdog.enable = true;
     zfs.autoScrub.enable = true;
     xserver.videoDrivers = [ "nvidia" ];
     openssh = {
@@ -154,5 +148,8 @@ in
     smartd.enable = true;
   };
 
-  environment.variables = { LIBVA_DRIVER_NAME = "vdpau"; };
+  environment = {
+    variables = { LIBVA_DRIVER_NAME = "vdpau"; };
+    systemPackages = with pkgs; [ cachix ];
+  };
 }