sway: modify locking

README.md

@@ -33,7 +33,7 @@ and start it appropriately.
 ### theming stuff
 + main bg: #323232
 + accent: #93b259
-+ icons: `Flat-Remix-Green-Light-darkPanel`
++ icons: `Flat-Remix-Green-Light-darkPanel` (from `flat-remix-icon-theme`)
 + theme: `Flat-Remix-GTK-Green-Light-solid` with adjusted accent
   + or `/usr/share/themes/Flat-Remix-Marc`
 

files/sway/.config/sway/config

@@ -59,7 +59,7 @@ bindswitch --reload --locked lid:on output $laptop disable
 bindswitch --reload --locked lid:off output $laptop enable
 
 # Idle configuration
-    set $lock 'loginctl lock-session && bash ~/.dots/lock.sh'
+    set $lock 'bash ~/.dots/lock.sh'
 
     # Lock after 20 minutes, lock before suspend
     exec swayidle -w \
@@ -109,7 +109,7 @@ bindswitch --reload --locked lid:off output $laptop enable
 
         # show shutdown menu
         bindsym $mod+Ctrl+Backspace exec \
-            printf "/home/marc/.dots/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now\nloginctl terminate-user marc" \
+            printf "~/.dots/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now\nloginctl terminate-user marc" \
             | wofi -d -p "Power" -L 6 \
             | xargs -d '\n' -r /bin/bash -c
 

lock.sh

@@ -6,8 +6,8 @@ BLUE="3a94c5"
 YELLOW="dfa000"
 GREEN="8da101"
 
-swaylock \
-	-F \
+loginctl lock-session && swaylock \
+	--show-failed-attempts \
 	--image /tmp/lock.png \
 	--indicator-idle-visible \
 	--clock --timestr "%I:%M" --datestr "" \
@@ -26,4 +26,4 @@ swaylock \
 	--text-ver-color "00000000" \
 	--ring-wrong-color $RED \
 	--text-wrong-color "00000000" \
-	--text-color $GREEN
+	--text-color $GREEN || loginctl terminate-user $USER