From d72a8c002146b87e91d8445c86f87e3c9a848589 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Wed, 12 Jan 2022 16:51:39 -0700
Subject: [PATCH] allow customizing screenshots path and fix battery stuff

---
 home-manager/modules/ezpcusr.nix | 16 ++++++++--------
 modules/workstation.nix          | 12 +++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 097bf3d..bae63b9 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -18,8 +18,8 @@ let
 
   getscrloc = pkgs.writeScript "getscrloc.sh" ''
     #!${pkgs.zsh}/bin/zsh
-    mkdir -p "$HOME/Pictures/Screenshots"
-    echo "$HOME/Pictures/Screenshots/$(date +%F_%T).''${1:-png}"
+    mkdir -p "${cfg.screenshotsPath}"
+    echo "${cfg.screenshotsPath}/$(date +%F_%T).''${1:-png}"
   '';
 
   scrsaveclip = pkgs.writeScript "scr-save-clip.sh" ''
@@ -106,6 +106,12 @@ in
         "A path to a script that takes a path to a file and returns a URL";
     };
 
+    screenshotsPath = mkOption {
+      description = "Path to save screenshots in";
+      default = "$HOME/Pictures/Screenshots";
+      type = types.str;
+    };
+
     bitwardenSession = mkOption {
       description = "Session key for bitwarden";
       default = "";
@@ -123,12 +129,6 @@ in
       default = { };
     };
 
-    makoArgs = mkOption {
-      description = "Args for mako notification displayer";
-      default = "";
-      type = types.str;
-    };
-
     screensaver = mkOption {
       description = "ezpcusr screensaver";
       default = { };
diff --git a/modules/workstation.nix b/modules/workstation.nix
index fdc4cab..da1c61d 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -37,7 +37,7 @@ in
 
     services.thermald.enable = lib.mkDefault true;
 
-    boot.kernelParams = lib.optionals cfg.battery [ "iwlwifi.power_save=1" "iwlwifi.uapsd_disable=0" "iwlmvm.power_scheme=3" "iwldvm.force_cam=0" "snd_hda_intel.power_save=1" "snd_ac97_codec.power_save=1" ];
+    boot.kernelParams = lib.optionals cfg.battery [ "iwlwifi.uapsd_disable=0" "iwlmvm.power_scheme=3" "iwldvm.force_cam=0" "snd_hda_intel.power_save=1" "snd_ac97_codec.power_save=1" ];
 
     # Don't kill the battery
     services.upower = {
@@ -51,8 +51,6 @@ in
     services.tlp = {
       enable = lib.mkDefault cfg.battery;
       settings = {
-        DISK_IOSCHED = lib.mkDefault "mq-deadline deadline";
-
         PCIE_ASPM_ON_BAT = lib.mkDefault "powersupersave";
         PCIE_ASPM_ON_AC = lib.mkDefault "default";
 
@@ -74,10 +72,14 @@ in
         SCHED_POWERSAVE_ON_BAT = lib.mkDefault 0;
         SCHED_POWERSAVE_ON_AC = lib.mkDefault 1;
 
-        CPU_MIN_PERF_ON_BAT = lib.mkDefault 0;
         CPU_MAX_PERF_ON_BAT = lib.mkDefault 30;
-        CPU_MIN_PERF_ON_AC = lib.mkDefault 0;
         CPU_MAX_PERF_ON_AC = lib.mkDefault 100;
+
+        CPU_SCALING_MIN_FREQ_ON_BAT = lib.mkDefault 0;
+        CPU_SCALING_MIN_FREQ_ON_AC = lib.mkDefault 0;
+
+        CPU_SCALING_MAX_FREQ_ON_BAT = lib.mkDefault 9999999;
+        CPU_SCALING_MAX_FREQ_ON_AC  = lib.mkDefault 9999999;
       };
     };