From 7d458197c081128c30ac421665019a59fb2efe3e Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Thu, 1 Sep 2022 00:28:15 +0200
Subject: [PATCH] Fix black screen after suspend

---
 flake.nix                 | 6 +++---
 hardware/clevo-nl51ru.nix | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7bf86aa..bb1318a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,15 +52,15 @@
                   executeAfter = [ "${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png" ];
                   rules = [
                     {
-                      name = "Work HDMI";
+                      name = "External HDMI";
                       outputs_connected = [ "HDMI-1" ];
                       configure_single = "HDMI-1";
                       primary = true;
                       atomic = true;
                     }
                     {
-                      name = "Fallback";
-                      configure_single = "eDP-1";
+                      name = "Primary";
+                      configure_single = "eDP";
                     }
                   ];
                 };
diff --git a/hardware/clevo-nl51ru.nix b/hardware/clevo-nl51ru.nix
index f53e06e..ded4f34 100644
--- a/hardware/clevo-nl51ru.nix
+++ b/hardware/clevo-nl51ru.nix
@@ -7,17 +7,19 @@
     ];
 
   boot = {
-    initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
+    initrd.availableKernelModules = [ "nvme" "xhci_pci" "sdhci_pci" ];
     initrd.kernelModules = [ "dm-snapshot" ];
     kernelModules = [ "kvm-amd" ];
     # Required, otherwise the kernel freezes on boot
-    kernelParams = [ "nomodeset" ];
+    kernelParams = [ "amd_iommu=on" "iommu=pt" "pci=noats" ];
     extraModulePackages = [ ];
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
     initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61";
   };
 
+  hardware.cpu.amd.updateMicrocode = true;
+
   fileSystems."/" =
     {
       device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e";