diff --git a/flake.nix b/flake.nix
index c04304fc..53ff3838 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,17 +25,13 @@
     ags.url = "github:Aylur/ags";
     ags.inputs.nixpkgs.follows = "nixpkgs";
 
-    # Hyprpanel
-    hyprpanel.url = "github:jas-singhfsu/hyprpanel";
-    hyprpanel.inputs.nixpkgs.follows = "nixpkgs";
-
     # Nix Package Search - nps
     nps.url = "github:OleMussmann/nps";
     nps.inputs.nixpkgs.follows = "nixpkgs";
 
     # Declarative Flatpak
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
-    nix-flatpak.inputs.nixpkgs.follows = "nixpkgs";
+    # nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this
 
     # Creates an environment containing required libraries for an executable
     nix-alien.url = "github:thiagokokada/nix-alien";
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 04a30102..d405b26b 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -23,6 +23,5 @@
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
     inputs.nixvim.homeManagerModules.nixvim
     inputs.ags.homeManagerModules.default
-    inputs.hyprpanel.homeManagerModules.hyprpanel
   ];
 }
diff --git a/home/modules/hyprpanel/default.nix b/home/modules/hyprpanel/default.nix
index eef61566..f650a4b9 100644
--- a/home/modules/hyprpanel/default.nix
+++ b/home/modules/hyprpanel/default.nix
@@ -13,15 +13,12 @@ in {
   config = lib.mkIf hyprpanel.enable {
     programs.hyprpanel = {
       enable = true;
-      overwrite.enable = true;
       systemd.enable = true;
 
-      # settings = {};
-
       # NOTE: Because the HM module sucks (mixes explicit options + JSON conversion), write everything as override...
       # HACK: Only override fully qualified quoted attributes to not override existing attrs with empty values
       #       https://github.com/Jas-SinghFSU/HyprPanel/issues/886
-      override = {
+      settings = {
         #
         # Bar Config
         #