gnomeExtensions: cleanup extension renames

1 files changed, 15 insertions, 13 deletions

diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix
index c7bc0b65ab443..265977ffb8043 100644
--- a/pkgs/desktops/gnome/extensions/extensionRenames.nix
+++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix
@@ -3,10 +3,21 @@
 # - Every item from ./collisions.json (for the respective Shell version) should have an entry in here
 # - Set the value to `null` for filtering (duplicate or unmaintained extensions)
 # - Sort the entries in order of appearance in the collisions.json
+# - Make a separate section for each GNOME version. Collisions will come back eventually
+#   as the extensions are updated.
 {
   "apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
   "Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
 
+  "floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
+  "floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";
+
+  # ############################################################################
+  # These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
+  # Make sure to move them up once they are updated
+
+  # ####### GNOME 40 #######
+
   "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
   "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
 
@@ -38,23 +49,14 @@
   "extension-list@tu.berry" = "extension-list";
   "screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug
 
-  "floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
-  "floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";
-
-  # ############################################################################
-  # These are conflicts for 3.38 extensions. They will very probably come back
-  # once more of them support 40.
+  # ####### GNOME 3.38 #######
 
   # See https://github.com/pbxqdown/gnome-shell-extension-transparent-window/issues/12#issuecomment-800765381
-  #"transparent-window@pbxqdown.github.com" = "transparent-window";
-  #"transparentwindows.mdirshad07" = null;
-
-  #"floatingDock@sun.wxg@gmail.com" = "floating-dock";
-  #"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock-2";
+  "transparent-window@pbxqdown.github.com" = "transparent-window";
+  "transparentwindows.mdirshad07" = null;
 
   # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612
-  #"flypie@schneegans.github.com" = null;
-
+  "flypie@schneegans.github.com" = null;
 
   # ############################################################################
   # Overrides for extensions that were manually packaged in the past but are gradually