diff --git a/nodes/hosts/common/home/jay/home.nix b/nodes/hosts/common/home/jay/home.nix
index ce81d5c..b57e046 100644
--- a/nodes/hosts/common/home/jay/home.nix
+++ b/nodes/hosts/common/home/jay/home.nix
@@ -13,6 +13,7 @@
     ./programs/git.nix
     ./programs/hyprland.nix
     ./programs/hyprlock.nix
+    ./programs/hyprpanel.nix
     ./programs/lazygit.nix
     ./programs/oh-my-posh.nix
     ./programs/rbw.nix
@@ -61,149 +62,5 @@
 
   # programs.starship.presets = [ "nerd-font-symbols" ];
 
-  programs.hyprpanel = {
-    enable = true;
-    overlay.enable = true;
-    hyprland.enable = true;
-    settings = {
-      layout = {
-        "bar.layouts" = {
-          "0" = {
-            left = [ "dashboard" "separator" "microphone" "volume" "bluetooth" "separator" "network" "separator" "workspaces" "windowtitle" ];
-            middle = [ "media" "cava" ];
-            right = [ "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "separator" "weather" "clock" ];
-          };
-        };
-      };
-
-      bar = {
-        customModules = {
-          cava = {
-            showIcon = false;
-          };
-          cpuTemp.sensor = "/sys/devices/pci0000\:00/0000\:00\:18.3/hwmon/hwmon2/temp3_input";
-          netstat.rateUnit = "MiB";
-          weather.unit = "metric";
-          updates = {
-            label = true;
-            autoHide = false;
-            padZero = true;
-            pollingInterval = 14400000;
-            updateCommand = "cd ~/nixos-config/ && nix flake update && nix build .#nixosConfigurations.nixos.config.system.build.toplevel && nvd diff /run/current-system ./result | grep -e '\[U' | wc -l";
-            icon = {
-              pending = "󰏗";
-              updated = "󰏖";
-            };
-          };
-        };
-
-        launcher.autoDetectIcon = true;
-        media = {
-          truncation = true;
-          truncation_size = 70;
-        };
-        workspaces = {
-          show_icons = true;
-          showApplicationIcons = true;
-          ignored = "-\\\\d+";
-        };
-        network = {
-          showWifiInfo = true;
-          truncation = false;
-          label = true;
-        };
-        windowtitle = {
-          class_name = false;
-          custom_title = false;
-          truncation = true;
-          truncation_size = 70;
-        };
-      };
-
-      #theme.name = "nord";
-      # Wipeout HD Theme
-      #theme.name = "catppuccin_latte";
-      # Wipeout HD Reverse Theme
-      theme.name = "nord";
-
-      menus.clock = {
-        time = {
-          military = true;
-          hideSeconds = true;
-        };
-        weather = {
-          location = "Montreal";
-          key = "0bec3053c1c64737a5b42727251005";
-          unit = "metric";
-        };
-      };
-
-      menus.dashboard = {
-        directories = {
-          enabled = true;
-          left = {
-            directory1.command = "bash -c \"xdg-open $HOME/downloads/\"";
-            directory2.command = "bash -c \"xdg-open $HOME/videos/\"";
-            directory3.command = "bash -c \"xdg-open $HOME/games/\"";
-            directory3.label = "  Games";
-          };
-          right = {
-            directory1.command = "bash -c \"xdg-open $HOME/documents/\"";
-            directory2.command = "bash -c \"xdg-open $HOME/pictures/\"";
-            directory3.command = "bash -c \"xdg-open $HOME/\"";
-          };
-        };
-        shortcuts = {
-          left = {
-            shortcut1 = {
-              command = "zen-twilight";
-              icon = "";
-              tooltip = "Zen Twilight";
-            };
-            shortcut2 = {
-              command = "steam --disable-gpu-compositing";
-              icon = "";
-              tooltip = "Steam";
-            };
-            shortcut3 = {
-              command = "vesktop";
-              tooltip = "Vesktop";
-            };
-          };
-
-          right = {
-            shortcut3.command = "hyprshot -zm region --clipboard-only";
-          };
-        };
-        stats.enable_gpu = true;
-        recording.path = "$HOME/Videos/recording";
-      };
-
-      menus.media = {
-        displayTime = true;
-        displayTimeTooltip = true;
-      };
-
-      theme = {
-        bar = {
-          transparent = true;
-          floating = false;
-        };
-        
-        font = {
-          size = "12px";
-          name = "BigBlueTermPlus Nerd Font";
-        };
-      };
-
-      wallpaper.enable = false;
-
-      #bar.workspaces.workspaceIconMap = {
-      #  "1" = "";
-      #  "3" = "󰙯";
-      #  "4" = "󰄛";
-      # };
-    };
-  };
 }
 
