SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 22:11:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix wake from sleep locking

Browse source
This commit is contained in:
SebastianStork 2024-06-03 18:04:28 +02:00
parent f64087901c
commit 47b4bdfca0
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/home/hyprland/default.nix
View file

@ -14,7 +14,7 @@
home.packages = [ home.packages = [
wrappers.hyprpaper wrappers.hyprpaper
wrappers.waybar wrappers.waybar
wrappers.hyprlock wrappers.hypridle
(wrappers.rofi { inherit (config.myConfig) theme; }) (wrappers.rofi { inherit (config.myConfig) theme; })
pkgs.cliphist pkgs.cliphist
@ -39,9 +39,11 @@
monitor = [ monitor = [
"Unknown-1,disable" "Unknown-1,disable"
# North
"DP-1,2560x1440@144,0x0,1" "DP-1,2560x1440@144,0x0,1"
"eDP-1,1920x1080@60,0x0,1"
",preferred,auto,1,mirror,DP-1" ",preferred,auto,1,mirror,DP-1"
# Inspiron
"eDP-1,1920x1080@60,0x0,1"
",preferred,auto,1,mirror,eDP-1" ",preferred,auto,1,mirror,eDP-1"
]; ];

2
users/seb/@inspiron.nix
View file

@ -3,7 +3,7 @@
imports = [ ./default.nix ]; imports = [ ./default.nix ];
home-manager.users.seb = { home-manager.users.seb = {
home.packages = [ (wrappers.hypridle { lockOnSleep = true; }) ]; home.packages = [ wrappers.hyprlock ];
myConfig.theme = "light"; myConfig.theme = "light";
}; };

4
users/seb/@north.nix
View file

@ -1,4 +1,4 @@
{ pkgs, wrappers, ... }: { pkgs, ... }:
{ {
imports = [ ./default.nix ]; imports = [ ./default.nix ];
@ -7,8 +7,6 @@
pkgs.obs-studio pkgs.obs-studio
pkgs.libsForQt5.kdenlive pkgs.libsForQt5.kdenlive
pkgs.gimp pkgs.gimp
(wrappers.hypridle { lockOnSleep = false; })
]; ];
myConfig.theme = "dark"; myConfig.theme = "dark";

5
wrappers/hypridle.nix
View file

@ -2,9 +2,6 @@
let let
inherit (moduleArgs) pkgs; inherit (moduleArgs) pkgs;
in in
{
lockOnSleep ? false,
}:
assembleWrapper { assembleWrapper {
basePackage = pkgs.hypridle; basePackage = pkgs.hypridle;
@ -13,7 +10,7 @@ assembleWrapper {
hypridle-config = pkgs.writeText "hypridle-config" '' hypridle-config = pkgs.writeText "hypridle-config" ''
general { general {
lock_cmd = pidof hyprlock || hyprlock lock_cmd = pidof hyprlock || hyprlock
${if lockOnSleep then "before_sleep_cmd = loginctl lock-session" else ""} before_sleep_cmd = loginctl lock-session
after_sleep_cmd = hyprctl dispatch dpms on after_sleep_cmd = hyprctl dispatch dpms on
} }