diff --git a/flake.lock b/flake.lock index bd8e45f..b0578ac 100644 --- a/flake.lock +++ b/flake.lock @@ -951,11 +951,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1713726298, - "narHash": "sha256-awRRJoH5I6uvr0C9JqAXvYd4/bG/9HyVdKCq60bLg7g=", + "lastModified": 1713871741, + "narHash": "sha256-ElW22kkjG4jWaQVGelm5r/fozQsqo+fEqtM3fgFTl1s=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ed69502ff6e79a6dad213333b0bc3a15e2247942", + "rev": "cf3596a96d5c1012c363d8243baca6431ecf835b", "type": "github" }, "original": { @@ -1095,11 +1095,11 @@ ] }, "locked": { - "lastModified": 1713619586, - "narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=", + "lastModified": 1713730424, + "narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "9e13e0915273959bfd98a10662f678c15ac71c77", + "rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06", "type": "github" }, "original": { @@ -4126,17 +4126,17 @@ "wlroots": { "flake": false, "locked": { - "lastModified": 1713699467, - "narHash": "sha256-wQ18I2j/lUEz6FELuSphPBgROHx1POz/R2fjLA+QP8A=", + "lastModified": 1713731601, + "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "b9063af512a2326d5c519edc6a759da875deab21", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "type": "github" }, "original": { "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "b9063af512a2326d5c519edc6a759da875deab21", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "type": "github" } }, @@ -4160,11 +4160,11 @@ ] }, "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", + "lastModified": 1713724432, + "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", + "rev": "9ace6f969ce495185df34cc6254fb9d297765478", "type": "github" }, "original": { diff --git a/hosts/del/programs.nix b/hosts/del/programs.nix index 752fe42..a52d7e1 100644 --- a/hosts/del/programs.nix +++ b/hosts/del/programs.nix @@ -199,7 +199,6 @@ in { fswebcam asciicam v4l-utils - osu-lazer-bin pciutils wvkbd clickclack diff --git a/options/desktop/power-supply.nix b/options/desktop/power-supply.nix index 4914643..da113d8 100644 --- a/options/desktop/power-supply.nix +++ b/options/desktop/power-supply.nix @@ -4,27 +4,25 @@ pkgs, ... }: { - services.udev = { - extraRules = let - inherit (inputs.hyprland.packages.${pkgs.system}) hyprland; + services.udev.extraRules = let + inherit (inputs.hyprland.packages.${pkgs.system}) hyprland; - power_supply = pkgs.writeShellScript "on_power_supply" '' - ${pkgs.asusctl}/bin/asusctl profile -P Performance - #${pkgs.supergfxctl}/bin/supergfxctl -m Hybrid - ${config.boot.kernelPackages.cpupower}/bin/cpupower frequency-set -g performance - ${hyprland}/bin/hyprctl keyword decoration:blur:enabled true - ${hyprland}/bin/hyprctl keyword animations:enabled true - ''; - battery = pkgs.writeShellScript "on_battery" '' - ${pkgs.asusctl}/bin/asusctl profile -P Quiet - #${pkgs.supergfxctl}/bin/supergfxctl -m Integrated - ${config.boot.kernelPackages.cpupower}/bin/cpupower frequency-set -g powersave - ${hyprland}/bin/hyprctl keyword decoration:blur:enabled false - ${hyprland}/bin/hyprctl keyword animations:enabled false - ''; - in '' - SUBSYSTEM=="power_supply",ENV{POWER_SUPPLY_ONLINE}=="1",RUN+="${power_supply}" - SUBSYSTEM=="power_supply",ENV{POWER_SUPPLY_ONLINE}=="0",RUN+="${battery}" + power_supply = pkgs.writeShellScript "on_power_supply" '' + ${pkgs.asusctl}/bin/asusctl profile -P Performance + #${pkgs.supergfxctl}/bin/supergfxctl -m Hybrid + ${config.boot.kernelPackages.cpupower}/bin/cpupower frequency-set -g performance + ${hyprland}/bin/hyprctl keyword decoration:blur:enabled true + ${hyprland}/bin/hyprctl keyword animations:enabled true ''; - }; + battery = pkgs.writeShellScript "on_battery" '' + ${pkgs.asusctl}/bin/asusctl profile -P Quiet + #${pkgs.supergfxctl}/bin/supergfxctl -m Integrated + ${config.boot.kernelPackages.cpupower}/bin/cpupower frequency-set -g powersave + ${hyprland}/bin/hyprctl keyword decoration:blur:enabled false + ${hyprland}/bin/hyprctl keyword animations:enabled false + ''; + in '' + SUBSYSTEM=="power_supply",ENV{POWER_SUPPLY_ONLINE}=="1",RUN+="${power_supply}" + SUBSYSTEM=="power_supply",ENV{POWER_SUPPLY_ONLINE}=="0",RUN+="${battery}" + ''; }