europa: disable most of the nixos-hardware changes prevously added

flake.nix

@@ -45,8 +45,9 @@
     };
   };
 
-  outputs = { self, unstable, unstableSmall, stable, nixos-hardware, sshKnownHosts, microca
-    , mcchunkie, gqrss, darwin, xin-secrets, ... }@flakes:
+  outputs = { self, unstable, unstableSmall, stable, nixos-hardware
+    , sshKnownHosts, microca, mcchunkie, gqrss, darwin, xin-secrets, ...
+    }@flakes:
     let
       hostBase = {
         overlays = [ flakes.emacs-overlay.overlay ];
@@ -112,11 +113,7 @@
       devShells.aarch64-darwin.default = buildShell darwinPkgs;
 
       nixosConfigurations = {
-        europa = buildSys "x86_64-linux" unstable [
-          "${nixos-hardware}/common/cpu/intel"
-          "${nixos-hardware}/common/pc/laptop"
-          "${nixos-hardware}/common/pc/laptop/ssd"
-        ] "europa";
+        europa = buildSys "x86_64-linux" unstable [ ] "europa";
         box = buildSys "x86_64-linux" stable [ ] "box";
         h = buildSys "x86_64-linux" unstableSmall [ ] "h";
         faf = buildSys "x86_64-linux" stable [ ] "faf";

hosts/europa/default.nix

@@ -44,11 +44,8 @@ in {
       efi.canTouchEfiVariables = true;
     };
     kernelPackages = pkgs.linuxPackages;
-    kernelParams = [ "boot.shell_on_fail" "nvme.noacpi=1" ];
+    kernelParams = [ "boot.shell_on_fail" ];
     kernelModules = [ "kvm-intel" ];
-    extraModprobeConfig = ''
-      options snd-hda-intel model=dell-headset-multi
-    '';
   };
 
   programs.zsh.shellAliases = {
@@ -132,7 +129,6 @@ in {
       enable = true;
       client.enable = true;
     };
-    #blueman.enable = true;
     cron = {
       enable = true;
       systemCronJobs = [
@@ -145,6 +141,7 @@ in {
     #  lidSwitch = "suspend-then-hibernate";
     #  lidSwitchExternalPower = "lock";
     #};
+    fstrim.enable = true;
     tlp = {
       enable = false;
       settings = {
@@ -162,7 +159,6 @@ in {
 
     udev.extraRules = ''
       SUBSYSTEM=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="5bf0", GROUP="users", TAG+="uaccess"
-      SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on"
     '';
   };
 

hosts/europa/hardware-configuration.nix

@@ -58,6 +58,7 @@
   };
 
   swapDevices = [ ];
+  # needed for hibernate
   #swapDevices =
   #  [{ device = "/dev/disk/by-uuid/6e56876e-bd04-4fbb-9ff7-5202cbf5eaa4"; }];