From 36bd6759e2f4b17ee983a7223a41b7803ff57d89 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 30 Sep 2023 11:57:32 -0500 Subject: [PATCH] Replaced swaylock with gtklock --- system/wm/hyprland.nix | 11 ++++++----- user/wm/hyprland/hyprland.nix | 13 ++++++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/system/wm/hyprland.nix b/system/wm/hyprland.nix index 26d7979..24132b1 100644 --- a/system/wm/hyprland.nix +++ b/system/wm/hyprland.nix @@ -9,11 +9,12 @@ # Security security = { - pam.services.swaylock = { - text = '' - auth include login - ''; - }; +# pam.services.swaylock = { +# text = '' +# auth include login +# ''; +# }; + pam.services.gtklock = {}; pam.services.login.enableGnomeKeyring = true; }; diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index c52a28f..dff8ce9 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -33,7 +33,8 @@ exec-once = waybar exec-once = emacs --daemon - exec-once = ~/.swayidle-stylix + exec-once = swayidle -w timeout 300 'gtklock -d' timeout 600 'hyprctl dispatch dpms off' resume 'gtklock -d' before-sleep "gtklock -d" + exec = ~/.swaybg-stylix general { @@ -116,7 +117,7 @@ bind=,code:255,exec,airplane-mode bind=SUPERSHIFT,S,exec,systemctl suspend - bind=SUPERCTRL,L,exec,swaylock --indicator-radius 200 --screenshots --effect-blur 10x10 + bind=SUPERCTRL,L,exec,gtklock bind=SUPER,H,movefocus,l bind=SUPER,J,movefocus,d @@ -243,7 +244,7 @@ wl-clipboard hyprland-protocols hyprpicker - swayidle + gtklock (pkgs.swaylock-effects.overrideAttrs (oldAttrs: { version = "1.6.4-1"; src = fetchFromGitHub { @@ -635,6 +636,12 @@ } ''; }; + home.file.".config/gtklock/style.css".text = '' + window { + background-image: url("''+config.stylix.image+''"); + background-size: auto 100%; + } + ''; programs.fuzzel.enable = true; programs.fuzzel.settings = { main = {