diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 7eff3ab..e068086 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -14,7 +14,7 @@ home.packages = [ wrappers.hyprpaper wrappers.waybar - wrappers.hyprlock + wrappers.hypridle (wrappers.rofi { inherit (config.myConfig) theme; }) pkgs.cliphist @@ -39,9 +39,11 @@ monitor = [ "Unknown-1,disable" + # North "DP-1,2560x1440@144,0x0,1" - "eDP-1,1920x1080@60,0x0,1" ",preferred,auto,1,mirror,DP-1" + # Inspiron + "eDP-1,1920x1080@60,0x0,1" ",preferred,auto,1,mirror,eDP-1" ]; diff --git a/users/seb/@inspiron.nix b/users/seb/@inspiron.nix index 60e86f1..8305788 100644 --- a/users/seb/@inspiron.nix +++ b/users/seb/@inspiron.nix @@ -3,7 +3,7 @@ imports = [ ./default.nix ]; home-manager.users.seb = { - home.packages = [ (wrappers.hypridle { lockOnSleep = true; }) ]; + home.packages = [ wrappers.hyprlock ]; myConfig.theme = "light"; }; diff --git a/users/seb/@north.nix b/users/seb/@north.nix index 148875e..9222f33 100644 --- a/users/seb/@north.nix +++ b/users/seb/@north.nix @@ -1,4 +1,4 @@ -{ pkgs, wrappers, ... }: +{ pkgs, ... }: { imports = [ ./default.nix ]; @@ -7,8 +7,6 @@ pkgs.obs-studio pkgs.libsForQt5.kdenlive pkgs.gimp - - (wrappers.hypridle { lockOnSleep = false; }) ]; myConfig.theme = "dark"; diff --git a/wrappers/hypridle.nix b/wrappers/hypridle.nix index 513e097..2aca4a7 100644 --- a/wrappers/hypridle.nix +++ b/wrappers/hypridle.nix @@ -2,9 +2,6 @@ let inherit (moduleArgs) pkgs; in -{ - lockOnSleep ? false, -}: assembleWrapper { basePackage = pkgs.hypridle; @@ -13,7 +10,7 @@ assembleWrapper { hypridle-config = pkgs.writeText "hypridle-config" '' general { 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 }