diff --git a/hosts/mirage/configuration.nix b/hosts/mirage/configuration.nix
index a467d15..1a7337c 100644
--- a/hosts/mirage/configuration.nix
+++ b/hosts/mirage/configuration.nix
@@ -19,7 +19,7 @@
# host specific config
environment.systemPackages = with pkgs; [ brightnessctl ];
- security.pam.services.hyprlock = { };
+ security.pam.services.swaylock = { };
# https://www.reddit.com/r/linux/comments/1em8biv/psa_pipewire_has_been_halving_your_battery_life/
services.pipewire.wireplumber.extraConfig."wireplumber.profiles".main."monitor.libcamera" = "disabled";
diff --git a/hosts/mirage/home.nix b/hosts/mirage/home.nix
index 4cdcdca..ace0853 100644
--- a/hosts/mirage/home.nix
+++ b/hosts/mirage/home.nix
@@ -2,7 +2,6 @@
{
imports = [
modules.home.default
- modules.home.hyprlock
modules.home.wlogout
];
diff --git a/hosts/refuge/home.nix b/hosts/refuge/home.nix
index ba0b016..963ac7d 100644
--- a/hosts/refuge/home.nix
+++ b/hosts/refuge/home.nix
@@ -4,7 +4,6 @@
modules.home.default
modules.home.nvidia
modules.home.obs
- modules.home.swaylock
];
home.stateVersion = "23.05"; # don't change this value
diff --git a/modules/home/common/default.nix b/modules/home/common/default.nix
index 9028005..fb8757e 100644
--- a/modules/home/common/default.nix
+++ b/modules/home/common/default.nix
@@ -7,6 +7,7 @@
./programs.nix
./services.nix
./spotify.nix
+ ./swaylock.nix
./terminals.nix
./wm.nix
];
diff --git a/modules/home/swaylock.nix b/modules/home/common/swaylock.nix
similarity index 95%
rename from modules/home/swaylock.nix
rename to modules/home/common/swaylock.nix
index 058c184..a26ed24 100644
--- a/modules/home/swaylock.nix
+++ b/modules/home/common/swaylock.nix
@@ -1,8 +1,9 @@
{ paths, pkgs, ... }:
{
+ catppuccin.swaylock.enable = true;
+
programs.swaylock = {
enable = true;
- catppuccin.enable = true;
package = pkgs.swaylock-effects;
settings = {
# use this instead of `builtins.toString wallpapers + "/refuge/line-crust.png"` in order to not rebuild upon whitespace change
diff --git a/modules/home/hyprlock.nix b/modules/home/hyprlock.nix
deleted file mode 100644
index b3c6b51..0000000
--- a/modules/home/hyprlock.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ paths, ... }:
-{
- programs.hyprlock = {
- enable = true;
- settings = {
- general.grace = 1;
- background = [
- {
- monitor = "";
- blur_passes = 0;
- # https://github.com/nix-community/home-manager/issues/5743
- path = "${paths.wallpapers}/mirage/wallpaper.png";
- }
- ];
- input-field = [
- {
- dots_center = true;
- fade_on_empty = false;
- fail_text = "$ATTEMPTS failed attempt(s)";
- outline_thickness = 2;
- placeholder_text = "password required";
- position = "0, -250";
- size = "200, 40";
-
- check_color = "rgb(137, 180, 250)";
- fail_color = "rgb(243, 139, 168)";
- font_color = "rgb(205, 214, 244)";
- inner_color = "rgb(49, 50, 68)";
- outer_color = "rgb(203, 166, 247)";
- }
- ];
- label = [
- {
- monitor = "";
- color = "rgb(205, 214, 244)";
- font_family = "FiraCode Nerd Font Propo";
- font_size = 30;
- position = "0, -200";
- text = "cmd[update:1000] echo \"$(date +%T)\"";
- halign = "center";
- valign = "center";
- }
- ];
- };
- };
-
- wayland.windowManager.hyprland.settings.bind = [ "$mainMod, X, exec, hyprlock" ];
-}