From c40ef72059c98667001326f3a5c82d84ff2a7a52 Mon Sep 17 00:00:00 2001
From: Quantenzitrone <quantenzitrone@protonmail.com>
Date: Mon, 6 Nov 2023 00:32:00 +0100
Subject: [PATCH 1/2] polybar: 3.6.3 -> 3.7.0

---
 .../default.nix => by-name/po/polybar/package.nix} | 14 +++++++-------
 .../po}/polybar/remove-hardcoded-etc.diff          |  0
 pkgs/top-level/all-packages.nix                    |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{applications/misc/polybar/default.nix => by-name/po/polybar/package.nix} (92%)
 rename pkgs/{applications/misc => by-name/po}/polybar/remove-hardcoded-etc.diff (100%)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/by-name/po/polybar/package.nix
similarity index 92%
rename from pkgs/applications/misc/polybar/default.nix
rename to pkgs/by-name/po/polybar/package.nix
index 9ecced78440b..67b05b8f4b67 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -40,15 +40,15 @@
 , i3Support ? false
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "polybar";
-  version = "3.6.3";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE=";
+    owner = "polybar";
+    repo = "polybar";
+    rev = finalAttrs.version;
+    hash = "sha256-Z1rL9WvEZHr5M03s9KCJ6O6rNuaK7PpwUDaatYuCocI=";
     fetchSubmodules = true;
   };
 
@@ -113,4 +113,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ];
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff b/pkgs/by-name/po/polybar/remove-hardcoded-etc.diff
similarity index 100%
rename from pkgs/applications/misc/polybar/remove-hardcoded-etc.diff
rename to pkgs/by-name/po/polybar/remove-hardcoded-etc.diff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ea92e283ab6..cd481119ce92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34171,9 +34171,7 @@ with pkgs;
 
   pnglatex = with python3Packages; toPythonApplication pnglatex;
 
-  polybar = callPackage ../applications/misc/polybar { };
-
-  polybarFull = callPackage ../applications/misc/polybar {
+  polybarFull = polybar.override {
     alsaSupport = true;
     githubSupport = true;
     mpdSupport = true;

From 34cf3b7147b8810470e9b23434e323b1afd69626 Mon Sep 17 00:00:00 2001
From: Quantenzitrone <quantenzitrone@protonmail.com>
Date: Mon, 6 Nov 2023 00:46:01 +0100
Subject: [PATCH 2/2] maintainers: quantenzitrone github account rename

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f1310e137680..9dab464311ad 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14409,7 +14409,7 @@
   };
   quantenzitrone = {
     email = "quantenzitrone@protonmail.com";
-    github = "Quantenzitrone";
+    github = "quantenzitrone";
     githubId = 74491719;
     matrix = "@quantenzitrone:matrix.org";
     name = "quantenzitrone";