From fb89f3eabc53165f3b5379d4d4fe96f3b449e661 Mon Sep 17 00:00:00 2001
From: John Mertz <john.mertz@mailcleaner.net>
Date: Fri, 31 Dec 2021 11:08:28 -0500
Subject: [PATCH] Fix rofi theme

Version change. Theme can no longer be referenced inside the main config
---
 rofi/drun.sh              | 4 ++--
 rofi/rofi-openvpn.sh      | 4 ++--
 rofi/rofi-power-menu.sh   | 5 +++--
 rofi/rofi-send-to-kodi.sh | 3 ++-
 rofi/rofi-ssh-menu.sh     | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rofi/drun.sh b/rofi/drun.sh
index f733a6f..490d1e3 100755
--- a/rofi/drun.sh
+++ b/rofi/drun.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-ROFI=$(pgrep -c rofi | cut -b 1)
+ROFI=$(pgrep -xc rofi | cut -b 1)
 echo $ROFI
 
 if [[ "$ROFI" -eq "0" ]]; then
-        rofi -config /home/jpm/.config/rofi/config.rasi -show drun
+	rofi -config /home/jpm/.config/rofi/config.rasi -theme /home/jpm/.config/rofi/sidebar.rasi -show drun -lines 20
 else
         killall rofi 2&>1 /dev/null
 fi
diff --git a/rofi/rofi-openvpn.sh b/rofi/rofi-openvpn.sh
index e69bd47..b8144c6 100755
--- a/rofi/rofi-openvpn.sh
+++ b/rofi/rofi-openvpn.sh
@@ -2,7 +2,7 @@
 
 # Passwordless sudo required
 
-res=$(echo "Connection|John.Me.tz|MailCleaner|Disconnect|Restart" | rofi -sep "|" -dmenu -i -p 'P ' "" -columns 9 -width 45 -l 1 -config /home/jpm/.config/rofi/config.rasi -hide-scrollbar -eh 1 -location 0 -auto-select -no-fullscreen)
+res=$(echo "Connection|John.Me.tz|MailCleaner|Disconnect|Restart" | rofi -sep "|" -dmenu -i -p 'P ' "" -columns 9 -width 45 -l 1 -config /home/jpm/.config/rofi/config.rasi -theme /home/jpm/.config/rofi/sidebar -hide-scrollbar -eh 1 -location 0 -auto-select -no-fullscreen)
 
 if [ $res = "Connection" ]; then
         /usr/bin/uxterm -e 'sudo /usr/bin/nmtui'
@@ -28,4 +28,4 @@ fi
 
 # Waybar sometimes doesn't update with the VPN IP, for whatever reason. Restart it.
 # exits above because I change outputs more often than I change VPNs
-/home/jpm/scripts/sway/displays.pl -w
+#/home/jpm/scripts/sway/displays.pl -w
diff --git a/rofi/rofi-power-menu.sh b/rofi/rofi-power-menu.sh
index ba7eed7..c574e02 100755
--- a/rofi/rofi-power-menu.sh
+++ b/rofi/rofi-power-menu.sh
@@ -10,9 +10,9 @@ else
 fi
 
 if [[ $WM == 'i3' ]]; then
-        res=$(printf "🔒 Lock|↩ Logout|↻ Reload i3|↹ Restart i3|↯ Hibernate|🡙 Reboot|⏻ Shutdown" | rofi -sep "|" -dmenu -i -p 'Power: ' "" -columns 1 -rows 7 -width 32 -l 1 -hide-scrollbar -eh 1 -location 0 -padding 12 -opacity 100 -auto-select -no-fullscreen)
+        res=$(printf "🔒 Lock|↩ Logout|↻ Reload i3|↹ Restart i3|↯ Hibernate|🡙 Reboot|⏻ Shutdown" | rofi -sep "|" -dmenu -i -p 'Power: ' "" -columns 1 -rows 7 -width 32 -l 1 -theme /home/jpm/.config/rofi/sidebar -hide-scrollbar -eh 1 -location 0 -padding 12 -opacity 100 -auto-select -no-fullscreen)
 else
-        res=$(echo "🔒 Lock|🖵 Toggle Displays|⚿ Yubico Authenticator|↻ Reload Sway|↻ Reload Waybar|↩ Logout|↯ Hibernate|🡙 Reboot|⏻ Shutdown" | rofi -sep "|" -dmenu -i -p 'Power: ' "" -no-lazy-grab -auto-select -no-fullscreen)
+        res=$(echo "🔒 Lock|🖵 Toggle Displays|⚿ Yubico Authenticator|↻ Reload Sway|↻ Reload Waybar|↩ Logout|↯ Hibernate|🡙 Reboot|⏻ Shutdown" | rofi -sep "|" -dmenu -i -p 'Power: ' "" -theme /home/jpm/.config/rofi/sidebar -no-lazy-grab -auto-select -no-fullscreen)
 fi
 
 if [ "$res" == "🔒 Lock" ]; then
@@ -31,6 +31,7 @@ elif [ "$res" == "↹ Restart i3" ]; then
         i3 restart
 elif [ "$res" == "↻ Reload Sway" ]; then
         sway reload
+	/home/jpm/scripts/sway/displays.pl
 elif [ "$res" == "↻ Reload Waybar" ]; then
         # Need to integrate with sway/displays.pl for alternative outputs
         /home/jpm/scripts/sway/displays.pl -w
diff --git a/rofi/rofi-send-to-kodi.sh b/rofi/rofi-send-to-kodi.sh
index 9b3bd1e..412af0d 100755
--- a/rofi/rofi-send-to-kodi.sh
+++ b/rofi/rofi-send-to-kodi.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 INPUT="$(rofi -dmenu -i -p 'Kodi:' "" -columns 1 -rows 7 -width 32 -l 1 \
-        -hide-scrollbar -eh 1 -location 0 -padding 12 -opacity 100)"
+        -theme /home/jpm/.config/rofi/sidebar -hide-scrollbar -eh 1 -location \
+	0 -padding 12 -opacity 100)"
 
 /home/jpm/scripts/send-to-kodi.sh $INPUT 2>&1 /dev/null
diff --git a/rofi/rofi-ssh-menu.sh b/rofi/rofi-ssh-menu.sh
index a93c6a9..3e578f1 100755
--- a/rofi/rofi-ssh-menu.sh
+++ b/rofi/rofi-ssh-menu.sh
@@ -4,7 +4,7 @@ res=$(echo "john.me.tz|root@john.me.tz|t470s.lan.john.me.tz|shb.ng|\
 kipary.fastnet.ch|media.lan.john.me.tz|pipcam0.lan.john.me.tz|\
 therm.lan.john.me.tz|hud.lan.john.me.tz|vm.lan.john.me.tz|mac.lan.john.me.tz|AndroidUSB" | \
 rofi -sep "|" -dmenu -i -p 'P ' "" -columns 1 -rows 1 -width 45 -l 1 -config \
-/home/jpm/.config/rofi/config.rasi -hide-scrollbar -eh 1 -location 0 -yoffset 0 \
+/home/jpm/.config/rofi/config.rasi -theme /home/jpm/.config/rofi/sidebar.rasi -hide-scrollbar -eh 1 -location 0 -yoffset 0 \
 -padding 12 -opacity 100 -auto-select -no-fullscreen)
 
 echo $res > /home/jpm/.last_ssh_shortcut