From 309858b2f22cf9d8c63232fbcb56d9380045e052 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Wed, 3 Apr 2024 00:41:39 +0200
Subject: [PATCH] Cleanup

---
 hosts/seb-desktop/hardware.nix | 18 +++---------------
 hosts/seb-laptop/default.nix   |  1 -
 hosts/seb-laptop/hardware.nix  | 22 ++++++----------------
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/hosts/seb-desktop/hardware.nix b/hosts/seb-desktop/hardware.nix
index 43c1cab..6c595cd 100644
--- a/hosts/seb-desktop/hardware.nix
+++ b/hosts/seb-desktop/hardware.nix
@@ -1,26 +1,14 @@
-{
-    inputs,
-    config,
-    lib,
-    ...
-}: {
+{inputs, ...}: {
     imports = [
         inputs.disko.nixosModules.default
         ./disko.nix
     ];
 
     hardware.enableRedistributableFirmware = true;
-
     boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
-    boot.initrd.kernelModules = [];
     boot.kernelModules = ["kvm-amd" "adm1021" "nct6775"];
-    boot.extraModulePackages = [];
-
-    networking.useDHCP = lib.mkDefault true;
-
-    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
+    nixpkgs.hostPlatform = "x86_64-linux";
+    hardware.cpu.amd.updateMicrocode = true;
     services.xserver.videoDrivers = ["nvidia"];
 
     services.autorandr = {
diff --git a/hosts/seb-laptop/default.nix b/hosts/seb-laptop/default.nix
index d5b0243..4a509fd 100644
--- a/hosts/seb-laptop/default.nix
+++ b/hosts/seb-laptop/default.nix
@@ -24,7 +24,6 @@
         vpn.lgs.enable = true;
         comma.enable = true;
         sops.enable = true;
-        doas.enable = false;
         printing.enable = true;
         syncthing.enable = true;
     };
diff --git a/hosts/seb-laptop/hardware.nix b/hosts/seb-laptop/hardware.nix
index fa801a5..fba999a 100644
--- a/hosts/seb-laptop/hardware.nix
+++ b/hosts/seb-laptop/hardware.nix
@@ -1,15 +1,4 @@
-{
-    config,
-    lib,
-    ...
-}: {
-    hardware.enableRedistributableFirmware = true;
-
-    boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod"];
-    boot.initrd.kernelModules = [];
-    boot.kernelModules = ["kvm-amd"];
-    boot.extraModulePackages = [];
-
+{...}: {
     fileSystems."/" = {
         device = "/dev/disk/by-uuid/92437114-de06-4a78-9ee3-c7d0ffcabf95";
         fsType = "ext4";
@@ -24,10 +13,11 @@
         {device = "/dev/disk/by-uuid/1eba93d1-4853-4534-8cfd-5c14e29c6ff6";}
     ];
 
-    networking.useDHCP = lib.mkDefault true;
-
-    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    hardware.enableRedistributableFirmware = true;
+    boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod"];
+    boot.kernelModules = ["kvm-amd"];
+    nixpkgs.hostPlatform = "x86_64-linux";
+    hardware.cpu.amd.updateMicrocode = true;
 
     services.autorandr = {
         enable = true;