From a5a06a707002183c5dbd060b31effd2ed5a99e8c Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Fri, 3 Feb 2023 14:33:15 +0100
Subject: [PATCH] Update mimir to Linux 6.1, power management tweaks

---
 machines/mimir/configuration.nix          | 3 ++-
 machines/mimir/hardware-configuration.nix | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index c5b170c..d1e4bed 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -36,7 +36,7 @@
     base = {
       plymouth.enable = true;
       work = true;
-      kernel = pkgs.linuxKernel.packages.linux_6_0;
+      kernel = pkgs.linuxKernel.packages.linux_6_1;
     };
 
     desktop = {
@@ -171,6 +171,7 @@
   programs.ssh.startAgent = true;
 
   services.envfs.enable = true;
+  services.cpupower-gui.enable = true;
 
   services.xserver.libinput = {
     enable = true;
diff --git a/machines/mimir/hardware-configuration.nix b/machines/mimir/hardware-configuration.nix
index f8d3d94..5124857 100644
--- a/machines/mimir/hardware-configuration.nix
+++ b/machines/mimir/hardware-configuration.nix
@@ -2,9 +2,9 @@
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" ];
-  boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
+  # boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
   boot.extraModulePackages = [ ] ++
-    (with config.boot.kernelPackages; [ rtl88x2bu zenpower ]);
+    (with config.boot.kernelPackages; [ rtl88x2bu zenpower cpupower ]);
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";
@@ -30,6 +30,7 @@
     [{ device = "/dev/disk/by-label/swap"; }];
 
   powerManagement.cpuFreqGovernor = "ondemand";
+
   hardware = {
     video.hidpi.enable = true;
     enableAllFirmware = true;