From 09a01ff947b10c5cff98ecd443b1bd021c310167 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Tue, 5 Aug 2025 16:00:26 +0800 Subject: [PATCH] fix: hyprlock is broken on asahi kernel, replace it with swaylock --- home/linux/gui/hyprland/conf/configs/keybindings.conf | 2 +- home/linux/gui/hyprland/conf/hypridle.conf | 4 ++-- home/linux/gui/hyprland/values/hyprland.nix | 3 ++- modules/nixos/desktop.nix | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/home/linux/gui/hyprland/conf/configs/keybindings.conf b/home/linux/gui/hyprland/conf/configs/keybindings.conf index a85c5a1e..705b3909 100644 --- a/home/linux/gui/hyprland/conf/configs/keybindings.conf +++ b/home/linux/gui/hyprland/conf/configs/keybindings.conf @@ -134,6 +134,6 @@ bind = $mod, Print, exec, hyprshot -m window -o ~/Pictures/Screenshot bind = CTRL, Print, exec, hyprshot -m region -o ~/Pictures/Screenshots # -- Others -- -bind = CTRL ALT, l, exec, hyprlock +bind = CTRL ALT, l, exec, swaylock bind = $mod SHIFT, x, exec, wlogout bind = $mod, n, exec, nm-connection-editor # need install network-manager-applet diff --git a/home/linux/gui/hyprland/conf/hypridle.conf b/home/linux/gui/hyprland/conf/hypridle.conf index 137c6037..bf36d654 100644 --- a/home/linux/gui/hyprland/conf/hypridle.conf +++ b/home/linux/gui/hyprland/conf/hypridle.conf @@ -1,6 +1,6 @@ general { - lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple instances + lock_cmd = pidof swaylock || swaylock # avoid starting multiple instances before_sleep_cmd = loginctl lock-session # lock before suspend after_sleep_cmd = hyprctl dispatch dpms on # resume dpms after suspend ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests @@ -21,7 +21,7 @@ general { listener { timeout = 1200 # 20 minutes - on-timeout = pidof hyprlock || hyprlock # lock screen + on-timeout = pidof swaylock || swaylock # lock screen on-resume = hyprctl dispatch dpms on # monitor wake up } diff --git a/home/linux/gui/hyprland/values/hyprland.nix b/home/linux/gui/hyprland/values/hyprland.nix index 81b54494..aaf18223 100644 --- a/home/linux/gui/hyprland/values/hyprland.nix +++ b/home/linux/gui/hyprland/values/hyprland.nix @@ -1,5 +1,6 @@ { pkgs, + pkgs-stable, config, ... }: @@ -29,7 +30,7 @@ in catppuccin.waybar.enable = false; # screen locker - programs.hyprlock.enable = true; + programs.swaylock.enable = true; # Logout Menu programs.wlogout.enable = true; diff --git a/modules/nixos/desktop.nix b/modules/nixos/desktop.nix index 3a3b440e..11fc5a38 100644 --- a/modules/nixos/desktop.nix +++ b/modules/nixos/desktop.nix @@ -47,7 +47,7 @@ in }; # fix https://github.com/ryan4yin/nix-config/issues/10 - security.pam.services.hyprlock = { }; + security.pam.services.swaylock = { }; }) ]; }