From 141eb12db1919d097fc6af11e5fcbffdab880f85 Mon Sep 17 00:00:00 2001
From: Clay Gomera <misterclay@tutanota.com>
Date: Sat, 24 Jun 2023 13:00:22 -0400
Subject: [PATCH] fixed dmenu scripts

---
 .../.config/suckless/dmenu/scripts/dmenu_edit |  5 +-
 .../suckless/dmenu/scripts/dmenu_power        | 43 ++++++++-------
 .../suckless/dmenu/scripts/dmenu_scrot        | 54 +++++++++----------
 .../.config/suckless/dmenu/scripts/dmenu_wall | 48 ++++++++---------
 .../.config/suckless/dmenu/scripts/dmenu_wifi | 28 +++++-----
 user/.config/user-dirs.dirs                   | 15 ++++++
 6 files changed, 107 insertions(+), 86 deletions(-)
 create mode 100644 user/.config/user-dirs.dirs

diff --git a/user/.config/suckless/dmenu/scripts/dmenu_edit b/user/.config/suckless/dmenu/scripts/dmenu_edit
index 9a3ce66c3..82a2b2cb5 100755
--- a/user/.config/suckless/dmenu/scripts/dmenu_edit
+++ b/user/.config/suckless/dmenu/scripts/dmenu_edit
@@ -5,18 +5,17 @@
 #  - Dependencies: dmenu (Everything else can be changed)
 
 # Show list of options
-EDITOR="emacsclient -c -a emacs"
 cd "$HOME" || exit 0
 file=1
 while [ "$file" ]; do
-    file=$(fd -LHpd 1 | dmenu -i -l 10 -p "file to edit: $(basename "$(pwd)")")
+    file=$(fd -LHpd 1 | dmenu -i -l 10 -p "󰈙 Open file in text editor $(basename "$(pwd)")")
     if [ -e "$file" ]; then
         owd=$(pwd)
         if [ -d "$file" ]; then
             cd "$file" || exit 0
         else [ -f "$file" ]
             if [ "$file" ]; then
-                $EDITOR "$owd/$file" &
+                $VISUAL "$owd/$file" &
                 exit 0
             else
                 exit 0
diff --git a/user/.config/suckless/dmenu/scripts/dmenu_power b/user/.config/suckless/dmenu/scripts/dmenu_power
index b38afbfe8..223243f0a 100755
--- a/user/.config/suckless/dmenu/scripts/dmenu_power
+++ b/user/.config/suckless/dmenu/scripts/dmenu_power
@@ -5,28 +5,24 @@
 #  - Dependencies: dmenu, power-profiles-daemon
 
 ## OPTIONS ##
-option1="logout"
-option2="reboot"
-option3="power off"
-option4="suspend"
-option5="lock"
-option6="change power profile"
-option7="cancel"
-
-## OPTIONS ARRAY ##
+option1="  Logout"
+option2="  Reboot"
+option3="  Power off"
+option4="󰒲  Suspend"
+option5="  Lock"
+option6="  Change power profile"
+option7="  Cancel"
 options="$option1\n$option2\n$option3\n$option4\n$option5\n$option6\n$option7"
 
 ## POWER PROFILE OPTIONS ##
-pwr1="performance"
-pwr2="balanced"
-pwr3="powersaver"
-pwr4="cancel"
-
-## POWER PROFILES ARRAY ##
+pwr1="󰓅 Performance"
+pwr2="󰾅 Balanced"
+pwr3="󰾆 Power Saver"
+pwr4=" Cancel"
 pwrs="$pwr1\n$pwr2\n$pwr3\n$pwr4"
 
 ## MAIN ACTION COMMAND ##
-action=$(echo -e "$options" | dmenu -i -p "power options:")
+action=$(echo -e "$options" | dmenu -i -p "  Power Options")
 case "$action" in
     $option1*)
         pkill X;;
@@ -40,14 +36,21 @@ case "$action" in
         slock;;
     $option6*)
         currentpwr=$(powerprofilesctl get)
-        pwraction=$(echo -e "$pwrs" | dmenu -i -p "current profile is: ${currentpwr} | select profile:")
+        if [ "$currentpwr" = "performance" ]; then
+            currentpwr="$pwr1"
+        elif [ "$currentpwr" = "balanced" ]; then
+            currentpwr="$pwr2"
+        elif [ "$currentpwr" = "power-saver" ]; then
+            currentpwr="$pwr3"
+        fi
+        pwraction=$(echo -e "$pwrs" | dmenu -i -p "  Power Profile Menu - Currently set to: ${currentpwr}")
         case "$pwraction" in
             $pwr1*)
-                powerprofilesctl set performance && notify-send "power profile switched to performance";;
+                powerprofilesctl set performance && notify-send "Power profile switched to performance";;
             $pwr2*)
