From 6d9644501bae382fdf3979d9aac67be2e4907c59 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 17 Feb 2025 16:34:19 -0500 Subject: [PATCH] fixing hypridle --- flake.lock | 42 +++++++++---------- .../fish/functions/dim-all-monitors.fish | 5 --- .../functions/lock-power-off-monitors.fish | 5 --- .../fish/functions/lock-suspend.fish | 5 --- .../dotfiles/dot_local/bin/dim-all-monitors | 2 + .../dot_local/bin/lock-power-off-monitors | 2 + .../dotfiles/dot_local/bin/lock-suspend | 2 + homes/emenel/dotfiles/dot_local/bin/on-unlock | 2 + modules/home/hypridle.nix | 25 +++++++---- 9 files changed, 47 insertions(+), 43 deletions(-) delete mode 100644 homes/emenel/dotfiles/dot_config/fish/functions/dim-all-monitors.fish delete mode 100644 homes/emenel/dotfiles/dot_config/fish/functions/lock-power-off-monitors.fish delete mode 100644 homes/emenel/dotfiles/dot_config/fish/functions/lock-suspend.fish create mode 100755 homes/emenel/dotfiles/dot_local/bin/dim-all-monitors create mode 100755 homes/emenel/dotfiles/dot_local/bin/lock-power-off-monitors create mode 100755 homes/emenel/dotfiles/dot_local/bin/lock-suspend create mode 100755 homes/emenel/dotfiles/dot_local/bin/on-unlock diff --git a/flake.lock b/flake.lock index 2783ba0..687df74 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739811682, - "narHash": "sha256-uKHJ7eUG6fLnFYPd9i7xOXbk2oiFE4RGvrh0Y0mhHZA=", + "lastModified": 1739814150, + "narHash": "sha256-xvG8k1Gfmm+2wpvzNikGj53BTg+Ay03aM5M68Y0caI8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f46d961b45787fd1bd9b46226d094ef7dbc5a2ac", + "rev": "b51c3cceb739735185e06878bb05c2a0a3c16b9b", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1739802995, - "narHash": "sha256-kZv0upOigS/4sUEgZuZd6/uO6s8X8oYOLk9/sGMsl+c=", + "lastModified": 1739823458, + "narHash": "sha256-uHjpcdlWKrZEJxsGdlMRTe4jlMYAnNsjRxPSTrNMFvo=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d0d48f4c3d2fb1a8c8607da143bb567a741d914", + "rev": "6c93eea85daddd0dc8d4a3a687473461f3122961", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1739810027, - "narHash": "sha256-sp/xGtMWHOHUvlID7hasOf6fxVzURW5MfJAsd2e4cjY=", + "lastModified": 1739813929, + "narHash": "sha256-MgSMknm/6L9NIhN78NoO+8y5iGEERLSUyx71f3mXF88=", "owner": "isd-project", "repo": "isd", - "rev": "ec2453952c246ac2d1fcfc0626118e3ff1c8d7dd", + "rev": "8021a51ddb46f068dbbeb341734892242300dc50", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739802387, - "narHash": "sha256-j1/mukC09zeq0mdOiL9ouE1k7ZC7f3SJCKFq5ttoqIs=", + "lastModified": 1739824279, + "narHash": "sha256-373u7+WYbKZDZ6gerTcXjdcqR0bR33nRfOU5XcY/MBY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "59ed19d431324af3fcebbf623c081eae2e67ab97", + "rev": "fad7cbe279fb9a550896de1179982ce2d4734e5c", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739787518, - "narHash": "sha256-F9zVBxjj8H11TjXhbMNC/nXJVAvksrrasouxTxPbju4=", + "lastModified": 1739820990, + "narHash": "sha256-v+MmVqFyjzL9xzyRzfX+1qMIGgoHcW73P9b8RrM922k=", "owner": "YaLTeR", "repo": "niri", - "rev": "078383ea8208337d3c9ea89118aa615d7fbbab17", + "rev": "44c9797844ca7ce8a708d5034f1259ce3fc6bd2a", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { @@ -960,11 +960,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { diff --git a/homes/emenel/dotfiles/dot_config/fish/functions/dim-all-monitors.fish b/homes/emenel/dotfiles/dot_config/fish/functions/dim-all-monitors.fish deleted file mode 100644 index a9ebc2a..0000000 --- a/homes/emenel/dotfiles/dot_config/fish/functions/dim-all-monitors.fish +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env fish - -function dim-all-monitors - brillo -e -O && brillo -e -u 150000 -S 15 -end diff --git a/homes/emenel/dotfiles/dot_config/fish/functions/lock-power-off-monitors.fish b/homes/emenel/dotfiles/dot_config/fish/functions/lock-power-off-monitors.fish deleted file mode 100644 index 3065767..0000000 --- a/homes/emenel/dotfiles/dot_config/fish/functions/lock-power-off-monitors.fish +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env fish - -function lock-power-off-monitors - loginctl lock-session && niri msg action power-off-monitors -end diff --git a/homes/emenel/dotfiles/dot_config/fish/functions/lock-suspend.fish b/homes/emenel/dotfiles/dot_config/fish/functions/lock-suspend.fish deleted file mode 100644 index 0dd02f8..0000000 --- a/homes/emenel/dotfiles/dot_config/fish/functions/lock-suspend.fish +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env fish - -function lock-suspend - loginctl lock-session && systemctl suspend -end diff --git a/homes/emenel/dotfiles/dot_local/bin/dim-all-monitors b/homes/emenel/dotfiles/dot_local/bin/dim-all-monitors new file mode 100755 index 0000000..caef022 --- /dev/null +++ b/homes/emenel/dotfiles/dot_local/bin/dim-all-monitors @@ -0,0 +1,2 @@ +#!/bin/sh +brillo -e -O && brillo -e -u 150000 -S 15 diff --git a/homes/emenel/dotfiles/dot_local/bin/lock-power-off-monitors b/homes/emenel/dotfiles/dot_local/bin/lock-power-off-monitors new file mode 100755 index 0000000..69a4956 --- /dev/null +++ b/homes/emenel/dotfiles/dot_local/bin/lock-power-off-monitors @@ -0,0 +1,2 @@ +#!/bin/sh +niri msg action power-off-monitors diff --git a/homes/emenel/dotfiles/dot_local/bin/lock-suspend b/homes/emenel/dotfiles/dot_local/bin/lock-suspend new file mode 100755 index 0000000..6dba79c --- /dev/null +++ b/homes/emenel/dotfiles/dot_local/bin/lock-suspend @@ -0,0 +1,2 @@ +#!/bin/sh +systemctl suspend diff --git a/homes/emenel/dotfiles/dot_local/bin/on-unlock b/homes/emenel/dotfiles/dot_local/bin/on-unlock new file mode 100755 index 0000000..55e9c56 --- /dev/null +++ b/homes/emenel/dotfiles/dot_local/bin/on-unlock @@ -0,0 +1,2 @@ +#!/bin/sh +shikanectl reload && brillo -e -u 150000 -I diff --git a/modules/home/hypridle.nix b/modules/home/hypridle.nix index dadeba2..de91695 100644 --- a/modules/home/hypridle.nix +++ b/modules/home/hypridle.nix @@ -6,8 +6,8 @@ settings = { general = { lock_cmd = "pidof hyprlock || hyprlock"; - before_sleep_cmd = "loginctl lock-session"; - after_sleep_cmd = "shikanectl reload && brillo -e -u 150000 -I"; + before_sleep_cmd = "loginctl lock-session && brillo -e -O"; + after_sleep_cmd = "/home/emenel/.local/bin/on-unlock"; ignore_dbus_inhibit = false; ignore_systemd_inhibit = false; }; @@ -15,33 +15,44 @@ listener = [ { timeout = "60"; - on-timeout = "dim-all-monitors"; + on-timeout = "/home/emenel/.local/bin/dim-all-monitors"; + on-resume = "/home/emenel/.local/bin/on-unlock"; } # battery timers + { + timeout = "90"; + on-timeout = "systemd-ac-power || loginctl lock-session"; + on-resume = "/home/emenel/.local/bin/on-unlock"; + } { timeout = "120"; - on-timeout = "systemd-ac-power || lock-power-off-monitors"; + on-timeout = "systemd-ac-power || /home/emenel/.local/bin/lock-power-off-monitors"; + on-resume = "/home/emenel/.local/bin/on-unlock"; } { timeout = "180"; - on-timeout = "systemd-ac-power || lock-suspend"; + on-timeout = "systemd-ac-power || /home/emenel/.local/bin/lock-suspend"; + on-resume = "/home/emenel/.local/bin/on-unlock"; } # ac power timers { timeout = "180"; on-timeout = "systemd-ac-power && loginctl lock-session"; + on-resume = "/home/emenel/.local/bin/on-unlock"; } { timeout = "240"; - on-timeout = "systemd-ac-power && lock-power-off-monitors"; + on-timeout = "systemd-ac-power && /home/emenel/.local/bin/lock-power-off-monitors"; + on-resume = "/home/emenel/.local/bin/on-unlock"; } { timeout = "600"; - on-timeout = "systemd-ac-power && lock-suspend"; + on-timeout = "systemd-ac-power && /home/emenel/.local/bin/lock-suspend"; + on-resume = "/home/emenel/.local/bin/on-unlock"; } ];