From 01e8cb1cd83cc37250c68a4e5b81b618fea73d26 Mon Sep 17 00:00:00 2001
From: Adam Veldhousen <adam.veldhousen@liveauctioneers.com>
Date: Mon, 2 Mar 2020 22:13:51 -0600
Subject: [PATCH] i3lock-fancy and picom

---
 src/.config/i3/config      | 19 ++++++++++++-------
 src/.config/polybar/config | 17 ++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/.config/i3/config b/src/.config/i3/config
index e66150b..21d1cee 100644
--- a/src/.config/i3/config
+++ b/src/.config/i3/config
@@ -7,7 +7,6 @@
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
 font pango:DejaVu Sans Mono 12
 
-
 #########################################
 # STARTUP
 #########################################
@@ -19,7 +18,7 @@ font pango:DejaVu Sans Mono 12
 # start polybar
 exec_always --no-startup-id ~/.config/i3/polybar.sh &
 # start picom for window composition
-exec --no-startup-id picom --config ~/.config/compton/compton.conf -b
+exec --no-startup-id picom -C -f --no-fading-openclose --config /dev/null -b
 
 # set wallpaper
 exec_always --no-startup-id nitrogen --head=0 --save --set-scaled ~/Pictures/Wallpapers/retro.jpg &
@@ -46,9 +45,9 @@ exec_always --no-startup-id nitrogen --head=0 --save --set-scaled ~/Pictures/Wal
 # bindsym --release $mod+x exec --no-startup-id import /tmp/latest-screenshot.png
 
 # Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 1 +5% #increase sound volume
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 1 -5% #decrease sound volume
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle # mute sound
 
 # Media player controls
 bindsym XF86AudioPlay exec playerctl play-pause
@@ -60,14 +59,20 @@ bindsym XF86AudioPrev exec playerctl previous
 bindsym XF86MonBrightnessUp exec light -A 10 # increase screen brightness
 bindsym XF86MonBrightnessDown exec light -U 10 # decrease screen brightness
 
+# lock the screen
+bindsym Ctrl+Shift+l exec i3lock-fancy -f 'Pragmata Pro' -t 'Type Password To Unlock'
+
 # start a terminal
 bindsym Mod1+Return exec terminator
 
+# insomnia
 bindsym Mod1+Shift+i exec insomnia
 
+# start firefox
+bindsym Mod1+Shift+Return exec firefox
+
 # start chrome with correct DPI settings
 # bindsym Mod1+Shift+Return exec google-chrome-stable --force-device-scale-factor=1.65 %U
-bindsym Mod1+Shift+Return exec firefox
 
 #  Sets up 2 external displays side by side, with the laptop display on the far right
 bindsym Mod1+Shift+f exec xrandr --output DVI-I-2-1 --auto --left-of DVI-I-3-2 && sleep 1 && xrandr --output DVI-I-3-2 --auto --left-of DP-0 && sleep 1 && xrandr --output DP-0 --auto --primary --preferred
@@ -78,7 +83,7 @@ bindsym Mod1+Shift+Ctrl+g exec xrandr --output DVI-I-3-2 --off && xrandr --outpu
 bindsym Mod1+Shift+x move workspace to output right
 
 # turn off laptop monitor
-bindsym Mod1+Shift+~ exec xrandr --output DP-0 --off
+# bindsym Mod1+Shift+~ exec xrandr --output DP-0 --off
 
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that installed.
diff --git a/src/.config/polybar/config b/src/.config/polybar/config
index 97f94eb..795bd48 100644
--- a/src/.config/polybar/config
+++ b/src/.config/polybar/config
@@ -459,14 +459,17 @@ label-separator = |
 label-separator-foreground = ${colors.foreground-alt}
 
 
-menu-0-0 = suspend
-menu-0-0-exec = suspend
+menu-0-0 = lock
+menu-0-0-exec = i3lock-fancy
 
-menu-0-1 = reboot
-menu-0-1-exec = menu-open-1
+menu-0-1 = suspend
+menu-0-1-exec = suspend
 
-menu-0-2 = shutdown
-menu-0-2-exec = menu-open-2
+menu-0-2 = reboot
+menu-0-2-exec = menu-open-1
+
+menu-0-3 = shutdown
+menu-0-3-exec = menu-open-2
 
 menu-1-0 = cancel
 menu-1-0-exec = menu-open-0
@@ -510,7 +513,7 @@ type = custom/script
 interval = 5
 format-prefix = "🎶 "
 format = 🎶<label> 🎶
-exec = python ~/tools/polybar/polybar-spotify/spotify_status.py -p '>,||' -f '{play_pause} {song} -by- {artist} -from al- {album}' --font 3 -t 120
+exec = python ~/tools/polybar/polybar-spotify/spotify_status.py -p '>,||' -f '{play_pause} {song} -by- {artist} -from- {album}' --font 3 -t 120
 format-underline = #1db954
 
 ; vim:ft=dosini