-                powerprofilesctl set balanced && notify-send "power profile switched to balanced";;
+                powerprofilesctl set balanced && notify-send "Power profile switched to balanced";;
             $pwr3*)
-                powerprofilesctl set power-saver && notify-send "power profile switched to power saver";;
+                powerprofilesctl set power-saver && notify-send "Power profile switched to power saver";;
             $pwr4*)
                 exit 0
         esac;;
diff --git a/user/.config/suckless/dmenu/scripts/dmenu_scrot b/user/.config/suckless/dmenu/scripts/dmenu_scrot
index 198bdeb60..8fc01c55e 100755
--- a/user/.config/suckless/dmenu/scripts/dmenu_scrot
+++ b/user/.config/suckless/dmenu/scripts/dmenu_scrot
@@ -2,42 +2,42 @@
 
 # ***This script was made by Clay Gomera (Drake)***
 #  - Description: A simple screenshot dmenu script
-#  - Dependencies: scrot, dmenu, notify-send
+#  - Dependencies: escrotum, dmenu, notify-send
 
 ## CREATING SCREENSHOT FOLDER ##
-mkdir -p "$HOME/Pictures/Screenshots"
-cd "$HOME/Pictures/Screenshots" || exit 0
+mkdir -p "$HOME/Media/Pictures/Screenshots"
+cd "$HOME/Media/Pictures/Screenshots" || exit 0
 
 ## CHOICES ##
-cho1="entire screen"
-cho2="entire screen with delay"
-cho3="focused window"
-cho4="select area"
+cho1="󱣴 Entire screen"
+cho2="󱎫 Entire screen with delay"
+cho3="󱕻 Select window or area"
+cho4="󱎘 Exit"
 chos="$cho1\n$cho2\n$cho3\n$cho4"
 
 ## DELAY OPTIONS ##
-del1="3 sec delay"
-del2="5 sec delay"
-del3="10 sec delay"
+del1="󱑀 3 sec delay"
+del2="󱑂 5 sec delay"
+del3="󱑇 10 sec delay"
 dels="$del1\n$del2\n$del3"
 
 ## MAIN ACTION ##
-choice=$(echo -e "$chos" | dmenu -i -p "Select: ")
+choice=$(echo -e "$chos" | dmenu -i -p "  Sreenshot Menu")
 case $choice in
-    $cho1)
-        scrot && notify-send "screenshot saved";;
-    $cho2)
-        del=$(echo -e "$dels" | dmenu -i -p "Select: ");
-        case $del in
-            $del1)
-                scrot -d 3 && notify-send "screenshot saved";;
-            $del2)
-                scrot -d 5 && notify-send "screenshot saved";;
-            $del3)
-                scrot -d 10 && notify-send "screenshot saved"
-        esac;;
-    $cho3)
-        scrot -u -b && notify-send "screenshot saved.";;
-    $cho4)
-        scrot -s && notify-send "screenshot saved."
+  "$cho1")
+    escrotum && notify-send "Screenshot saved";;
+  "$cho2")
+    del=$(echo -e "$dels" | dmenu -i -p " Select Delay");
+    case $del in
+      "$del1")
+        escrotum -d 3 -C && notify-send "Screenshot saved";;
+      "$del2")
+        escrotum -d 5 -C && notify-send "Screenshot saved";;
+      "$del3")
+        escrotum -d 10 -C && notify-send  "Screenshot saved"
+    esac ;;
+  "$cho3")
+    escrotum -s && notify-send "Screenshot saved.";;
+  "$cho4")
+    exit 0
 esac
diff --git a/user/.config/suckless/dmenu/scripts/dmenu_wall b/user/.config/suckless/dmenu/scripts/dmenu_wall
index 62b89bf6e..2900648ee 100755
--- a/user/.config/suckless/dmenu/scripts/dmenu_wall
+++ b/user/.config/suckless/dmenu/scripts/dmenu_wall
@@ -2,43 +2,43 @@
 
 # ***This script was made by Clay Gomera (Drake)***
 #  - Description: A simple wallpaper changer script
-#  - Dependencies: dmenu, fd, feh
+#  - Dependencies: rofi, fd, feh
 
 ## MAIN VARIABLES AND COMMANDS ##
-walldir="Pictures/Wallpapers"
+walldir="$HOME/Media/Pictures/Wallpapers"
 cd "$walldir" || exit
 
 ## SELECT PICTURE FUNCTION ##
 selectpic() {
-    wallpaper=$(fd -p "$walldir" | dmenu -i -l 10 -p "select a wallpaper:")
-    if [ "$wallpaper" ]; then
-        chosenwall=$wallpaper
-    else
-        exit 0
-    fi
+  wallpaper=$(fd -p "$walldir" | dmenu -i -p " 󰋩 Select a wallpaper ")
+  if [ "$wallpaper" ]; then
+    chosenwall=$wallpaper
+  else
+    exit 0
+  fi
 }
 selectpic
 
 ## WALLPAPER SETTING OPTIONS ##
