1 files changed, 4 insertions, 21 deletions
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;
     };
   };