diff --git a/nodes/hosts/common/home/jay/programs/hyprpanel.nix b/nodes/hosts/common/home/jay/programs/hyprpanel.nix
new file mode 100644
index 0000000..1733889
--- /dev/null
+++ b/nodes/hosts/common/home/jay/programs/hyprpanel.nix
@@ -0,0 +1,147 @@
+{ pkgs, ...}: {
+  programs.hyprpanel = {
+    enable = true;
+    overlay.enable = true;
+    hyprland.enable = true;
+    settings = {
+      layout = {
+        "bar.layouts" = {
+          "0" = {
+            left = [ "dashboard" "separator" "microphone" "volume" "bluetooth" "separator" "network" "separator" "workspaces" "windowtitle" ];
+            middle = [ "media" "cava" ];
+            right = [ "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "separator" "weather" "clock" ];
+          };
+        };
+      };
+
+      bar = {
+        customModules = {
+          cava = {
+            showIcon = false;
+          };
+          cpuTemp.sensor = "/sys/devices/pci0000\:00/0000\:00\:18.3/hwmon/hwmon2/temp3_input";
+          netstat.rateUnit = "MiB";
+          weather.unit = "metric";
+          updates = {
+            label = true;
+            autoHide = false;
+            padZero = true;
+            pollingInterval = 14400000;
+            updateCommand = "cd ~/nixos-config/ && nix flake update && nix build .#nixosConfigurations.nixos.config.system.build.toplevel && nvd diff /run/current-system ./result | grep -e '\[U' | wc -l";
+            icon = {
+              pending = "󰏗";
+              updated = "󰏖";
+            };
+          };
+        };
+
+        launcher.autoDetectIcon = true;
+        media = {
+          truncation = true;
+          truncation_size = 70;
+        };
+        workspaces = {
+          show_icons = true;
+          showApplicationIcons = true;
+          ignored = "-\\\\d+";
+        };
+        network = {
+          showWifiInfo = true;
+          truncation = false;
+          label = true;
+        };
+        windowtitle = {
+          class_name = false;
+          custom_title = false;
+          truncation = true;
+          truncation_size = 70;
+        };
+      };
+
+      #theme.name = "nord";
+      # Wipeout HD Theme
+      #theme.name = "catppuccin_latte";
+      # Wipeout HD Reverse Theme
+      theme.name = "nord";
+
+      menus.clock = {
+        time = {
+          military = true;
+          hideSeconds = true;
+        };
+        weather = {
+          location = "Montreal";
+          key = "0bec3053c1c64737a5b42727251005";
+          unit = "metric";
+        };
+      };
+
+      menus.dashboard = {
+        directories = {
+          enabled = true;
+          left = {
+            directory1.command = "bash -c \"xdg-open $HOME/downloads/\"";
+            directory2.command = "bash -c \"xdg-open $HOME/videos/\"";
+            directory3.command = "bash -c \"xdg-open $HOME/games/\"";
+            directory3.label = "  Games";
+          };
+          right = {
+            directory1.command = "bash -c \"xdg-open $HOME/documents/\"";
+            directory2.command = "bash -c \"xdg-open $HOME/pictures/\"";
+            directory3.command = "bash -c \"xdg-open $HOME/\"";
+          };
+        };
+        shortcuts = {
+          left = {
+            shortcut1 = {
+              command = "zen-twilight";
+              icon = "";
+              tooltip = "Zen Twilight";
+            };
+            shortcut2 = {
+              command = "steam --disable-gpu-compositing";
+              icon = "";
+              tooltip = "Steam";
+            };
+            shortcut3 = {
+              command = "vesktop";
+              tooltip = "Vesktop";
+            };
+          };
+
+          right = {
+            shortcut3.command = "hyprshot -zm region --clipboard-only";
+          };
+        };
+        stats.enable_gpu = true;
+        recording.path = "$HOME/Videos/recording";
+      };
+
+      menus.media = {
+        displayTime = true;
+        displayTimeTooltip = true;
+      };
+
+      theme = {
+        bar = {
+          transparent = true;
+          floating = false;
+        };
+
+        font = {
+          size = "12px";
+          name = "BigBlueTermPlus Nerd Font";
+        };
+      };
+
+      wallpaper.enable = false;
+
+      #bar.workspaces.workspaceIconMap = {
+      #  "1" = "";
+      #  "3" = "󰙯";
+      #  "4" = "󰄛";
+      # };
+    };
+  };
+}
+