feat(hypr wim): hypridle -> acpid
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
Updater 2024-05-29 12:30:14 -04:00
parent bd5b0dcec8
commit a72a054632
5 changed files with 62 additions and 35 deletions

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -142,11 +142,6 @@ let
repo = "Hyprspace";
};
hypridle = mkDep {
owner = "hyprwm";
repo = "hypridle";
};
grim-hyprland = mkDep {
owner = "eriedaberrie";
repo = "grim-hyprland";

View file

@ -207,9 +207,10 @@ const on_finished = () => {
lock.connect('finished', on_finished);
if (Vars.hasFprintd) {
Utils.authenticate('')
globalThis.authFinger = () => Utils.authenticate('')
.then(() => unlock())
.catch(logError);
globalThis.authFinger();
}

View file

@ -1,14 +1,44 @@
{
config,
hypridle,
lib,
pkgs,
...
}: let
inherit (lib) mkIf optionals;
inherit (lib) mkIf;
inherit (config.vars) mainUser;
isLaptop = config.services.logind.lidSwitch == "lock";
hmCfg = config.home-manager.users.${mainUser};
agsPkg = hmCfg.programs.ags.finalPackage;
hyprPkg = hmCfg.wayland.windowManager.hyprland.finalPackage;
runInDesktop = pkgs.writeShellApplication {
name = "runInDesktop";
runtimeInputs = [
pkgs.sudo
agsPkg
hyprPkg
];
text = ''
user="$(id -u ${mainUser})"
sig="$(ls "/run/user/$user/hypr/")"
export HYPRLAND_INSTANCE_SIGNATURE="$sig"
sudo -Eu ${mainUser} hyprctl dispatch exec "$@"
'';
};
lockPkg = pkgs.writeShellApplication {
name = "lock";
runtimeInputs = [
agsPkg
];
text = ''
ags -r 'Tablet.setLaptopMode()'
ags -b lockscreen -c /home/${mainUser}/.config/ags/lockscreen.js
'';
};
in {
imports = [
../greetd
@ -16,39 +46,40 @@ in {
services.gnome.gnome-keyring.enable = true;
home-manager.users.${mainUser} = let
hmCfg = config.home-manager.users.${mainUser};
lockPkg = pkgs.writeShellApplication {
name = "lock";
runtimeInputs = [
hmCfg.programs.ags.finalPackage
];
text = ''
ags -r 'Tablet.setLaptopMode()'
ags -b lockscreen -c /home/${mainUser}/.config/ags/lockscreen.js
services.acpid = mkIf isLaptop {
enable = true;
lidEventCommands = ''
LID="/proc/acpi/button/lid/LID/state"
state=$(cat "$LID" | ${pkgs.gawk}/bin/awk '{print $2}')
case "$state" in
*open*)
${runInDesktop}/bin/runInDesktop "ags -b lockscreen -r 'authFinger()'"
;;
*close*)
${runInDesktop}/bin/runInDesktop ${lockPkg}/bin/lock
;;
*)
logger -t lid-handler "Failed to detect lid state ($state)"
;;
esac
'';
};
in {
home-manager.users.${mainUser} = {
home.packages = [
pkgs.gnome.seahorse
lockPkg
];
services.hypridle = mkIf isLaptop {
enable = true;
package = hypridle.packages.${pkgs.system}.default;
settings.general.lock_cmd = "${lockPkg}/bin/lock";
};
wayland.windowManager.hyprland = {
settings = {
exec-once =
[
exec-once = [
"gnome-keyring-daemon --start --components=secrets"
"${pkgs.plasma5Packages.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"
]
++ optionals isLaptop [
"systemctl --user restart hypridle"
];
windowrule = [