From 5b80b4c33aab7d89f63c9d94b1e63c627490f39a Mon Sep 17 00:00:00 2001
From: agryphus <agryphus@gmail.com>
Date: Fri, 29 Sep 2023 13:39:48 -0400
Subject: [PATCH] Namespaced rofi scripts

---
 .config/sxhkd/sxhkdrc                     | 16 +++++++++-------
 .local/bin/layoutmenu                     |  3 ---
 .local/bin/menu-layout                    |  9 +++++++++
 .local/bin/menu-run                       |  9 +++++++++
 .local/bin/menu-sink                      | 23 +++++++++++++++++++++++
 .local/bin/{dmenuunicode => menu-unicode} |  4 +++-
 .local/bin/rofi-alias                     |  5 -----
 .local/bin/sinkmenu                       | 14 --------------
 8 files changed, 53 insertions(+), 30 deletions(-)
 delete mode 100755 .local/bin/layoutmenu
 create mode 100755 .local/bin/menu-layout
 create mode 100755 .local/bin/menu-run
 create mode 100755 .local/bin/menu-sink
 rename .local/bin/{dmenuunicode => menu-unicode} (87%)
 delete mode 100755 .local/bin/rofi-alias
 delete mode 100755 .local/bin/sinkmenu

diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 25c29bc..4c0f198 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -5,17 +5,19 @@
 super + shift + r
     pkill -usr1 -x sxhkd; notify-send 'sxhkd' 'Reloaded config'
 
-# Running dmenu scripts
+# Running dmenu/rofi scripts
 super + d
-    dmenu_run
+    menu-run
 super + D
-    passmenu
+    rofi-pass
 super + S
-    sinkmenu
+    menu-sink
 super + grave
-    dmenuunicode
-super + m
-    layoutmenu
+    menu-unicode
+super + M
+    menu-layout
+super + n
+    menu-norg
 
 # Spawn programs
 super + Return
diff --git a/.local/bin/layoutmenu b/.local/bin/layoutmenu
deleted file mode 100755
index f4e2490..0000000
--- a/.local/bin/layoutmenu
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-autorandr --list | dmenu -i -l 30 | xargs -I "layout" autorandr layout && feh --bg-scale --no-fehbg "$HOME/.config/wallpaper" && xset r rate 300 50
-
diff --git a/.local/bin/menu-layout b/.local/bin/menu-layout
new file mode 100755
index 0000000..0045532
--- /dev/null
+++ b/.local/bin/menu-layout
@@ -0,0 +1,9 @@
+#!/bin/sh
+layout=`autorandr | rofi -dmenu -i -p "Select layout" | awk '{print $1}'`
+autorandr $layout
+feh --bg-scale --no-fehbg "$HOME/.config/wallpaper"
+# echo "dwm.accent: $(color-picker $WALLPAPER)" > /tmp/dwm_accent
+# xrdb -override -merge /tmp/dwm_accent
+# rm /tmp/dwm_accent
+# kill -HUP $(pidof dwm)
+
diff --git a/.local/bin/menu-run b/.local/bin/menu-run
new file mode 100755
index 0000000..175f062
--- /dev/null
+++ b/.local/bin/menu-run
@@ -0,0 +1,9 @@
+#!/usr/bin/sh
+# Script to have rofi show and run aliases
+
+rofi -run-list-command "alias | awk -F= \"{print \\\$1}\"" \
+     -run-command "/usr/bin/zsh -i -c '{cmd}'" \
+     -rnow -show-icons -matching "prefix" \
+     -display-combi "Start" \
+     -show combi -combi-modes "drun,run" 
+
diff --git a/.local/bin/menu-sink b/.local/bin/menu-sink
new file mode 100755
index 0000000..1cced71
--- /dev/null
+++ b/.local/bin/menu-sink
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Simple dmenu script for changing default audio sink
+
+sinks_and_numbers=`wpctl status | 
+    awk '/Audio/,/Video/ {print}' | 
+    awk '/Sinks:/,/Sink endpoints:/ {print}' | 
+    tail -n +2 | head -n -2 | cut -c 10-`
+
+sinks=`echo "$sinks_and_numbers" | 
+    awk -F'.' '{print $2}' | 
+    awk -F'[' '{print $1}' | 
+    cut -c 2-`
+
+chosen=`echo "$sinks" | rofi -dmenu -p "Select audio sink" -i`
+if [ -z "$chosen" ]; then
+    # Exited out of dmenu prompt
+    exit
+fi
+
+number=`echo "$sinks_and_numbers" | grep "$chosen" | awk '{print $1}' | sed 's/\./ /'`
+
+wpctl set-default $number
+
diff --git a/.local/bin/dmenuunicode b/.local/bin/menu-unicode
similarity index 87%
rename from .local/bin/dmenuunicode
rename to .local/bin/menu-unicode
index 367d176..42babd1 100755
--- a/.local/bin/dmenuunicode
+++ b/.local/bin/menu-unicode
@@ -10,8 +10,10 @@ chosen=$(cut -d ';' -f1 ~/.local/share/chars/* | dmenu -i -l 30 | sed "s/ .*//")
 
 # If you run this command with an argument, it will automatically insert the
 # character. Otherwise, show a message that the emoji has been copied.
-if [ -n "$1" ]; then
+if [ "$1" = "type" ]; then
 	xdotool type "$chosen"
+elif [ "$1" = "output" ]; then
+    echo "$chosen"
 else
 	printf "%s" "$chosen" | xclip -selection clipboard
 	notify-send "'$chosen' copied to clipboard." &
diff --git a/.local/bin/rofi-alias b/.local/bin/rofi-alias
deleted file mode 100755
index c44cb05..0000000
--- a/.local/bin/rofi-alias
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/sh
-# Script to have rofi show and run aliases
-
-rofi -run-list-command "alias | awk -F= \"{print \\\$1}\"" -run-command "/usr/bin/zsh -i -c '{cmd}'" -rnow -show run
-
diff --git a/.local/bin/sinkmenu b/.local/bin/sinkmenu
deleted file mode 100755
index 770e6d8..0000000
--- a/.local/bin/sinkmenu
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Simple dmenu script for changing default audio sink
-
-sinks_and_numbers=`wpctl status \
-    | awk '/Audio/,/Video/ {print}' \
-    | awk '/Sinks:/,/Sink endpoints:/ {print}' \
-    | tail -n +2 | head -n -2 | cut -c 10-`
-
-sinks=`echo "$sinks_and_numbers" | awk -F'.' '{print $2}' | awk -F'[' '{print $1}' | cut -c 2-`
-chosen=`echo "$sinks" | dmenu -i -l 30`
-number=`echo "$sinks_and_numbers" | grep "$chosen" | awk '{print $1}' | sed 's/\./ /'`
-
-wpctl set-default $number
-