From 435282b523af000518aef517413f3f562eb5a47c Mon Sep 17 00:00:00 2001
From: tavo-wasd <gustavo@gustavocalvo.xyz>
Date: Fri, 4 Aug 2023 15:43:03 -0600
Subject: [PATCH] asdasd

---
 X11/xinitrc            | 2 +-
 scripts/menu/menu-pass | 8 +++++---
 scripts/sxiv-bkg       | 4 ++--
 shell/xdgspec          | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/X11/xinitrc b/X11/xinitrc
index 53dbdce..6a57b73 100644
--- a/X11/xinitrc
+++ b/X11/xinitrc
@@ -20,7 +20,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 systemctl --user import-environment DISPLAY &
 setxkbmap en &
 xset r rate 300 50 &
-hsetroot -cover /home/tavo/Media/Pictures/Backgrounds/71.jpg &
+hsetroot -cover /home/tavo/Media/Pictures/Backgrounds/70.png
 dwmblocks &
 clipmenud &
 ps -C dunst | grep -q dunst || dunst &
diff --git a/scripts/menu/menu-pass b/scripts/menu/menu-pass
index f065ea0..703053c 100755
--- a/scripts/menu/menu-pass
+++ b/scripts/menu/menu-pass
@@ -1,12 +1,14 @@
 #!/bin/sh
 # Script for 'pass'
+PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
 
 # Ask for password name in vault
-password=$(find $XDG_DATA_HOME/password-store/ -type f -name '*.gpg' |
-	sed 's/.*\/\(.*\)\.gpg$/\1/' | menu "Password:")
+password="$(find "$PASSWORD_STORE_DIR" -type f -name '*.gpg' |
+	sed 's/.*\/\(.*\)\.gpg$/\1/' | menu "Password:")"
 
 # Exit if none chosen
 [ -z "$password" ] && exit
 
 # If chosen, use xdotool to type it
-xdotool type "$(pass $password | head -1)" && [ -e /usr/bin/notify-send ] && notify-send " $password" "Successfully decrypted"
+xdotool type "$(pass $password | head -1)" &&
+    [ -e /usr/bin/notify-send ] && notify-send " $password" "Successfully decrypted"
diff --git a/scripts/sxiv-bkg b/scripts/sxiv-bkg
index 0c0aa1b..be7ede6 100755
--- a/scripts/sxiv-bkg
+++ b/scripts/sxiv-bkg
@@ -9,7 +9,7 @@ img=$(find ~/Media/Pictures/Backgrounds/* | shuf | sxiv -itoq | tail -1)
 [ -z "$img" ] && exit
 
 # Find previous startup background command
-prev=$(grep hsetroot ~/.xinitrc)
+prev=$(grep hsetroot "$XINITRC")
 
 # Define wether or not hsetroot should
 # set per monitor or treat multiple monitors as one
@@ -22,4 +22,4 @@ esac
 
 # Set background and change
 # startup configuration with new one
-$new && sed -i "s|$prev|$new|g" ~/.xinitrc
+$new && sed -i "s|$prev|$new|g" "$XINITRC"
diff --git a/shell/xdgspec b/shell/xdgspec
index 9a64a4f..5d8ec39 100644
--- a/shell/xdgspec
+++ b/shell/xdgspec
@@ -7,6 +7,7 @@ export \
     XDG_DATA_HOME="$HOME/.local/share" \
     XDG_CONFIG_HOME="$HOME/.config" \
     GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" \
+    PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" \
     VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" \
     XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" \
     XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" \