From 7ff6f8374e15353cc38af349c4ac5350992c21fc Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Thu, 13 Jun 2019 15:01:13 +0530
Subject: [PATCH] better lock screen

---
 files/bash/.bashrc                          | 14 ++++++++------
 files/dev/.docker/config.json               |  5 +++--
 files/display/.config/nitrogen/nitrogen.cfg | 12 ++++++++++++
 files/i3/.i3/config                         |  7 ++-----
 files/snippets/.snippy/dm                   |  1 +
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 files/display/.config/nitrogen/nitrogen.cfg
 create mode 100644 files/snippets/.snippy/dm

diff --git a/files/bash/.bashrc b/files/bash/.bashrc
index a539fe1..a985dd8 100644
--- a/files/bash/.bashrc
+++ b/files/bash/.bashrc
@@ -621,19 +621,21 @@ function sprint() {
 }
 
 # https://github.com/uber/makisu
-
+# 
 function makisu_build() {
-    makisu_version=${MAKISU_VERSION:-v0.1.8}
-    
+    makisu_version=${MAKISU_VERSION:-v0.1.10}
+    cd ${@: -1}
     docker run -i --rm --net host \
         -v /var/run/docker.sock:/docker.sock \
         -e DOCKER_HOST=unix:///docker.sock \
         -v $(pwd):/makisu-context \
         -v /tmp/makisu-storage:/makisu-storage \
         gcr.io/makisu-project/makisu:$makisu_version build \
-            --modifyfs=true --load \
-            ${@:1:-1} /makisu-context
-    # popd
+            --commit=explicit \
+            --modifyfs=true \
+            --load \
+            ${@:1:${#@}-1} /makisu-context
+    cd -
 }
 
 eval "$(starship init bash)"
diff --git a/files/dev/.docker/config.json b/files/dev/.docker/config.json
index 1c214bf..b1c13b8 100644
--- a/files/dev/.docker/config.json
+++ b/files/dev/.docker/config.json
@@ -1,9 +1,10 @@
 {
 	"auths": {
-		"https://index.docker.io/v1/": {}
+		"https://index.docker.io/v1/": {},
+		"quay.io": {}
 	},
 	"HttpHeaders": {
 		"User-Agent": "Docker-Client/18.09.7 (linux)"
 	},
 	"credsStore": "pass"
-}
\ No newline at end of file
+}
diff --git a/files/display/.config/nitrogen/nitrogen.cfg b/files/display/.config/nitrogen/nitrogen.cfg
new file mode 100644
index 0000000..6f63e9d
--- /dev/null
+++ b/files/display/.config/nitrogen/nitrogen.cfg
@@ -0,0 +1,12 @@
+[geometry]
+posx=0
+posy=0
+sizex=1920
+sizey=1179
+
+[nitrogen]
+view=icon
+recurse=true
+sort=alpha
+icon_caps=false
+dirs=/home/nemo/projects/personal/avatars/wallpaper;/home/nemo/Pictures/Wallpapers;
diff --git a/files/i3/.i3/config b/files/i3/.i3/config
index 2d3f611..db4917d 100644
--- a/files/i3/.i3/config
+++ b/files/i3/.i3/config
@@ -82,12 +82,8 @@ bindsym $mod+Shift+q kill
 bindsym XF86KbdBrightnessUp exec /home/nemo/projects/scripts/backlight up
 bindsym XF86KbdBrightnessDown exec /home/nemo/projects/scripts/backlight down 
 
-#### Lock screen config #####
-# Use i3lock as screensaver (works on suspend)
-exec "xss-lock -- /home/nemo/projects/scripts/i3lock.sh -l dim"
-
 # Autolock screen after 2 minutes
-exec xautolock -corners -000 -detectsleep -time 1 -locker "/home/nemo/projects/scripts/i3lock.sh -l dim"
+exec xautolock -detectsleep -time 1 -locker "/home/nemo/projects/scripts/lock.sh"
 
 # dunst for notifications
 exec "dunst"
@@ -106,6 +102,7 @@ set $screenshot_file '/home/nemo/Desktop/Screenshots/%Y-%m-%d_%H-%M-%S-$wx$h.png
 bindsym Print exec escrotum --select --selection-delay 100 $screenshot_file && notify-send "done"
 bindsym Shift+Print exec escrotum --clipboard --select --selection-delay 100 $screenshot_file && notify-send "copied"
 bindsym Ctrl+Print exec scrot --focused --count --delay 0.5 --quality 80 --silent $screenshot_file && notify-send "done"
+bindsym Ctrl+$mod+I exec scrot --focused --count --delay 1 --quality 80 --silent $screenshot_file && notify-send "done"
 bindsym Ctrl+Shift+Print exec scrot --count --delay 0.5 --quality 80 --silent $screenshot_file && notify-send "done"
 
 bindsym $mod+I exec escrotum --select --selection-delay 300 $screenshot_file && notify-send "done"
diff --git a/files/snippets/.snippy/dm b/files/snippets/.snippy/dm
new file mode 100644
index 0000000..67c4c8e
--- /dev/null
+++ b/files/snippets/.snippy/dm
@@ -0,0 +1 @@
+@dependabot merge