allow customizing screenshots path and fix battery stuff

This commit is contained in:
notgne2 2022-01-12 16:51:39 -07:00
parent 7ff488ef2b
commit d72a8c0021
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
2 changed files with 15 additions and 13 deletions

View File

@ -18,8 +18,8 @@ let
getscrloc = pkgs.writeScript "getscrloc.sh" '' getscrloc = pkgs.writeScript "getscrloc.sh" ''
#!${pkgs.zsh}/bin/zsh #!${pkgs.zsh}/bin/zsh
mkdir -p "$HOME/Pictures/Screenshots" mkdir -p "${cfg.screenshotsPath}"
echo "$HOME/Pictures/Screenshots/$(date +%F_%T).''${1:-png}" echo "${cfg.screenshotsPath}/$(date +%F_%T).''${1:-png}"
''; '';
scrsaveclip = pkgs.writeScript "scr-save-clip.sh" '' 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"; "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 { bitwardenSession = mkOption {
description = "Session key for bitwarden"; description = "Session key for bitwarden";
default = ""; default = "";
@ -123,12 +129,6 @@ in
default = { }; default = { };
}; };
makoArgs = mkOption {
description = "Args for mako notification displayer";
default = "";
type = types.str;
};
screensaver = mkOption { screensaver = mkOption {
description = "ezpcusr screensaver"; description = "ezpcusr screensaver";
default = { }; default = { };

View File

@ -37,7 +37,7 @@ in
services.thermald.enable = lib.mkDefault true; 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 # Don't kill the battery
services.upower = { services.upower = {
@ -51,8 +51,6 @@ in
services.tlp = { services.tlp = {
enable = lib.mkDefault cfg.battery; enable = lib.mkDefault cfg.battery;
settings = { settings = {
DISK_IOSCHED = lib.mkDefault "mq-deadline deadline";
PCIE_ASPM_ON_BAT = lib.mkDefault "powersupersave"; PCIE_ASPM_ON_BAT = lib.mkDefault "powersupersave";
PCIE_ASPM_ON_AC = lib.mkDefault "default"; PCIE_ASPM_ON_AC = lib.mkDefault "default";
@ -74,10 +72,14 @@ in
SCHED_POWERSAVE_ON_BAT = lib.mkDefault 0; SCHED_POWERSAVE_ON_BAT = lib.mkDefault 0;
SCHED_POWERSAVE_ON_AC = lib.mkDefault 1; SCHED_POWERSAVE_ON_AC = lib.mkDefault 1;
CPU_MIN_PERF_ON_BAT = lib.mkDefault 0;
CPU_MAX_PERF_ON_BAT = lib.mkDefault 30; 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_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;
}; };
}; };