Updated scripts for Qubes 4.1

1 files changed, 4 insertions, 11 deletions

diff --git a/qubes-dwm-6.2/scripts/dmenu_cur b/qubes-dwm-6.2/scripts/dmenu_cur
index fd8f152..49f3549 100755
--- a/qubes-dwm-6.2/scripts/dmenu_cur
+++ b/qubes-dwm-6.2/scripts/dmenu_cur
@@ -14,24 +14,17 @@ app_path() {
 }
 
 scrape_apps() {
-  grep '^Name=\|^Exec=' "$(app_path $1)"/*.desktop |  grep ':Name=' \
+  grep '^Name=\|^Exec=' "$(app_path $1)"/*.desktop | filter |  grep ':Name=' \
   | sed 's/'"$1"': //' | cut -d= -f2- | sort
 }
 
 filter() {
-  grep -v "Qube Settings"
+  grep -v "Qube Settings\|os\.vm\.debian-11-dvm\|os\.vm\.whonix-ws-16"
 }
 
-tidy() {
-  sed 's/Rxvt Color Unicode Terminal/urxvt/'
-}
-
-untidy() {
-  sed 's/urxvt/Rxvt Color Unicode Terminal/'
-}
 
 find_file() {
-  grep "^Name=.*$2" "$(app_path $1)"/*.desktop | cut -d: -f1
+  grep "^Name=.*$2" "$(app_path $1)"/*.desktop | filter | cut -d: -f1
 }
 
 # Expects the contents of a desktop file
@@ -50,7 +43,7 @@ else
   colour="-sb $(get_colour $win_id)"
 fi;
 
-choice=$(scrape_apps "$qube" | filter | tidy | sort | wrap_dmenu -p "$qube" $colour $* | untidy)
+choice=$(scrape_apps "$qube" | sort | wrap_dmenu -p "$qube" $colour $*)
 [ -z "$choice" ] && exit
 
 file="$(find_file "$qube" "$choice")"