diff --git a/desktops/hyprland/waybar/gruvbox.nix b/desktops/hyprland/waybar/gruvbox.nix
new file mode 100644
index 00000000..9c335400
--- /dev/null
+++ b/desktops/hyprland/waybar/gruvbox.nix
@@ -0,0 +1,16 @@
+{...}: {
+    # Called from:  /hosts/${hostname}/desktops/hyprland-conf.nix
+    # https://yewtu.be/watch?v=tWQB1NDDA9c
+    # Waybar configuration
+    "~/.config/waybar/config.jsonc" = {
+      enable = true;
+      executable = false;
+      text = "";
+    }
+    # Waybar theming
+    "~/.config/waybar/style.css" = {
+      enable = true;
+      executable = false;
+      text = "";
+    };
+}
\ No newline at end of file
diff --git a/hosts/nixos-laptop/desktops/hyperland-conf.nix b/hosts/nixos-laptop/desktops/hyperland-conf.nix
index 5db7a92a..2064f6db 100644
--- a/hosts/nixos-laptop/desktops/hyperland-conf.nix
+++ b/hosts/nixos-laptop/desktops/hyperland-conf.nix
@@ -202,20 +202,7 @@
     
     # Waybar Configs:
     import = [
-      ./waybar/gruvbox.nix
+      ../../../desktops/hyprland/waybar/gruvbox.nix
     ];
-    # https://yewtu.be/watch?v=tWQB1NDDA9c
-    # Waybar configuration
-    "~/.config/waybar/config.jsonc" = {
-      enable = true;
-      executable = false;
-      text = "";
-    }
-    # Waybar theming
-    "~/.config/waybar/style.css" = {
-      enable = true;
-      executable = false;
-      text = "";
-    };
   }
 }
\ No newline at end of file