From 4a593201c9ccccc5a7e4f276649aa7c5fe044cf6 Mon Sep 17 00:00:00 2001
From: imgurbot12 <imgurbot12@gmail.com>
Date: Wed, 3 Apr 2024 22:40:26 -0700
Subject: [PATCH] feat: minor default make-install restructure

---
 Makefile                 | 14 +++++++-------
 rmenu/public/config.yaml | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 3d58cc6..3d4d576 100644
--- a/Makefile
+++ b/Makefile
@@ -31,15 +31,15 @@ package: build deploy
 
 #: locally deploy build-artifcats into their designated locations
 deploy:
-	mkdir -p ${DEST} ${INSTALL}
-	cp -vfr themes ${DEST}/themes
-	cp -vfr other-plugins/* ${DEST}/.
+	mkdir -p ${DEST}/plugins ${INSTALL}
+	cp -vfr themes ${DEST}/.
+	cp -vfr other-plugins/* ${DEST}/plugins/.
 	cp -vf ./target/release/rmenu ${INSTALL}/rmenu
 	cp -vf ./target/release/rmenu-build ${INSTALL}/rmenu-build
-	cp -vf ./target/release/desktop ${DEST}/rmenu-desktop
-	cp -vf ./target/release/run ${DEST}/rmenu-run
-	cp -vf ./target/release/network ${DEST}/rmenu-network
-	cp -vf ./target/release/window ${DEST}/rmenu-window
+	cp -vf ./target/release/desktop ${DEST}/plugins/rmenu-desktop
+	cp -vf ./target/release/run ${DEST}/plugins/rmenu-run
+	cp -vf ./target/release/network ${DEST}/plugins/rmenu-network
+	cp -vf ./target/release/window ${DEST}/plugins/rmenu-window
 	cp -vf ./rmenu/public/config.yaml ${DEST}/config.yaml
 	ln -sf  ${DEST}/themes/dark.css ${DEST}/style.css
 
diff --git a/rmenu/public/config.yaml b/rmenu/public/config.yaml
index 64fd8bf..a174e9b 100644
--- a/rmenu/public/config.yaml
+++ b/rmenu/public/config.yaml
@@ -19,11 +19,11 @@ window:
 
 # configured plugin settings
 plugins:
-  run:  
-    exec:  ["~/.config/rmenu/rmenu-run"]
+  run:
+    exec:  ["~/.config/rmenu/plugins/rmenu-run"]
     cache: 300
-  drun: 
-    exec:  ["~/.config/rmenu/rmenu-desktop"]
+  drun:
+    exec:  ["~/.config/rmenu/plugins/rmenu-desktop"]
     cache: onlogin
     options:
       css: ~/.config/rmenu/themes/launchpad.css
@@ -36,19 +36,19 @@ plugins:
       key_jump_prev: ["Arrow-Up"]
       key_jump_next: ["Arrow-Down"]
   network:
-    exec:  ["~/.config/rmenu/rmenu-network"]
+    exec:  ["~/.config/rmenu/plugins/rmenu-network"]
     cache: false
     placeholder: "Connect to the Specified Wi-Fi"
   window:
-    exec:  ["~/.config/rmenu/rmenu-window"]
+    exec:  ["~/.config/rmenu/plugins/rmenu-window"]
     cache: false
     placeholder: "Jump to the Specified Window"
   audio:
-    exec:  ["~/.config/rmenu/pactl-audio.sh"]
+    exec:  ["~/.config/rmenu/plugins/pactl-audio.sh"]
     cache: false
     placeholder: "Select an Audio Sink"
   powermenu:
-    exec: ["~/.config/rmenu/powermenu.sh"]
+    exec: ["~/.config/rmenu/plugins/powermenu.sh"]
     cache: false
 
 # custom keybindings