From 08c2e183963e6788c2f7133165e848e024a88ec8 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Tue, 21 May 2024 11:47:20 +0200
Subject: [PATCH] screenlock

---
 configuration.nix             | 7 +++++++
 home.nix                      | 9 +++++----
 programm_configs/lock.sh      | 9 +++------
 programm_configs/sway.nix     | 2 +-
 programm_configs/swaylock.nix | 6 ++++++
 5 files changed, 22 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 programm_configs/lock.sh
 create mode 100644 programm_configs/swaylock.nix

diff --git a/configuration.nix b/configuration.nix
index b183514..bb57ca4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -150,6 +150,13 @@
     GTK_THEME = "Adwaita:dark";
   };
 
+  # patch for swaylock https://github.com/swaywm/sway/issues/2773
+  security.pam.services.swaylock = {
+    text = ''
+      auth include login
+    '';
+  };
+
   # Patch for IDEA PlugIn dev. Should be in dev flake!
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = with pkgs; [
diff --git a/home.nix b/home.nix
index fd9b6f3..e2a9026 100644
--- a/home.nix
+++ b/home.nix
@@ -35,6 +35,7 @@ let username = "clemens"; in
     ./programm_configs/redshift.nix
   ] else [
     ./programm_configs/sway.nix
+    ./programm_configs/swaylock.nix
     ./programm_configs/waybar.nix
     ./programm_configs/gammastep.nix
   ]);
@@ -43,8 +44,6 @@ let username = "clemens"; in
   # environment.
   home.packages = with pkgs; [
     alacritty
-    polybar
-    scrot
     imagemagick
     htop
     firefox
@@ -81,6 +80,8 @@ let username = "clemens"; in
   ] ++ (if x11mode then [
     arandr
     flameshot
+    scrot
+    polybar
   ] else [
     wdisplays
     sway-contrib.grimshot
@@ -94,9 +95,9 @@ let username = "clemens"; in
       source = ./programm_configs/slate.rasi;
       target = ".config/rofi/slate.rasi";
     };
-    i3lock = {
+    swaylock = {
       source = ./programm_configs/lock.sh;
-      target = ".config/i3/lock.sh";
+      target = ".config/sway/lock.sh";
       executable = true;
     };
   };
diff --git a/programm_configs/lock.sh b/programm_configs/lock.sh
old mode 100644
new mode 100755
index 9f903fa..f0443bd
--- a/programm_configs/lock.sh
+++ b/programm_configs/lock.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
-scrot /tmp/screenshot.png
+grimshot save output /tmp/screenshot.png
 convert /tmp/screenshot.png -blur 0x10 /tmp/screenshotblur.png
-set -e
-xset s off dpms 0 10 0
-i3lock -i /tmp/screenshotblur.png --ignore-empty-password --show-failed-attempts --nofork
-rm -f /tmp/screenshot.png
-xset s off -dpms
+rm /tmp/screenshot.png
+swaylock -i /tmp/screenshotblur.png --ignore-empty-password --show-failed-attempts --daemonize
diff --git a/programm_configs/sway.nix b/programm_configs/sway.nix
index 4847ed6..ee8f76b 100644
--- a/programm_configs/sway.nix
+++ b/programm_configs/sway.nix
@@ -24,7 +24,7 @@
 
       keybindings = {
         # screenlock
-        "${mod}+shift+l" = "exec --no-startup-id ~/.config/i3/lock.sh";
+        "${mod}+shift+l" = "exec --no-startup-id ~/.config/sway/lock.sh";
 
         # audio control fluff
         "XF86AudioRaiseVolume" = "exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 5%+";
diff --git a/programm_configs/swaylock.nix b/programm_configs/swaylock.nix
new file mode 100644
index 0000000..058249e
--- /dev/null
+++ b/programm_configs/swaylock.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{ 
+  programs.swaylock = {
+    enable = true;
+  };
+}