From cc422c3ce665408c124a925f71472426edb61aa5 Mon Sep 17 00:00:00 2001
From: Logan Gartner <logan@qtechofficial.com>
Date: Tue, 1 Oct 2024 18:18:46 -0600
Subject: [PATCH] Replaced nwggrid with nwg-drawer

---
 airootfs/etc/skel/.config/labwc/autostart     |  3 +-
 airootfs/etc/skel/.config/labwc/menu.xml      |  3 ++
 airootfs/etc/skel/.config/labwc/rc.xml        |  6 ++++
 .../etc/skel/.config/nwg-drawer/drawer.css    | 34 +++++++++++++++++++
 airootfs/etc/skel/.config/waybar/modules      |  3 +-
 packages.x86_64                               |  2 +-
 6 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 airootfs/etc/skel/.config/nwg-drawer/drawer.css

diff --git a/airootfs/etc/skel/.config/labwc/autostart b/airootfs/etc/skel/.config/labwc/autostart
index b8464d5..c9cec64 100644
--- a/airootfs/etc/skel/.config/labwc/autostart
+++ b/airootfs/etc/skel/.config/labwc/autostart
@@ -25,4 +25,5 @@ foot -s >/dev/null 2>&1 &
 waybar -c ~/.config/waybar/labwc >/dev/null 2>&1 &
 
 # Drawer
-nwggrid-server -layer-shell-layer OVERLAY 2>&1 &
+#nwggrid-server -layer-shell-layer OVERLAY 2>&1 &
+nwg-drawer -r -ovl -nofs -term footclient -pbexit "pkill labwc" -pblock "swaylock -c 111111" -pbpoweroff "poweroff" -pbreboot "reboot" -pbsleep "systemctl suspend" -pbuseicontheme 2>&1 &
diff --git a/airootfs/etc/skel/.config/labwc/menu.xml b/airootfs/etc/skel/.config/labwc/menu.xml
index 0876766..0491e60 100644
--- a/airootfs/etc/skel/.config/labwc/menu.xml
+++ b/airootfs/etc/skel/.config/labwc/menu.xml
@@ -20,7 +20,10 @@
 </menu>
 <menu id="root-menu" label="">
     <item label="Open Drawer">
+        <!--
         <action name="Execute"><command>nwggrid -client</command></action>
+        -->
+        <action name="Execute"><command>nwg-drawer -open</command></action>
     </item>
     <item label="Open Run Menu">
         <action name="Execute"><command>bemenu-run</command></action>
diff --git a/airootfs/etc/skel/.config/labwc/rc.xml b/airootfs/etc/skel/.config/labwc/rc.xml
index f0575c0..e20e46e 100644
--- a/airootfs/etc/skel/.config/labwc/rc.xml
+++ b/airootfs/etc/skel/.config/labwc/rc.xml
@@ -35,9 +35,15 @@
             <action name="Execute"><command>footclient</command></action>
         </keybind>
 
+        <!--
         <keybind key="W-d">
             <action name="Execute"><command>nwggrid</command></action>
         </keybind>
+        -->
+
+        <keybind key="W-d">
+            <action name="Execute"><command>nwg-drawer -open</command></action>
+        </keybind>
 
         <keybind key="W-r">
             <action name="Execute"><command>bemenu-run</command></action>
diff --git a/airootfs/etc/skel/.config/nwg-drawer/drawer.css b/airootfs/etc/skel/.config/nwg-drawer/drawer.css
new file mode 100644
index 0000000..442abe1
--- /dev/null
+++ b/airootfs/etc/skel/.config/nwg-drawer/drawer.css
@@ -0,0 +1,34 @@
+window {
+    background-color: rgba (24, 24, 24, 0.95);
+    color: #eeeeee
+}
+
+/* search entry */
+entry {
+    background-color: rgba (0, 0, 0, 0.2)
+}
+
+button, image {
+    background: none;
+    border: none
+}
+
+button:hover {
+    background-color: rgba (255, 255, 255, 0.1)
+}
+
+/* in case you wanted to give category buttons a different look */
+#category-button {
+    margin: 0 10px 0 10px
+}
+
+#pinned-box {
+    padding-bottom: 5px;
+    border-bottom: 1px dotted gray
+}
+
+#files-box {
+    padding: 5px;
+    border: 1px dotted gray;
+    border-radius: 15px
+}
diff --git a/airootfs/etc/skel/.config/waybar/modules b/airootfs/etc/skel/.config/waybar/modules
index 80edbae..2b1c773 100644
--- a/airootfs/etc/skel/.config/waybar/modules
+++ b/airootfs/etc/skel/.config/waybar/modules
@@ -167,7 +167,8 @@
 
     "custom/drawer": {
         "format": "󰀻",
-        "on-click": "nwggrid -client",
+        //"on-click": "nwggrid -client",
+        "on-click": "nwg-drawer -open",
         "tooltip": false,
     },
 
diff --git a/packages.x86_64 b/packages.x86_64
index 759bfd7..c51cc69 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -197,7 +197,7 @@ nwg-panel
 nwg-bar
 swaybg
 nwg-menu
-nwg-launchers
+nwg-drawer
 cliphist
 wl-clipboard
 wl-clipboard-x11