From e67230b2823bddc314981c9a23eae1e143912029 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 7 Mar 2024 22:14:48 -0500 Subject: [PATCH] meta: Switch from swaylock to hyprlock hyprlock matches the other animations of hyprland a bit better and is overall more pleasant to work with. --- home/default.nix | 1 - home/hyprland.nix | 6 +++++- home/swaylock.nix | 20 -------------------- modules/hyprland.nix | 2 -- 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 home/swaylock.nix diff --git a/home/default.nix b/home/default.nix index 923baa51..1accf7ef 100644 --- a/home/default.nix +++ b/home/default.nix @@ -20,7 +20,6 @@ ./pqiv.nix ./qutebrowser.nix ./rofi.nix - ./swaylock.nix ./thunar.nix ./udiskie.nix ./xcursor.nix diff --git a/home/hyprland.nix b/home/hyprland.nix index c6b7209f..d1011f61 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -5,7 +5,11 @@ let modifier = "SUPER"; in { - home.packages = with pkgs; [ hyprnome ]; + home.packages = with pkgs; [ + hyprnome + hypridle + hyprlock + ]; xdg.configFile."hypr/gaps.sh" = { executable = true; diff --git a/home/swaylock.nix b/home/swaylock.nix deleted file mode 100644 index 22b53fd4..00000000 --- a/home/swaylock.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: - -{ - programs.swaylock = { - package = pkgs.swaylock-effects; - - settings = { - show-keyboard-layout = true; - daemonize = true; - effect-blur = "20x2"; - clock = true; - indicator = true; - font-size = 25; - indicator-radius = 85; - indicator-thickness = 16; - screenshots = true; - fade-in = 1; - }; - }; -} diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 86773ce1..dfa65722 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -12,8 +12,6 @@ }; }; - security.pam.services.swaylock = { }; - services.udisks2 = { enable = true; mountOnMedia = true;