3 files changed, 21 insertions, 58 deletions
diff --git a/machines/nixos/x86_64-linux/do-rproxy.nix b/machines/nixos/x86_64-linux/do-rproxy.nix
index bac3885..dd20df3 100644
--- a/machines/nixos/x86_64-linux/do-rproxy.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy.nix
@@ -3,11 +3,19 @@
   lib,
   pkgs,
   config,
-  modulesPath,
   adminUser,
   ...
 }:
 {
+  imports = [
+    ../../../profiles/cgroups.nix
+    ../../../profiles/defaults.nix
+    ../../../profiles/disk/basic-vm.nix
+    ../../../profiles/hardware/do-droplet.nix
+    ../../../profiles/home-manager.nix
+    ../../../profiles/server.nix
+  ];
+
   age = {
     secrets = {
       cloudflare-nginx = {
@@ -19,14 +27,6 @@
     };
   };
 
-  imports = [
-    (modulesPath + "/virtualisation/digital-ocean-config.nix")
-    ../../../profiles/disk/basic-vm.nix
-    ../../../profiles/defaults.nix
-    ../../../profiles/server.nix
-    ../../../profiles/cgroups.nix
-  ];
-
   disko.devices.disk.disk1.device = "/dev/vda";
 
   networking.hostName = "do-rproxy";
@@ -57,8 +57,6 @@
   networking.firewall.trustedInterfaces = [ "wg0" ];
   networking.firewall.allowedUDPPorts = [ 51871 ];
 
-  my.modules.hardware.do-droplet.enable = true;
-
   system.stateVersion = "25.05"; # Did you read the comment?
 
   networking.firewall.allowedTCPPorts = [
diff --git a/machines/nixos/x86_64-linux/rivendell.nix b/machines/nixos/x86_64-linux/rivendell.nix
index 969133c..90fbce3 100644
--- a/machines/nixos/x86_64-linux/rivendell.nix
+++ b/machines/nixos/x86_64-linux/rivendell.nix
@@ -1,19 +1,17 @@
 {
   lib,
   config,
-  modulesPath,
-  inputs,
   adminUser,
   ...
 }:
 {
   imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    inputs.nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
-    ../../../profiles/disk/btrfs-on-luks.nix
     ../../../profiles/cgroups.nix
     ../../../profiles/defaults.nix
+    ../../../profiles/disk/btrfs-on-luks.nix
     ../../../profiles/forgejo.nix
+    ../../../profiles/hardware/framework-desktop.nix
+    ../../../profiles/home-manager.nix
     ../../../profiles/keycloak.nix
     ../../../profiles/remote-unlock.nix
     ../../../profiles/server.nix
@@ -31,21 +29,7 @@
     };
   };
 
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "thunderbolt"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-    "r8169" # ethernet driver
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking.hostName = "rivendell";
   networking.useDHCP = lib.mkDefault true;
@@ -95,13 +79,12 @@
     ];
   };
 
-  my.modules.hardware.baremetal.enable = true;
-
   home-manager = {
     users.${adminUser.name} = {
       imports = [
         ../../../home/profiles/minimal.nix
       ];
+      inherit (adminUser) userinfo;
     };
   };
 
diff --git a/machines/nixos/x86_64-linux/synology-vm.nix b/machines/nixos/x86_64-linux/synology-vm.nix
index 0ffe222..1b9b7e7 100644
--- a/machines/nixos/x86_64-linux/synology-vm.nix
+++ b/machines/nixos/x86_64-linux/synology-vm.nix
@@ -1,11 +1,18 @@
 {
-  modulesPath,
   lib,
   adminUser,
   config,
   ...
 }:
 {
+  imports = [
+    ../../../profiles/cgroups.nix
+    ../../../profiles/defaults.nix
+    ../../../profiles/disk/basic-vm.nix
+    ../../../profiles/home-manager.nix
+    ../../../profiles/server.nix
+  ];
+
   age = {
     secrets = {
       restic_gcs_credentials = {
@@ -23,31 +30,6 @@
     };
   };
 
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-    (modulesPath + "/installer/scan/not-detected.nix")
-    ../../../profiles/defaults.nix
-    ../../../profiles/server.nix
-    ../../../profiles/cgroups.nix
-    ../../../profiles/disk/basic-vm.nix
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot.enable = true;