From c4e2eb5437b3aad924a5b29a2f0e519a9096543f Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Fri, 3 Feb 2023 14:32:00 +0100
Subject: [PATCH 1/4] Add taplo to devshell

---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index 8eeb602..956e149 100644
--- a/flake.nix
+++ b/flake.nix
@@ -259,6 +259,7 @@
                   nixos-install-tools
                   terraform
                   terraform-ls
+                  taplo
 
                   disko.packages.${system}.disko
 

From 54b1d8c505a9485c7769611380121bf632c6a332 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Fri, 3 Feb 2023 14:32:46 +0100
Subject: [PATCH 2/4] Tweak dunst notification style

---
 home-manager/modules/dunst/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/home-manager/modules/dunst/default.nix b/home-manager/modules/dunst/default.nix
index 782b96c..1156610 100644
--- a/home-manager/modules/dunst/default.nix
+++ b/home-manager/modules/dunst/default.nix
@@ -23,7 +23,7 @@ in
       settings = {
         global = {
           follow = "mouse";
-          width = "(10, 500)";
+          width = "(10, 960)";
           height = 200;
           origin = "top-right";
           offset = "25x25";
@@ -39,7 +39,7 @@ in
           separator_color = "frame";
           sort = "yes";
           idle_threshold = 120;
-          font = "Meslo Nerd Font 10";
+          font = "Iosevka Nerd Font 20";
           line_height = 0;
           markup = "full";
           format = "%s %p\\n%b";
@@ -64,18 +64,18 @@ in
         };
         urgency_low = {
           background = "#282a36";
-          foreground = "#6272a4";
+          foreground = "#aaaaaa";
           timeout = 10;
         };
         urgency_normal = {
           background = "#282a36";
-          foreground = "#bd93f9";
+          foreground = "#eeeeee";
           timeout = 10;
         };
         urgency_high = {
           background = "#ff5555";
           foreground = "#f8f8f2";
-          frame_color = "#ff5555";
+          frame_color = "#ffffff";
           timeout = 0;
         };
       };

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 3/4] 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;

From 360e3af624ccd00f0c888549c14eadfa63faacd4 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Fri, 3 Feb 2023 14:33:40 +0100
Subject: [PATCH 4/4] Add some programs to work profile

---
 users/erwin/work.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index 5ac4f1d..bca382f 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -90,7 +90,7 @@ in
         blink1-tool
         bottom
         cider
-        commitgpt
+        dbeaver
         fd
         feh
         ffmpeg_5-full
@@ -108,14 +108,17 @@ in
         pamedia
         quintom-cursor-theme
         procs
+        qgis
         recursive
         ripgrep
-        signal-desktop
+        s-tui
         solo2-cli
+        stress
         units
         unzip
         xdg-utils
         xkb-switch
+        zathura
         zeal
       ]
       ++ (with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]);
@@ -137,6 +140,7 @@ in
             "application/xhtml+xml" = "firefox.desktop";
             "application/x-extension-xhtml" = "firefox.desktop";
             "application/x-extension-xht" = "firefox.desktop";
+            "application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop";
           };
           associations = {
             added = {
@@ -144,6 +148,7 @@ in
               "image/png" = "feh.desktop";
               "image/gif" = "feh.desktop";
               "application/zip" = "org.gnome.FileRoller.desktop";
+              "application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop";
             };
           };
         };