From 3074fdaba4ef3c29f835ebd99854b1ed4ac771c3 Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Fri, 29 Dec 2017 18:04:04 +0100
Subject: [PATCH] Update lock script, moved scripts to .scripts folder

---
 .config/i3/scripts/lock.sh                    | 11 -------
 scripts/color.sh => .scripts/colors.sh        |  0
 .../i3/scripts => .scripts/wm}/brightness.sh  |  0
 .scripts/wm/lock.sh                           | 31 +++++++++++++++++++
 {.config/i3/scripts => .scripts/wm}/volume.sh |  0
 dotfiles.sh                                   |  1 -
 6 files changed, 31 insertions(+), 12 deletions(-)
 delete mode 100755 .config/i3/scripts/lock.sh
 rename scripts/color.sh => .scripts/colors.sh (100%)
 rename {.config/i3/scripts => .scripts/wm}/brightness.sh (100%)
 create mode 100755 .scripts/wm/lock.sh
 rename {.config/i3/scripts => .scripts/wm}/volume.sh (100%)

diff --git a/.config/i3/scripts/lock.sh b/.config/i3/scripts/lock.sh
deleted file mode 100755
index b50b54f..0000000
--- a/.config/i3/scripts/lock.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-xset s 30 30
-
-icon="$HOME/Pictures/lock.png"
-tmpbg='/tmp/screen.png'
-
-scrot "$tmpbg"
-convert "$tmpbg" -scale 10% -scale 1000% "$tmpbg"
-convert "$tmpbg" "$icon" -gravity center -composite -matte "$tmpbg"
-i3lock --nofork -u -i "$tmpbg"; xset s off
diff --git a/scripts/color.sh b/.scripts/colors.sh
similarity index 100%
rename from scripts/color.sh
rename to .scripts/colors.sh
diff --git a/.config/i3/scripts/brightness.sh b/.scripts/wm/brightness.sh
similarity index 100%
rename from .config/i3/scripts/brightness.sh
rename to .scripts/wm/brightness.sh
diff --git a/.scripts/wm/lock.sh b/.scripts/wm/lock.sh
new file mode 100755
index 0000000..8e03d49
--- /dev/null
+++ b/.scripts/wm/lock.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+ICON="$HOME/Pictures/lock.png"
+TMPBG='/tmp/screen.png'
+
+revert() {
+	xset dpms 0 0 0
+}
+
+trap revert HUP INT TERM
+xset +dpms dpms 30 30 30
+
+scrot "$TMPBG"
+convert "$TMPBG" -scale 10% -scale 1000% "$TMPBG"
+convert "$TMPBG" "$ICON" -gravity center -composite -matte "$TMPBG"
+
+i3lock -n -i "$TMPBG" -e \
+	--textcolor=00000000 \
+	--insidecolor=00000000 \
+	--insidevercolor=00000000 --insidewrongcolor=00000000 \
+	--ringcolor=00000000 \
+	--ringvercolor=FFFFFFC0 --ringwrongcolor=DA2825C0 \
+	--keyhlcolor=FFFFFFC0 --bshlcolor=DA2825C0 \
+	--linecolor=00000000 --separatorcolor=00000000 \
+	-k \
+	--timesize=64 --datesize=24 \
+	--timestr="%I:%M %p" --datestr="%A, %B %e" \
+	--timepos="ix-200:iy-250" --datepos="ix-200:iy-210" \
+	--timecolor=FFFFFFC0 --datecolor=FFFFFFC0
+
+revert
diff --git a/.config/i3/scripts/volume.sh b/.scripts/wm/volume.sh
similarity index 100%
rename from .config/i3/scripts/volume.sh
rename to .scripts/wm/volume.sh
diff --git a/dotfiles.sh b/dotfiles.sh
index 2bc9eca..37b7968 100755
--- a/dotfiles.sh
+++ b/dotfiles.sh
@@ -6,7 +6,6 @@ if [ "$(dirname $0)" != "." ]; then
 fi
 
 FILES=$(find . \( -path ./.git -o \
-		  -path ./scripts -o \
 		  -path ./dotfiles.sh \) -prune -o -type f -print)
 
 if [ "$1" == "help" ] || [ "$1" == "" ]; then