diff --git a/flake.lock b/flake.lock
index ca612da..fb95179 100644
--- a/flake.lock
+++ b/flake.lock
@@ -480,11 +480,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737793455,
-        "narHash": "sha256-sVy0QU4fpZsUWj5B8t6jUNZHzVLC22+HYqcFG9pKPik=",
+        "lastModified": 1738658103,
+        "narHash": "sha256-7yoK8ueD9wzWQF/wuPDIGZHVWz9sa3YBAiSpDvMH2Ac=",
         "owner": "Jas-SinghFSU",
         "repo": "HyprPanel",
-        "rev": "74065af3d2aa576e8b183d720033c3eece3deb70",
+        "rev": "537a9653edb377230ff3c9e8308e7648cb38225f",
         "type": "github"
       },
       "original": {
diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix
index 7696886..6d6a1ec 100644
--- a/home/arrakis/default.nix
+++ b/home/arrakis/default.nix
@@ -22,20 +22,29 @@
   ];
 
   home.sessionVariables = {
-    # LIBVA_DRIVER_NAME = "nvidia";
     XDG_SESSION_TYPE = "wayland";
-    # GDM_BACKEND = "nvidia-drm";
-    # __GLX_VENDOR_LIBRARY_NAME = "nvidia";
   };
 
   wayland.windowManager.hyprland.settings = {
+    monitor = [
+      "eDP-1, 1920x1200, 0x0, 1"
+      "DP-1, preferred, -320x-1200, 1"
+    ];
+
+    workspace = [
+      "1, monitor:DP-1"
+      "2, monitor:eDP-1"
+      "3, monitor:eDP-1"
+      "4, monitor:eDP-1"
+    ];
+
     windowrulev2 = [
       # ethui-dev
-      "workspace 2 silent, class:ethui"
-      "float, class:ethui"
-      "size 800 800, class:ethui"
-      "move 100%-800 100%-800, class:ethui"
-      "noinitialfocus, class:ethui"
+      # "workspace 2 silent, class:ethui"
+      # "float, class:ethui"
+      # "size 800 800, class:ethui"
+      # "move 100%-800 100%-800, class:ethui"
+      # "noinitialfocus, class:ethui"
     ];
 
     env = [
@@ -43,6 +52,33 @@
     ];
   };
 
+  programs.hyprpanel.layout = {
+    "bar.layouts" = {
+      "0" = {
+        "left" = [
+          "dashboard"
+          "workspaces"
+          "windowtitle"
+        ];
+        "middle" = [ "media" ];
+        "right" = [
+          "volume"
+          "network"
+          "power"
+          "bluetooth"
+          "systray"
+          "clock"
+          "notifications"
+        ];
+      };
+      "*" = {
+        "left" = [ ];
+        "middle" = [ ];
+        "right" = [ ];
+      };
+    };
+  };
+
   home = {
     username = lib.mkDefault "naps62";
     stateVersion = lib.mkDefault "24.05";
diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix
index e4ea8de..d354952 100644
--- a/home/common/programs/hyprland/default.nix
+++ b/home/common/programs/hyprland/default.nix
@@ -76,7 +76,7 @@ in
 
       "exec-once" = [
         "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
-        # "hyprpanel"
+        "hyprpanel"
         "nm-applet"
         "hyprsunset"
       ];
diff --git a/home/common/programs/hyprland/hyprpanel.nix b/home/common/programs/hyprland/hyprpanel.nix
index d6fd3a3..9c2e29e 100644
--- a/home/common/programs/hyprland/hyprpanel.nix
+++ b/home/common/programs/hyprland/hyprpanel.nix
@@ -1,50 +1,19 @@
 {
   inputs,
+  pkgs,
   ...
 }:
 
 {
   imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
 
+  home.packages = with pkgs; [ upower ];
+
   programs.hyprpanel = {
     enable = true;
     overlay.enable = true;
-    systemd.enable = true;
     overwrite.enable = true;
 
-    layout = {
-      bar = {
-        layouts = {
-          "1" = {
-            "left" = [
-              "dashboard"
-              "workspaces"
-              "windowtitle"
-            ];
-            "middle" = [ "media" ];
-            "right" = [
-              "volume"
-              "network"
-              "bluetooth"
-              "systray"
-              "clock"
-              "notifications"
-            ];
-          };
-          "0" = {
-            "left" = [ ];
-            "middle" = [ ];
-            "right" = [ ];
-          };
-          "2" = {
-            "left" = [ ];
-            "middle" = [ ];
-            "right" = [ ];
-          };
-        };
-      };
-    };
-
     settings = {
       theme.bar.transparent = true;
       theme.font = {
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index 82dcf45..a47a7d6 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -45,6 +45,32 @@
     ];
   };
 
+  programs.hyprpanel.layout = {
+    "bar.layouts" = {
+      "1" = {
+        "left" = [
+          "dashboard"
+          "workspaces"
+          "windowtitle"
+        ];
+        "middle" = [ "media" ];
+        "right" = [
+          "volume"
+          "network"
+          "bluetooth"
+          "systray"
+          "clock"
+          "notifications"
+        ];
+      };
+      "*" = {
+        "left" = [ ];
+        "middle" = [ ];
+        "right" = [ ];
+      };
+    };
+  };
+
   programs.kitty.settings.font_size = 12;
 
   home = {