From 3e43aed875ddc366c1f545fbc64673609295e4fa Mon Sep 17 00:00:00 2001
From: Florian Schmitt <mrflos@gmail.com>
Date: Tue, 7 Jan 2025 14:18:17 +0300
Subject: [PATCH] fix: systemd unfreeze, remove intel

---
 machines/dragon/configuration.nix          |  2 +-
 machines/dragon/hardware-configuration.nix |  1 -
 machines/luffy/configuration.nix           |  1 +
 modules/desktop.nix                        |  4 ++--
 modules/nixos.nix                          |  5 ++++-
 modules/systemd-unfreeze.nix               | 15 +++++++++++++++
 6 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 modules/systemd-unfreeze.nix

diff --git a/machines/dragon/configuration.nix b/machines/dragon/configuration.nix
index 31f40fa..b82a0ac 100644
--- a/machines/dragon/configuration.nix
+++ b/machines/dragon/configuration.nix
@@ -81,7 +81,6 @@
   services.xserver = {
     enable = true;
     videoDrivers = [
-      "intel"
       "nvidia"
     ];
     xkb.layout = "us";
@@ -154,6 +153,7 @@
     ../../modules/home-config.nix
     ../../modules/local-dev.nix
     ../../modules/nixos.nix
+    ../../modules/systemd-unfreeze.nix
   ];
 
   # This value determines the NixOS release from which the default
diff --git a/machines/dragon/hardware-configuration.nix b/machines/dragon/hardware-configuration.nix
index 0a6fe6f..dcac166 100644
--- a/machines/dragon/hardware-configuration.nix
+++ b/machines/dragon/hardware-configuration.nix
@@ -76,5 +76,4 @@
   };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/machines/luffy/configuration.nix b/machines/luffy/configuration.nix
index 2df3560..3ad6ea0 100644
--- a/machines/luffy/configuration.nix
+++ b/machines/luffy/configuration.nix
@@ -79,6 +79,7 @@
     ../../modules/laptop.nix
     ../../modules/local-dev.nix
     ../../modules/nixos.nix
+    ../../modules/systemd-unfreeze.nix
   ];
   services.eris-server = {
     enable = true;
diff --git a/modules/desktop.nix b/modules/desktop.nix
index d1206ed..f0097b4 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -30,7 +30,7 @@
     displayManager.sddm.wayland.enable = true;
     displayManager.sddm.enable = true;
     displayManager.sddm.enableHidpi = true;
-    displayManager.sddm.theme = "rose-pine";
+    #displayManager.sddm.theme = "rose-pine";
     dbus.enable = true;
   };
 
@@ -90,7 +90,7 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    (callPackage ./sddm-rose-pine.nix { })
+    #(callPackage ./sddm-rose-pine.nix { })
     (vscode-with-extensions.override {
       vscode = vscodium;
       vscodeExtensions =
diff --git a/modules/nixos.nix b/modules/nixos.nix
index ddb4a9b..15c3459 100644
--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@@ -4,7 +4,10 @@
     enable = true;
   };
 
-  nix.settings.experimental-features = [ "nix-command" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   # Automatic Garbage Collection
   nix.gc = {
diff --git a/modules/systemd-unfreeze.nix b/modules/systemd-unfreeze.nix
new file mode 100644
index 0000000..650d233
--- /dev/null
+++ b/modules/systemd-unfreeze.nix
@@ -0,0 +1,15 @@
+# Workaround for disabling semi-broken systemd user slice freezing (whatever
+# that is). This can cause machines to become unusable after resume.
+
+let
+  override.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
+in
+{
+  systemd.services = {
+    systemd-suspend = override;
+    systemd-hibernate = override;
+    systemd-hybrid-sleep = override;
+    systemd-suspend-then-hibernate = override;
+  };
+}
+