lockscreen background; use backlightctl; i3lock-color

4 files changed, 41 insertions, 12 deletions

diff --git a/des/i3/assets/wallpaper/dark_forest.png b/des/i3/assets/wallpaper/dark_forest.png
new file mode 100644
index 0000000..bf8c4fa
--- /dev/null
+++ b/des/i3/assets/wallpaper/dark_forest.png
diff --git a/des/i3/config b/des/i3/config
index 661de3e..085f814 100644
--- a/des/i3/config
+++ b/des/i3/config
@@ -28,9 +28,6 @@ exec --no-startup-id compton --config ~/.config/compton.conf -b
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
 
-# Lock screen with i3lock and custom wallpaper
-exec --no-startup-id /usr/local/bin/i3lock
-
 ## Allow yad to float for i3bar calendar
 for_window [class="Yad"] floating enable
 
@@ -43,9 +40,9 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && pkill -SIGRTMIN+10 i3blocks
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && pkill -SIGRTMIN+10 i3blocks
 
-# Use change_brightness (in .setup dir) to adjust backlight
-bindsym XF86MonBrightnessUp exec --no-startup-id change_brightness -i 50 && pkill -SIGRTMIN+9 i3blocks
-bindsym XF86MonBrightnessDown exec --no-startup-id change_brightness -d 50 && pkill -SIGRTMIN+9 i3blocks
+# Use https://github.com/Hummer12007/brightnessctl to adjust backlight
+bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set +5% && pkill -SIGRTMIN+9 i3blocks
+bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 5%- && pkill -SIGRTMIN+9 i3blocks
 
 # Use format_displays (in .setup dir) to configure external displays
 bindsym XF86LaunchA exec --no-startup-id format_displays
@@ -68,6 +65,9 @@ bindsym $mod+q kill
 bindsym $mod+space exec --no-startup-id rofi -lines 5 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Source Code Pro 18'
 bindsym $mod+Tab exec --no-startup-id rofi -lines 5 -padding 18 -width 60 -location 0 -show window -sidebar-mode -columns 4 -font 'Source Code Pro 18'
 
+# Lock screen
+bindsym $mod+F9 exec --no-startup-id "~/.setup/des/i3/i3lock-color-custom.sh"
+
 # change focus
 bindsym $mod+h focus left
 bindsym $mod+j focus down
diff --git a/des/i3/i3lock-color-custom.sh b/des/i3/i3lock-color-custom.sh
new file mode 100755
index 0000000..f6d5f82
--- /dev/null
+++ b/des/i3/i3lock-color-custom.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+B='#00000000'  # blank
+C='#ffffff22'  # clear ish
+D='#ff00ffcc'  # default
+T='#ee00eeee'  # text
+W='#880000bb'  # wrong
+V='#bb00bbbb'  # verifying
+
+i3lock \
+--insidever-color=$C   \
+--ringver-color=$V     \
+\
+--insidewrong-color=$C \
+--ringwrong-color=$W   \
+\
+--inside-color=$B      \
+--ring-color=$D        \
+--line-color=$B        \
+--separator-color=$D   \
+\
+--verif-color=$T        \
+--wrong-color=$T        \
+--time-color=$T        \
+--date-color=$T        \
+--layout-color=$T      \
+--keyhl-color=$W       \
+--bshl-color=$W        \
+\
+--screen 1            \
+-i "$HOME/.setup/des/i3/assets/wallpaper/dark_forest.png" \
+--clock               \
+--indicator           \
+--time-str="%H:%M:%S"  \
+--date-str="%A, %m %Y" \
diff --git a/des/i3/i3lock.sh b/des/i3/i3lock.sh
deleted file mode 100755
index 7af16b1..0000000
--- a/des/i3/i3lock.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-IMG="~/.setup/des/i3/assets/wallpaper/yosemite_color_block.png"
-
-xautolock -time 1 -locker "i3lock -i $IMG" -notify 1 -notifier 'xset dpms force off' &
-xautolock -time 10 -locker "systemctl suspend" &