From cc79b2832abb5327aca6deec71533d6f41b99629 Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Wed, 11 Dec 2024 19:30:08 -0500
Subject: [PATCH] ~

---
 configs/openbox/autostart          |  3 +--
 configs/openbox/rc.xml             |  7 +++++++
 nixos/home.nix                     | 29 +++++++++++++++--------------
 nixos/hosts/qemu/configuration.nix |  9 +++++----
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/configs/openbox/autostart b/configs/openbox/autostart
index b845f88..4b6b654 100644
--- a/configs/openbox/autostart
+++ b/configs/openbox/autostart
@@ -1,4 +1,3 @@
 hsetroot -cover ~/.dotfiles/assets/wallpapers/kendal.png
 xcompmgr &
-polybar top & 
-polybar tray &
+polybar top &
diff --git a/configs/openbox/rc.xml b/configs/openbox/rc.xml
index e349ec2..7a03c36 100644
--- a/configs/openbox/rc.xml
+++ b/configs/openbox/rc.xml
@@ -7,6 +7,13 @@
     <desktops>
         <number>4</number>
         <firstdesk>1</firstdesk>
+        <popupTime>0</popupTime>
+        <names>
+            <name>1</name>
+            <name>2</name>
+            <name>3</name>
+            <name>4</name>
+        </names>
     </desktops>
     <keyboard>
         <keybind key="A-d">
diff --git a/nixos/home.nix b/nixos/home.nix
index 021512a..e97485e 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -71,21 +71,12 @@ in
                         height = 32;
                         font-0 = "GohuFont:style=Regular:size=14;3";
                         modules-left = "cpu memory";
-                        modules-center = "xwindow";
+                        modules-center = "xworkspaces";
                         modules-right = "battery date";
                         module-margin = 1;
                         offset-y = 14;
                         padding = 2;
                     };
-                    "bar/tray" = {
-                        background = color0;
-                        foreground = "#000";
-                        bottom = "true";
-                        width = "100%";
-                        height = 32;
-                        font-0 = "GohuFont:style=Regular:size=14;3";
-                        modules-left = "tray";
-                    };
 
                     "module/cpu" = {
                         type = "internal/cpu";
@@ -105,6 +96,20 @@ in
                         type = "internal/xwindow";
                         label-active-font = 0;
                     };
+                    "module/xworkspaces" = {
+                        type = "internal/xworkspaces";
+                        enable-scroll = false;
+                        label-active = "%name%";
+                        label-active-background = color2;
+                        label-active-padding = 1;
+                        label-occupied = "%name%";
+                        label-occupied-padding = 1;
+                        label-empty = "%name%";
+                        label-empty-padding = 1;
+                        label-urgent = "%name%";
+                        label-urgent-background = color0;
+                        label-urgent-padding = 1;
+                    };
                     "module/battery" = {
                         type = "internal/battery";
                         battery = "BAT0";
@@ -122,10 +127,6 @@ in
                         label-padding = 2;
                         interval = 5;
                     };
-                    "module/tray" = {
-                        type = "internal/tray";
-                        tray-spacing = "8px";
-                    };
                 };
             };
         };
diff --git a/nixos/hosts/qemu/configuration.nix b/nixos/hosts/qemu/configuration.nix
index 805c2cf..8da0268 100644
--- a/nixos/hosts/qemu/configuration.nix
+++ b/nixos/hosts/qemu/configuration.nix
@@ -94,22 +94,23 @@
         ffmpeg
         git
         gparted
-        hsetroot
         hyfetch
         imagemagick
         kitty
-        nitrogen
         xclip
         yt-dlp
         zellij
         # text editors
         neovim
         vscodium
-        # misc
+        # X11
+        hsetroot
+        nitrogen
         polybar
         rofi
-        uxn
         xcompmgr
+        # misc
+        uxn
     ];
 
     # Open ports in the firewall.