-option1="fill"
-option2="center"
-option3="tile"
-option4="max"
-option5="scale"
+option1="Fill"
+option2="Center"
+option3="Tile"
+option4="Max"
+option5="Scale"
 options="$option1\n$option2\n$option3\n$option4\n$option5"
 
 ## MAIN ACTION ##
-action=$(echo -e "$options" | dmenu -i -l 5 -p "chose the format:")
+action=$(echo -e "$options" | dmenu -i -p "  Chose the format ")
 case "$action" in
-    $option1*)
-        feh --bg-fill "$chosenwall";;
-    $option2*)
-        feh --bg-center "$chosenwall";;
-    $option3*)
-        feh --bg-tile "$chosenwall";;
-    $option4*)
-        feh --bg-max "$chosenwall";;
-    $option5*)
-        feh --bg-scale "$chosenwall";;
+  $option1*)
+    feh --bg-fill "$chosenwall";;
+  $option2*)
+    feh --bg-center "$chosenwall";;
+  $option3*)
+    feh --bg-tile "$chosenwall";;
+  $option4*)
+    feh --bg-max "$chosenwall";;
+  $option5*)
+    feh --bg-scale "$chosenwall";;
 esac
 exit 0
diff --git a/user/.config/suckless/dmenu/scripts/dmenu_wifi b/user/.config/suckless/dmenu/scripts/dmenu_wifi
index c2ea2452b..d517d9457 100755
--- a/user/.config/suckless/dmenu/scripts/dmenu_wifi
+++ b/user/.config/suckless/dmenu/scripts/dmenu_wifi
@@ -5,12 +5,12 @@
 #  - Dependencies: dmenu, NetworkManager
 
 ## MAIN OPTIONS ##
-option1="turn on wifi"
-option2="turn off wifi"
-option3="disconnect wifi"
-option4="connect wifi"
-option5="setup captive portal"
-option6="exit"
+option1="  Turn on WiFi"
+option2="  Turn off WiFi"
+option3="󱛅  Disconnect WiFi"
+option4="󱛃  Connect WiFi"
+option5="󱛆  Setup captive portal"
+option6="  Exit"
 options="$option1\n$option2\n$option3\n$option4\n$option5\n$option6"
 
 wlan=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f1 | head -1)
@@ -40,12 +40,12 @@ disconnect() {
 connect() {
   notify-send "Scannig networks, please wait"
   sleep 1
-  bssid=$(nmcli device wifi list | sed -n '1!p' | cut -b 9- | dmenu -i -fn "mononoki Nerd Font-12" -l 10 -nb \#1d2021 -nf \#fbf1c7 -sb \#cc241d -sf \#fbf1c7 -p "select wifi:" | cut -d' ' -f1)
+  bssid=$(nmcli device wifi list | sed -n '1!p' | cut -b 9- | dmenu -i -p "Select a Wifi Network  " | cut -d' ' -f1)
 }
 
 ## SELECT PASSWORD FUNCTION ##
 password() {
-  pass=$(echo " " | dmenu -P -i -p "enter password:")
+  pass=$(echo " " | dmenu -P -i -p "Enter Password ")
 }
 
 ## MAIN CONNECTION COMMAND ##
@@ -66,7 +66,7 @@ check() {
 }
 
 ## MAIN ACTION COMMANDS ##
-cases=$(echo -e "$options" | dmenu -i -p "wifi options:" )
+cases=$(echo -e "$options" | dmenu -i -p "  Wifi Settings" )
 case "$cases" in
   $option1*)
     turnon;;
@@ -76,9 +76,13 @@ case "$cases" in
     disconnect;;
   $option4*)
     connect;
-    password;
-    action;
-    check;;
+      if [ -n "$bssid" ]; then
+        password;
+        action;
+        check;
+      else
+        exit 0;
+      fi;;
   $option5*)
     $BROWSER http://networkcheck.kde.org;;
   $option6*)
diff --git a/user/.config/user-dirs.dirs b/user/.config/user-dirs.dirs
new file mode 100644
index 000000000..1d7ebd4f8
--- /dev/null
+++ b/user/.config/user-dirs.dirs
@@ -0,0 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DESKTOP_DIR="$HOME/Temporal/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Temporal/Downloads"
+XDG_TEMPLATES_DIR="$HOME/Temporal/Templates"
+XDG_PUBLICSHARE_DIR="$HOME/Temporal/Public"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_MUSIC_DIR="$HOME/Media/Music"
+XDG_PICTURES_DIR="$HOME/Media/Pictures"
+XDG_VIDEOS_DIR="$HOME/Media/Videos"