From 7e150e2e4386cbf8bab296149b0a8e948615d1db Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:39:17 -0400
Subject: [PATCH 01/37] budgie{,Plugins}: format with nixfmt

---
 .../budgie/budgie-backgrounds/default.nix     |  15 +-
 .../budgie/budgie-control-center/default.nix  | 144 +++++++++---------
 .../budgie/budgie-desktop-view/default.nix    |  25 +--
 .../budgie/budgie-desktop/default.nix         |  87 +++++------
 .../budgie/budgie-desktop/wrapper.nix         |  19 ++-
 .../budgie-gsettings-overrides/default.nix    |  58 +++----
 .../budgie/budgie-screensaver/default.nix     |  35 ++---
 .../budgie/budgie-session/default.nix         |  55 +++----
 pkgs/desktops/budgie/default.nix              |  30 ++--
 pkgs/desktops/budgie/magpie/default.nix       |  97 ++++++------
 .../budgie-analogue-clock-applet/default.nix  |  21 +--
 .../budgie-media-player-applet/default.nix    |  15 +-
 .../budgie-user-indicator-redux/default.nix   |  29 ++--
 pkgs/desktops/budgie/plugins/default.nix      |   3 +-
 14 files changed, 330 insertions(+), 303 deletions(-)

diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix
index f46a330247d6..3421da2e1212 100644
--- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix
+++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, imagemagick
-, jhead
-, meson
-, ninja
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  imagemagick,
+  jhead,
+  meson,
+  ninja,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix
index 1964b0ce5230..f9629021dee7 100644
--- a/pkgs/desktops/budgie/budgie-control-center/default.nix
+++ b/pkgs/desktops/budgie/budgie-control-center/default.nix
@@ -1,62 +1,63 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, substituteAll
-, accountsservice
-, adwaita-icon-theme
-, budgie-desktop
-, cheese
-, clutter
-, clutter-gtk
-, colord
-, colord-gtk
-, cups
-, docbook-xsl-nons
-, fontconfig
-, gcr
-, gdk-pixbuf
-, gettext
-, glib
-, glib-networking
-, glibc
-, gnome
-, gnome-desktop
-, gnome-user-share
-, gsettings-desktop-schemas
-, gsound
-, gtk3
-, ibus
-, libcanberra-gtk3
-, libepoxy
-, libgnomekbd
-, libgtop
-, libgudev
-, libhandy
-, libkrb5
-, libnma
-, libpulseaudio
-, libpwquality
-, librsvg
-, libsecret
-, libwacom
-, libxml2
-, libxslt
-, meson
-, modemmanager
-, networkmanager
-, networkmanagerapplet
-, ninja
-, pkg-config
-, polkit
-, samba
-, shadow
-, shared-mime-info
-, tzdata
-, udisks2
-, upower
-, webp-pixbuf-loader
-, wrapGAppsHook3
-, enableSshSocket ? false
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  substituteAll,
+  accountsservice,
+  adwaita-icon-theme,
+  budgie-desktop,
+  cheese,
+  clutter,
+  clutter-gtk,
+  colord,
+  colord-gtk,
+  cups,
+  docbook-xsl-nons,
+  fontconfig,
+  gcr,
+  gdk-pixbuf,
+  gettext,
+  glib,
+  glib-networking,
+  glibc,
+  gnome,
+  gnome-desktop,
+  gnome-user-share,
+  gsettings-desktop-schemas,
+  gsound,
+  gtk3,
+  ibus,
+  libcanberra-gtk3,
+  libepoxy,
+  libgnomekbd,
+  libgtop,
+  libgudev,
+  libhandy,
+  libkrb5,
+  libnma,
+  libpulseaudio,
+  libpwquality,
+  librsvg,
+  libsecret,
+  libwacom,
+  libxml2,
+  libxslt,
+  meson,
+  modemmanager,
+  networkmanager,
+  networkmanagerapplet,
+  ninja,
+  pkg-config,
+  polkit,
+  samba,
+  shadow,
+  shared-mime-info,
+  tzdata,
+  udisks2,
+  upower,
+  webp-pixbuf-loader,
+  wrapGAppsHook3,
+  enableSshSocket ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -76,7 +77,12 @@ stdenv.mkDerivation (finalAttrs: {
       src = ./paths.patch;
       budgie_desktop = budgie-desktop;
       gcm = gnome.gnome-color-manager;
-      inherit cups glibc libgnomekbd shadow;
+      inherit
+        cups
+        glibc
+        libgnomekbd
+        shadow
+        ;
       inherit networkmanagerapplet tzdata;
     })
   ];
@@ -136,9 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
     upower
   ];
 
-  mesonFlags = [
-    (lib.mesonBool "ssh" enableSshSocket)
-  ];
+  mesonFlags = [ (lib.mesonBool "ssh" enableSshSocket) ];
 
   preConfigure = ''
     # For ITS rules
@@ -148,12 +152,14 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     # Pull in WebP support for gnome-backgrounds.
     # In postInstall to run before gappsWrapperArgsHook.
-    export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
-      extraLoaders = [
-        librsvg
-        webp-pixbuf-loader
-      ];
-    }}"
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          librsvg
+          webp-pixbuf-loader
+        ];
+      }
+    }"
   '';
 
   preFixup = ''
diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/desktops/budgie/budgie-desktop-view/default.nix
index d2653e775d6c..4c822e94e2f2 100644
--- a/pkgs/desktops/budgie/budgie-desktop-view/default.nix
+++ b/pkgs/desktops/budgie/budgie-desktop-view/default.nix
@@ -1,15 +1,16 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, desktop-file-utils
-, glib
-, gtk3
-, intltool
-, meson
-, ninja
-, pkg-config
-, vala
-, wrapGAppsHook3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  desktop-file-utils,
+  glib,
+  gtk3,
+  intltool,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  wrapGAppsHook3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix
index 4dc5be53260e..4687c52e4f9b 100644
--- a/pkgs/desktops/budgie/budgie-desktop/default.nix
+++ b/pkgs/desktops/budgie/budgie-desktop/default.nix
@@ -1,39 +1,40 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, accountsservice
-, alsa-lib
-, budgie-screensaver
-, docbook-xsl-nons
-, glib
-, gnome
-, gnome-desktop
-, graphene
-, gst_all_1
-, gtk-doc
-, gtk3
-, ibus
-, intltool
-, libcanberra-gtk3
-, libgee
-, libGL
-, libnotify
-, libpeas
-, libpulseaudio
-, libuuid
-, libwnck
-, magpie
-, mesa
-, meson
-, ninja
-, pkg-config
-, polkit
-, sassc
-, upower
-, vala
-, xfce
-, wrapGAppsHook3
-, zenity
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  accountsservice,
+  alsa-lib,
+  budgie-screensaver,
+  docbook-xsl-nons,
+  glib,
+  gnome,
+  gnome-desktop,
+  graphene,
+  gst_all_1,
+  gtk-doc,
+  gtk3,
+  ibus,
+  intltool,
+  libcanberra-gtk3,
+  libgee,
+  libGL,
+  libnotify,
+  libpeas,
+  libpulseaudio,
+  libuuid,
+  libwnck,
+  magpie,
+  mesa,
+  meson,
+  ninja,
+  pkg-config,
+  polkit,
+  sassc,
+  upower,
+  vala,
+  xfce,
+  wrapGAppsHook3,
+  zenity,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,9 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo=";
   };
 
-  patches = [
-    ./plugins.patch
-  ];
+  patches = [ ./plugins.patch ];
 
   nativeBuildInputs = [
     docbook-xsl-nons
@@ -97,14 +96,16 @@ stdenv.mkDerivation (finalAttrs: {
     libpeas
   ];
 
-  passthru.providedSessions = [
-    "budgie-desktop"
-  ];
+  passthru.providedSessions = [ "budgie-desktop" ];
 
   meta = {
     description = "Feature-rich, modern desktop designed to keep out the way of the user";
     homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop";
-    license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ];
+    license = with lib.licenses; [
+      gpl2Plus
+      lgpl21Plus
+      cc-by-sa-30
+    ];
     platforms = lib.platforms.linux;
     maintainers = lib.teams.budgie.members;
   };
diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix
index d25643e6603f..409884134434 100644
--- a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix
+++ b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, glib
-, xorg
-, wrapGAppsHook3
-, budgie-desktop
-, plugins ? [ ]
+{
+  lib,
+  stdenv,
+  glib,
+  xorg,
+  wrapGAppsHook3,
+  budgie-desktop,
+  plugins ? [ ],
 }:
 
 stdenv.mkDerivation {
@@ -13,9 +14,7 @@ stdenv.mkDerivation {
 
   src = null;
 
-  paths = [
-    budgie-desktop
-  ] ++ plugins;
+  paths = [ budgie-desktop ] ++ plugins;
 
   passAsFile = [ "paths" ];
 
diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
index a9f427450883..f45a033a8732 100644
--- a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
+++ b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
@@ -1,15 +1,16 @@
-{ lib
-, runCommand
-, budgie-desktop
-, budgie-desktop-view
-, glib
-, gsettings-desktop-schemas
-, gnome
-, nixos-artwork
-, nixos-background-light ? nixos-artwork.wallpapers.nineish
-, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray
-, extraGSettingsOverrides ? ""
-, extraGSettingsOverridePackages ? []
+{
+  lib,
+  runCommand,
+  budgie-desktop,
+  budgie-desktop-view,
+  glib,
+  gsettings-desktop-schemas,
+  gnome,
+  nixos-artwork,
+  nixos-background-light ? nixos-artwork.wallpapers.nineish,
+  nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray,
+  extraGSettingsOverrides ? "",
+  extraGSettingsOverridePackages ? [ ],
 }:
 
 let
@@ -55,24 +56,27 @@ let
   '';
 
   gsettingsOverridePackages = [
-      budgie-desktop
-      budgie-desktop-view
-      gsettings-desktop-schemas
-      gnome.mutter
+    budgie-desktop
+    budgie-desktop-view
+    gsettings-desktop-schemas
+    gnome.mutter
   ] ++ extraGSettingsOverridePackages;
 
 in
-  runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } ''
-    data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"
-    schema_dir="$data_dir/glib-2.0/schemas"
-    mkdir -p "$schema_dir"
+runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } ''
+  data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"
+  schema_dir="$data_dir/glib-2.0/schemas"
+  mkdir -p "$schema_dir"
 
-    ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages}
+  ${concatMapStringsSep "\n" (
+    pkg:
+    "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\""
+  ) gsettingsOverridePackages}
 
-    chmod -R a+w "$data_dir"
-    cat - > "$schema_dir/zz-nixos-defaults.gschema.override" <<- EOF
-    ${gsettingsOverrides}
-    EOF
+  chmod -R a+w "$data_dir"
+  cat - > "$schema_dir/zz-nixos-defaults.gschema.override" <<- EOF
+  ${gsettingsOverrides}
+  EOF
 
-    ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"
-  ''
+  ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"
+''
diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix
index 55b4be851642..dc1ad85634c9 100644
--- a/pkgs/desktops/budgie/budgie-screensaver/default.nix
+++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix
@@ -1,20 +1,21 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, dbus-glib
-, glib
-, gnome-desktop
-, gtk3
-, intltool
-, libgnomekbd
-, libX11
-, linux-pam
-, meson
-, ninja
-, pkg-config
-, systemd
-, wrapGAppsHook3
-, xorg
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  dbus-glib,
+  glib,
+  gnome-desktop,
+  gtk3,
+  intltool,
+  libgnomekbd,
+  libX11,
+  linux-pam,
+  meson,
+  ninja,
+  pkg-config,
+  systemd,
+  wrapGAppsHook3,
+  xorg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix
index 3815af26c21d..1bd9c3e58b75 100644
--- a/pkgs/desktops/budgie/budgie-session/default.nix
+++ b/pkgs/desktops/budgie/budgie-session/default.nix
@@ -1,30 +1,31 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, substituteAll
-, meson
-, ninja
-, pkg-config
-, gnome
-, adwaita-icon-theme
-, glib
-, gtk3
-, gsettings-desktop-schemas
-, gnome-desktop
-, dbus
-, json-glib
-, libICE
-, xmlto
-, docbook_xsl
-, docbook_xml_dtd_412
-, python3
-, libxslt
-, gettext
-, makeWrapper
-, systemd
-, xorg
-, libepoxy
-, bash
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  substituteAll,
+  meson,
+  ninja,
+  pkg-config,
+  gnome,
+  adwaita-icon-theme,
+  glib,
+  gtk3,
+  gsettings-desktop-schemas,
+  gnome-desktop,
+  dbus,
+  json-glib,
+  libICE,
+  xmlto,
+  docbook_xsl,
+  docbook_xml_dtd_412,
+  python3,
+  libxslt,
+  gettext,
+  makeWrapper,
+  systemd,
+  xorg,
+  libepoxy,
+  bash,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index 52f47d00bdeb..ad3879038e4c 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -1,15 +1,19 @@
 { lib, newScope }:
 
-lib.makeScope newScope (self: let
-  inherit (self) callPackage;
-in {
-  budgie-backgrounds = callPackage ./budgie-backgrounds { };
-  budgie-control-center = callPackage ./budgie-control-center { };
-  budgie-desktop = callPackage ./budgie-desktop { };
-  budgie-desktop-view = callPackage ./budgie-desktop-view { };
-  budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
-  budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
-  budgie-screensaver = callPackage ./budgie-screensaver { };
-  budgie-session = callPackage ./budgie-session { };
-  magpie = callPackage ./magpie { };
-})
+lib.makeScope newScope (
+  self:
+  let
+    inherit (self) callPackage;
+  in
+  {
+    budgie-backgrounds = callPackage ./budgie-backgrounds { };
+    budgie-control-center = callPackage ./budgie-control-center { };
+    budgie-desktop = callPackage ./budgie-desktop { };
+    budgie-desktop-view = callPackage ./budgie-desktop-view { };
+    budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
+    budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
+    budgie-screensaver = callPackage ./budgie-screensaver { };
+    budgie-session = callPackage ./budgie-session { };
+    magpie = callPackage ./magpie { };
+  }
+)
diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix
index 5f42b1986ce6..fa234e668872 100644
--- a/pkgs/desktops/budgie/magpie/default.nix
+++ b/pkgs/desktops/budgie/magpie/default.nix
@@ -1,54 +1,59 @@
-{ fetchFromGitHub
-, runCommand
-, lib
-, fetchpatch
-, stdenv
-, pkg-config
-, gnome
-, gettext
-, gobject-introspection
-, cairo
-, colord
-, lcms2
-, pango
-, json-glib
-, libstartup_notification
-, libcanberra
-, ninja
-, xvfb-run
-, xkeyboard_config
-, libxcvt
-, libxkbfile
-, libXdamage
-, libxkbcommon
-, libXtst
-, libinput
-, libdrm
-, gsettings-desktop-schemas
-, glib
-, gtk3
-, gnome-desktop
-, pipewire
-, libgudev
-, libwacom
-, mesa
-, meson
-, xorgserver
-, python3
-, wrapGAppsHook3
-, gi-docgen
-, sysprof
-, libsysprof-capture
-, desktop-file-utils
-, libcap_ng
-, graphene
+{
+  fetchFromGitHub,
+  runCommand,
+  lib,
+  fetchpatch,
+  stdenv,
+  pkg-config,
+  gnome,
+  gettext,
+  gobject-introspection,
+  cairo,
+  colord,
+  lcms2,
+  pango,
+  json-glib,
+  libstartup_notification,
+  libcanberra,
+  ninja,
+  xvfb-run,
+  xkeyboard_config,
+  libxcvt,
+  libxkbfile,
+  libXdamage,
+  libxkbcommon,
+  libXtst,
+  libinput,
+  libdrm,
+  gsettings-desktop-schemas,
+  glib,
+  gtk3,
+  gnome-desktop,
+  pipewire,
+  libgudev,
+  libwacom,
+  mesa,
+  meson,
+  xorgserver,
+  python3,
+  wrapGAppsHook3,
+  gi-docgen,
+  sysprof,
+  libsysprof-capture,
+  desktop-file-utils,
+  libcap_ng,
+  graphene,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "magpie";
   version = "0.9.3";
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
 
   src = fetchFromGitHub {
     owner = "BuddiesOfBudgie";
@@ -146,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
     libdir = "${finalAttrs.finalPackage}/lib/magpie-0";
 
     tests = {
-      libdirExists = runCommand "magpie-libdir-exists" {} ''
+      libdirExists = runCommand "magpie-libdir-exists" { } ''
         if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
           echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one."
           exit 1
diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
index 3792a19f99e9..501a009700ee 100644
--- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
+++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, vala
-, budgie
-, gtk3
-, libpeas
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  budgie,
+  gtk3,
+  libpeas,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix
index 38b3888c74f6..37e2429ac2c7 100644
--- a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix
+++ b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, glib
-, meson
-, ninja
-, python3Packages
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  glib,
+  meson,
+  ninja,
+  python3Packages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
index 273f87d51dbd..5839f511e9b6 100644
--- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
+++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
@@ -1,17 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, accountsservice
-, budgie
-, gtk3
-, intltool
-, libgee
-, libpeas
-, meson
-, ninja
-, pkg-config
-, sassc
-, vala
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  accountsservice,
+  budgie,
+  gtk3,
+  intltool,
+  libgee,
+  libpeas,
+  meson,
+  ninja,
+  pkg-config,
+  sassc,
+  vala,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix
index 1958a8ef9ea2..ad9da6bb4b85 100644
--- a/pkgs/desktops/budgie/plugins/default.nix
+++ b/pkgs/desktops/budgie/plugins/default.nix
@@ -1,4 +1,5 @@
-{ callPackage }: {
+{ callPackage }:
+{
   budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
   budgie-media-player-applet = callPackage ./budgie-media-player-applet { };
   budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };

From ba97c97f321f0f7f0ea8d51f180dd6d1bd026309 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:41:13 -0400
Subject: [PATCH 02/37] budgie-backgrounds: move from budgie scope to top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix          | 2 +-
 .../default.nix => by-name/bu/budgie-backgrounds/package.nix}   | 0
 pkgs/desktops/budgie/default.nix                                | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{desktops/budgie/budgie-backgrounds/default.nix => by-name/bu/budgie-backgrounds/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 7f43a939970b..79df6b044a6a 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -121,7 +121,7 @@ in {
     environment.systemPackages = with pkgs;
       [
         # Budgie Desktop.
-        budgie.budgie-backgrounds
+        budgie-backgrounds
         budgie-control-center
         (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
         budgie.budgie-desktop-view
diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/by-name/bu/budgie-backgrounds/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/budgie-backgrounds/default.nix
rename to pkgs/by-name/bu/budgie-backgrounds/package.nix
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index ad3879038e4c..729051251727 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -6,7 +6,6 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-backgrounds = callPackage ./budgie-backgrounds { };
     budgie-control-center = callPackage ./budgie-control-center { };
     budgie-desktop = callPackage ./budgie-desktop { };
     budgie-desktop-view = callPackage ./budgie-desktop-view { };

From 4c87e35ad2a05bd2f221b4201e849a0f2f706a02 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:23:00 -0400
Subject: [PATCH 03/37] budgie-backgrounds: modernize

---
 pkgs/by-name/bu/budgie-backgrounds/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/budgie-backgrounds/package.nix b/pkgs/by-name/bu/budgie-backgrounds/package.nix
index 3421da2e1212..576f600fe731 100644
--- a/pkgs/by-name/bu/budgie-backgrounds/package.nix
+++ b/pkgs/by-name/bu/budgie-backgrounds/package.nix
@@ -6,6 +6,7 @@
   jhead,
   meson,
   ninja,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,11 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Default background set for the Budgie Desktop";
     homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds";
-    platforms = lib.platforms.linux;
-    maintainers = lib.teams.budgie.members;
+    changelog = "https://github.com/BuddiesOfBudgie/budgie-backgrounds/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.cc0;
+    maintainers = lib.teams.budgie.members;
+    platforms = lib.platforms.linux;
   };
 })

From 96bab1b8b0a81f41ef0e85509a5c31e5f6d98e67 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:42:48 -0400
Subject: [PATCH 04/37] budgie-control-center: move from budgie scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix      | 6 +++---
 .../bu/budgie-control-center/package.nix}                   | 6 +++---
 .../budgie => by-name/bu}/budgie-control-center/paths.patch | 0
 pkgs/desktops/budgie/default.nix                            | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{desktops/budgie/budgie-control-center/default.nix => by-name/bu/budgie-control-center/package.nix} (96%)
 rename pkgs/{desktops/budgie => by-name/bu}/budgie-control-center/paths.patch (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 79df6b044a6a..c4fcf1612846 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -40,7 +40,7 @@ let
     destination = "/share/gnome-background-properties/nixos.xml";
   };
 
-  budgie-control-center = pkgs.budgie.budgie-control-center.override {
+  budgie-control-center' = pkgs.budgie-control-center.override {
     enableSshSocket = config.services.openssh.startWhenNeeded;
   };
 
@@ -122,7 +122,7 @@ in {
       [
         # Budgie Desktop.
         budgie-backgrounds
-        budgie-control-center
+        budgie-control-center'
         (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
         budgie.budgie-desktop-view
         budgie.budgie-screensaver
@@ -243,7 +243,7 @@ in {
 
     # Register packages for DBus.
     services.dbus.packages = [
-      budgie-control-center
+      budgie-control-center'
     ];
 
     # Register packages for udev.
diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
similarity index 96%
rename from pkgs/desktops/budgie/budgie-control-center/default.nix
rename to pkgs/by-name/bu/budgie-control-center/package.nix
index f9629021dee7..f4e0e583aaff 100644
--- a/pkgs/desktops/budgie/budgie-control-center/default.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -5,7 +5,7 @@
   substituteAll,
   accountsservice,
   adwaita-icon-theme,
-  budgie-desktop,
+  budgie,
   cheese,
   clutter,
   clutter-gtk,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     (substituteAll {
       src = ./paths.patch;
-      budgie_desktop = budgie-desktop;
+      budgie_desktop = budgie.budgie-desktop;
       gcm = gnome.gnome-color-manager;
       inherit
         cups
@@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       # Sound theme
-      --prefix XDG_DATA_DIRS : "${budgie-desktop}/share"
+      --prefix XDG_DATA_DIRS : "${budgie.budgie-desktop}/share"
       # Thumbnailers (for setting user profile pictures)
       --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
diff --git a/pkgs/desktops/budgie/budgie-control-center/paths.patch b/pkgs/by-name/bu/budgie-control-center/paths.patch
similarity index 100%
rename from pkgs/desktops/budgie/budgie-control-center/paths.patch
rename to pkgs/by-name/bu/budgie-control-center/paths.patch
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index 729051251727..09f4564bec5d 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -6,7 +6,6 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-control-center = callPackage ./budgie-control-center { };
     budgie-desktop = callPackage ./budgie-desktop { };
     budgie-desktop-view = callPackage ./budgie-desktop-view { };
     budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };

From c4212408fa1ace475775cf374ab988b952173ff3 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:52:46 -0400
Subject: [PATCH 05/37] budgie-control-center: modernize

---
 pkgs/by-name/bu/budgie-control-center/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index f4e0e583aaff..10a7da2fdb3a 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -47,6 +47,7 @@
   networkmanager,
   networkmanagerapplet,
   ninja,
+  nix-update-script,
   pkg-config,
   polkit,
   samba,
@@ -176,12 +177,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   separateDebugInfo = true;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Fork of GNOME Control Center for the Budgie 10 Series";
     homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center";
+    changelog = "https://github.com/BuddiesOfBudgie/budgie-control-center/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = lib.teams.budgie.members;
     mainProgram = "budgie-control-center";
     platforms = lib.platforms.linux;
-    maintainers = lib.teams.budgie.members;
-    license = lib.licenses.gpl2Plus;
   };
 })

From e24214811979bc573cc1d457596835f0ccbd8940 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:53:19 -0400
Subject: [PATCH 06/37] budgie-control-center: add version test

---
 pkgs/by-name/bu/budgie-control-center/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 10a7da2fdb3a..10d29b162731 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -53,6 +53,7 @@
   samba,
   shadow,
   shared-mime-info,
+  testers,
   tzdata,
   udisks2,
   upower,
@@ -178,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: {
   separateDebugInfo = true;
 
   passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
     updateScript = nix-update-script { };
   };
 

From 417179abbdfec986f31b712d64988818bc91176e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:50:03 -0400
Subject: [PATCH 07/37] budgie-desktop{,with-plugins}: move from budgie scope
 to top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix     | 6 +++---
 nixos/tests/budgie.nix                                     | 2 +-
 pkgs/by-name/bu/budgie-control-center/package.nix          | 6 +++---
 .../bu/budgie-desktop-with-plugins/package.nix}            | 0
 .../default.nix => by-name/bu/budgie-desktop/package.nix}  | 7 +++----
 .../budgie => by-name/bu}/budgie-desktop/plugins.patch     | 0
 pkgs/desktops/budgie/default.nix                           | 2 --
 .../plugins/budgie-analogue-clock-applet/default.nix       | 4 ++--
 .../budgie/plugins/budgie-user-indicator-redux/default.nix | 4 ++--
 9 files changed, 14 insertions(+), 17 deletions(-)
 rename pkgs/{desktops/budgie/budgie-desktop/wrapper.nix => by-name/bu/budgie-desktop-with-plugins/package.nix} (100%)
 rename pkgs/{desktops/budgie/budgie-desktop/default.nix => by-name/bu/budgie-desktop/package.nix} (96%)
 rename pkgs/{desktops/budgie => by-name/bu}/budgie-desktop/plugins.patch (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index c4fcf1612846..777ae096fc81 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -94,7 +94,7 @@ in {
 
   config = mkIf cfg.enable {
     services.displayManager.sessionPackages = with pkgs; [
-      budgie.budgie-desktop
+      budgie-desktop
     ];
 
     services.xserver.displayManager.lightdm.greeters.slick = {
@@ -123,7 +123,7 @@ in {
         # Budgie Desktop.
         budgie-backgrounds
         budgie-control-center'
-        (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
+        (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
         budgie.budgie-desktop-view
         budgie.budgie-screensaver
         budgie.budgie-session
@@ -210,7 +210,7 @@ in {
     xdg.portal.extraPortals = with pkgs; [
       xdg-desktop-portal-gtk # provides a XDG Portals implementation.
     ];
-    xdg.portal.configPackages = mkDefault [ pkgs.budgie.budgie-desktop ];
+    xdg.portal.configPackages = mkDefault [ pkgs.budgie-desktop ];
 
     services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel.
     services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel.
diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix
index 203e718c8c6d..f9d873af95e3 100644
--- a/nixos/tests/budgie.nix
+++ b/nixos/tests/budgie.nix
@@ -63,7 +63,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
       with subtest("Check if various environment variables are set"):
           cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"
           machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
-          machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie.budgie-desktop-with-plugins.pname}'")
+          machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")
 
       with subtest("Open run dialog"):
           machine.send_key("alt-f2")
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 10d29b162731..65feaa196b9b 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -5,7 +5,7 @@
   substituteAll,
   accountsservice,
   adwaita-icon-theme,
-  budgie,
+  budgie-desktop,
   cheese,
   clutter,
   clutter-gtk,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     (substituteAll {
       src = ./paths.patch;
-      budgie_desktop = budgie.budgie-desktop;
+      budgie_desktop = budgie-desktop;
       gcm = gnome.gnome-color-manager;
       inherit
         cups
@@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       # Sound theme
-      --prefix XDG_DATA_DIRS : "${budgie.budgie-desktop}/share"
+      --prefix XDG_DATA_DIRS : "${budgie-desktop}/share"
       # Thumbnailers (for setting user profile pictures)
       --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/budgie-desktop/wrapper.nix
rename to pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix
diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
similarity index 96%
rename from pkgs/desktops/budgie/budgie-desktop/default.nix
rename to pkgs/by-name/bu/budgie-desktop/package.nix
index 4687c52e4f9b..34253793db2c 100644
--- a/pkgs/desktops/budgie/budgie-desktop/default.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   accountsservice,
   alsa-lib,
-  budgie-screensaver,
+  budgie,
   docbook-xsl-nons,
   glib,
   gnome,
@@ -23,7 +23,6 @@
   libpulseaudio,
   libuuid,
   libwnck,
-  magpie,
   mesa,
   meson,
   ninja,
@@ -65,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     accountsservice
     alsa-lib
-    budgie-screensaver
+    budgie.budgie-screensaver
     glib
     gnome-desktop
     gnome.gnome-settings-daemon
@@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libuuid
     libwnck
-    magpie
+    budgie.magpie
     mesa
     polkit
     sassc
diff --git a/pkgs/desktops/budgie/budgie-desktop/plugins.patch b/pkgs/by-name/bu/budgie-desktop/plugins.patch
similarity index 100%
rename from pkgs/desktops/budgie/budgie-desktop/plugins.patch
rename to pkgs/by-name/bu/budgie-desktop/plugins.patch
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index 09f4564bec5d..033db368e653 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -6,9 +6,7 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-desktop = callPackage ./budgie-desktop { };
     budgie-desktop-view = callPackage ./budgie-desktop-view { };
-    budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
     budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
     budgie-screensaver = callPackage ./budgie-screensaver { };
     budgie-session = callPackage ./budgie-session { };
diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
index 501a009700ee..873ee28d4e86 100644
--- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
+++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
@@ -6,7 +6,7 @@
   ninja,
   pkg-config,
   vala,
-  budgie,
+  budgie-desktop,
   gtk3,
   libpeas,
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    budgie.budgie-desktop
+    budgie-desktop
     gtk3
     libpeas
   ];
diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
index 5839f511e9b6..ddd0f45a34b5 100644
--- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
+++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   accountsservice,
-  budgie,
+  budgie-desktop,
   gtk3,
   intltool,
   libgee,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     accountsservice
-    budgie.budgie-desktop
+    budgie-desktop
     gtk3
     libgee
     libpeas

From 02cd3e363283c2d7afbf052ce4dab456dba68003 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:25:09 -0400
Subject: [PATCH 08/37] budgie-desktop: split outputs

---
 pkgs/by-name/bu/budgie-desktop/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 34253793db2c..a592608c5361 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -48,6 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo=";
   };
 
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
   patches = [ ./plugins.patch ];
 
   nativeBuildInputs = [

From 5aa2e5ce36148051053406ce839a213db30240b8 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:58:49 -0400
Subject: [PATCH 09/37] budgie-desktop: modernize

---
 pkgs/by-name/bu/budgie-desktop/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index a592608c5361..08d7c2b6ccf6 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -26,6 +26,7 @@
   mesa,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   polkit,
   sassc,
@@ -101,17 +102,21 @@ stdenv.mkDerivation (finalAttrs: {
     libpeas
   ];
 
-  passthru.providedSessions = [ "budgie-desktop" ];
+  passthru = {
+    providedSessions = [ "budgie-desktop" ];
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Feature-rich, modern desktop designed to keep out the way of the user";
     homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop";
+    changelog = "https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       gpl2Plus
       lgpl21Plus
       cc-by-sa-30
     ];
-    platforms = lib.platforms.linux;
     maintainers = lib.teams.budgie.members;
+    platforms = lib.platforms.linux;
   };
 })

From cbd92467d44cfd6feee3e3ee6e7c309194d73207 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 18:59:26 -0400
Subject: [PATCH 10/37] budgie-desktop: add validatePkgConfig hook

---
 pkgs/by-name/bu/budgie-desktop/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 08d7c2b6ccf6..7beb813fa79e 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -32,6 +32,7 @@
   sassc,
   upower,
   vala,
+  validatePkgConfig,
   xfce,
   wrapGAppsHook3,
   zenity,
@@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     vala
+    validatePkgConfig
     wrapGAppsHook3
   ];
 

From 94b69c9c465fb32c55cbfd48350b2659abfa100f Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:00:27 -0400
Subject: [PATCH 11/37] budgie-desktop: add pkg-config test

---
 pkgs/by-name/bu/budgie-desktop/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 7beb813fa79e..4970b6faa963 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -30,6 +30,7 @@
   pkg-config,
   polkit,
   sassc,
+  testers,
   upower,
   vala,
   validatePkgConfig,
@@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     providedSessions = [ "budgie-desktop" ];
+    tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     updateScript = nix-update-script { };
   };
 
@@ -120,5 +122,10 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = lib.teams.budgie.members;
     platforms = lib.platforms.linux;
+    pkgConfigModules = [
+      "budgie-1.0"
+      "budgie-raven-plugin-1.0"
+      "budgie-theme-1.0"
+    ];
   };
 })

From a3881259e9d1e338bf3decadd6155077a8cb5576 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:01:47 -0400
Subject: [PATCH 12/37] budgie-desktop-with-plugins: fix meta info

This fixes attributes such as `meta.position`
---
 .../bu/budgie-desktop-with-plugins/package.nix        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix
index 409884134434..2e09fcf99e41 100644
--- a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix
@@ -48,5 +48,14 @@ stdenv.mkDerivation {
     )
   '';
 
-  inherit (budgie-desktop) meta;
+  meta = {
+    inherit (budgie-desktop.meta)
+      description
+      homepage
+      changelog
+      license
+      maintainers
+      platforms
+      ;
+  };
 }

From 9bfabc5a06a13cf02fda8a5b3bddb2aef86e5862 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:06:37 -0400
Subject: [PATCH 13/37] budgie-desktop-view: move from budgie scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix        | 4 ++--
 .../bu/budgie-desktop-view/package.nix}                       | 0
 pkgs/desktops/budgie/default.nix                              | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/budgie/budgie-desktop-view/default.nix => by-name/bu/budgie-desktop-view/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 777ae096fc81..64ef6e4f4b30 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -104,7 +104,7 @@ in {
       cursorTheme = mkDefault { name = "Qogir"; package = pkgs.qogir-icon-theme; };
     };
 
-    services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie.budgie-desktop-view ];
+    services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];
 
     environment.extraInit = ''
       ${concatMapStrings (p: ''
@@ -124,7 +124,7 @@ in {
         budgie-backgrounds
         budgie-control-center'
         (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
-        budgie.budgie-desktop-view
+        budgie-desktop-view
         budgie.budgie-screensaver
         budgie.budgie-session
 
diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/by-name/bu/budgie-desktop-view/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/budgie-desktop-view/default.nix
rename to pkgs/by-name/bu/budgie-desktop-view/package.nix
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index 033db368e653..3561dce0b61e 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -6,7 +6,6 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-desktop-view = callPackage ./budgie-desktop-view { };
     budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
     budgie-screensaver = callPackage ./budgie-screensaver { };
     budgie-session = callPackage ./budgie-session { };

From 14dfaa831f8f07b4569fd8a286626f915ca60936 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:10:39 -0400
Subject: [PATCH 14/37] budgie-desktop-view: modernize

---
 pkgs/by-name/bu/budgie-desktop-view/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/budgie-desktop-view/package.nix b/pkgs/by-name/bu/budgie-desktop-view/package.nix
index 4c822e94e2f2..601f43fae1e7 100644
--- a/pkgs/by-name/bu/budgie-desktop-view/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop-view/package.nix
@@ -8,6 +8,7 @@
   intltool,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   vala,
   wrapGAppsHook3,
@@ -21,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "BuddiesOfBudgie";
     repo = "budgie-desktop-view";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-k6VfAGWvUarhBFnREasOvWH3M9uuT5SFUpMFmKo1fmE=";
+    hash = "sha256-k6VfAGWvUarhBFnREasOvWH3M9uuT5SFUpMFmKo1fmE=";
   };
 
   nativeBuildInputs = [
@@ -41,12 +42,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [ (lib.mesonBool "werror" false) ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Official Budgie desktop icons application/implementation";
     homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view";
-    mainProgram = "org.buddiesofbudgie.budgie-desktop-view";
+    changelog = "https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
     maintainers = lib.teams.budgie.members;
+    mainProgram = "org.buddiesofbudgie.budgie-desktop-view";
+    platforms = lib.platforms.linux;
   };
 })

From 51bfa7985c4a2a5822e8e2e2887533c05cfc705f Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:10:49 -0400
Subject: [PATCH 15/37] budgie-gsettings-override: move from budgie scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix          | 2 +-
 .../bu/budgie-gsettings-overrides/package.nix}                  | 0
 pkgs/desktops/budgie/default.nix                                | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{desktops/budgie/budgie-gsettings-overrides/default.nix => by-name/bu/budgie-gsettings-overrides/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 64ef6e4f4b30..38c4142bc8a1 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -8,7 +8,7 @@ let
   nixos-background-light = pkgs.nixos-artwork.wallpapers.nineish;
   nixos-background-dark = pkgs.nixos-artwork.wallpapers.nineish-dark-gray;
 
-  nixos-gsettings-overrides = pkgs.budgie.budgie-gsettings-overrides.override {
+  nixos-gsettings-overrides = pkgs.budgie-gsettings-overrides.override {
     inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages;
     inherit nixos-background-dark nixos-background-light;
   };
diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
rename to pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index 3561dce0b61e..80def65811a9 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -6,7 +6,6 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
     budgie-screensaver = callPackage ./budgie-screensaver { };
     budgie-session = callPackage ./budgie-session { };
     magpie = callPackage ./magpie { };

From 228edade412a2856276b8c232791db859ceca8e3 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:13:01 -0400
Subject: [PATCH 16/37] budgie-screensaver: move from budgie scope to top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix         | 2 +-
 pkgs/by-name/bu/budgie-desktop/package.nix                     | 3 ++-
 .../default.nix => by-name/bu/budgie-screensaver/package.nix}  | 0
 pkgs/desktops/budgie/default.nix                               | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/budgie/budgie-screensaver/default.nix => by-name/bu/budgie-screensaver/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 38c4142bc8a1..a711c3ff1c57 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -125,7 +125,7 @@ in {
         budgie-control-center'
         (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
         budgie-desktop-view
-        budgie.budgie-screensaver
+        budgie-screensaver
         budgie.budgie-session
 
         # Required by Budgie Menu.
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 4970b6faa963..7b2116950b68 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -5,6 +5,7 @@
   accountsservice,
   alsa-lib,
   budgie,
+  budgie-screensaver,
   docbook-xsl-nons,
   glib,
   gnome,
@@ -74,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     accountsservice
     alsa-lib
-    budgie.budgie-screensaver
+    budgie-screensaver
     glib
     gnome-desktop
     gnome.gnome-settings-daemon
diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/budgie-screensaver/default.nix
rename to pkgs/by-name/bu/budgie-screensaver/package.nix
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index 80def65811a9..d5a68d4e978e 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -6,7 +6,6 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-screensaver = callPackage ./budgie-screensaver { };
     budgie-session = callPackage ./budgie-session { };
     magpie = callPackage ./magpie { };
   }

From 94d8f9bcaa5fdfc80912ee32f2c14cf810f3a8ff Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:14:12 -0400
Subject: [PATCH 17/37] budgie-screensaver: modernize

---
 pkgs/by-name/bu/budgie-screensaver/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix
index dc1ad85634c9..1010ffd9c646 100644
--- a/pkgs/by-name/bu/budgie-screensaver/package.nix
+++ b/pkgs/by-name/bu/budgie-screensaver/package.nix
@@ -12,6 +12,7 @@
   linux-pam,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   systemd,
   wrapGAppsHook3,
@@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "BuddiesOfBudgie";
     repo = "budgie-screensaver";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc=";
+    hash = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc=";
   };
 
   nativeBuildInputs = [
@@ -51,12 +52,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE";
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake";
     homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver";
+    changelog = "https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = lib.teams.budgie.members;
     mainProgram = "budgie-screensaver";
     platforms = lib.platforms.linux;
-    maintainers = lib.teams.budgie.members;
-    license = lib.licenses.gpl2Only;
   };
 })

From 9af16f0c401b6f0e9c1ee51aca1bce0ea1631f7c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:17:24 -0400
Subject: [PATCH 18/37] budgie-screensaver: split outputs

---
 pkgs/by-name/bu/budgie-screensaver/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix
index 1010ffd9c646..f32f6522b8a2 100644
--- a/pkgs/by-name/bu/budgie-screensaver/package.nix
+++ b/pkgs/by-name/bu/budgie-screensaver/package.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc=";
   };
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   nativeBuildInputs = [
     intltool
     meson

From 32a481458583c34eed92602821d15de234a16a60 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:14:57 -0400
Subject: [PATCH 19/37] budgie-screensaver: add version test

---
 pkgs/by-name/bu/budgie-screensaver/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix
index f32f6522b8a2..339b800800f4 100644
--- a/pkgs/by-name/bu/budgie-screensaver/package.nix
+++ b/pkgs/by-name/bu/budgie-screensaver/package.nix
@@ -15,6 +15,7 @@
   nix-update-script,
   pkg-config,
   systemd,
+  testers,
   wrapGAppsHook3,
   xorg,
 }:
@@ -58,6 +59,11 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE";
 
   passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "budgie-screensaver-command --version";
+    };
+
     updateScript = nix-update-script { };
   };
 

From 50124d6c9f3cc0c6d55e6ca0cf4f0dfdc1513ace Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:16:27 -0400
Subject: [PATCH 20/37] budgie-session: move from budgie scope to top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix          | 2 +-
 .../budgie => by-name/bu}/budgie-session/fix-paths.patch        | 0
 .../default.nix => by-name/bu/budgie-session/package.nix}       | 0
 pkgs/desktops/budgie/default.nix                                | 1 -
 4 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{desktops/budgie => by-name/bu}/budgie-session/fix-paths.patch (100%)
 rename pkgs/{desktops/budgie/budgie-session/default.nix => by-name/bu/budgie-session/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index a711c3ff1c57..3748ad036c96 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -126,7 +126,7 @@ in {
         (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
         budgie-desktop-view
         budgie-screensaver
-        budgie.budgie-session
+        budgie-session
 
         # Required by Budgie Menu.
         gnome-menus
diff --git a/pkgs/desktops/budgie/budgie-session/fix-paths.patch b/pkgs/by-name/bu/budgie-session/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/budgie/budgie-session/fix-paths.patch
rename to pkgs/by-name/bu/budgie-session/fix-paths.patch
diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/by-name/bu/budgie-session/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/budgie-session/default.nix
rename to pkgs/by-name/bu/budgie-session/package.nix
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index d5a68d4e978e..82e0f2cceddf 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -6,7 +6,6 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-session = callPackage ./budgie-session { };
     magpie = callPackage ./magpie { };
   }
 )

From d623736294070d367157cea695e8ed5769f13766 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:19:28 -0400
Subject: [PATCH 21/37] budgie-session: split outputs

---
 pkgs/by-name/bu/budgie-session/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix
index 1bd9c3e58b75..aa6af162344b 100644
--- a/pkgs/by-name/bu/budgie-session/package.nix
+++ b/pkgs/by-name/bu/budgie-session/package.nix
@@ -39,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mz+Yh3NK2Tag+MWVofFFXYYXspxhmYBD6YCiuATpZSI=";
   };
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;

From 0470485ff946998fe1fe96b3f264b222b7590d01 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:20:49 -0400
Subject: [PATCH 22/37] budgie-session: modernize

---
 pkgs/by-name/bu/budgie-session/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix
index aa6af162344b..0dfd4dc60824 100644
--- a/pkgs/by-name/bu/budgie-session/package.nix
+++ b/pkgs/by-name/bu/budgie-session/package.nix
@@ -22,6 +22,7 @@
   libxslt,
   gettext,
   makeWrapper,
+  nix-update-script,
   systemd,
   xorg,
   libepoxy,
@@ -47,9 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      gsettings = "${glib.bin}/bin/gsettings";
-      dbusLaunch = "${dbus.lib}/bin/dbus-launch";
-      bash = "${bash}/bin/bash";
+      gsettings = lib.getExe' glib "gsettings";
+      dbusLaunch = lib.getExe' dbus "dbus-launch";
+      bash = lib.getExe bash;
     })
   ];
 
@@ -98,9 +99,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   separateDebugInfo = true;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Session manager for Budgie";
     homepage = "https://github.com/BuddiesOfBudgie/budgie-session";
+    changelog = "https://github.com/BuddiesOfBudgie/budgie-session/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = lib.teams.budgie.members;
     platforms = lib.platforms.linux;

From fef55ad1caac960eb1cd352ceed8118cbb1b6f6c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:28:51 -0400
Subject: [PATCH 23/37] magpie: move from budgie scope to top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix        | 2 +-
 pkgs/by-name/bu/budgie-desktop/package.nix                    | 4 ++--
 .../magpie/default.nix => by-name/ma/magpie/package.nix}      | 0
 pkgs/desktops/budgie/default.nix                              | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/budgie/magpie/default.nix => by-name/ma/magpie/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 3748ad036c96..64df1804680e 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -248,7 +248,7 @@ in {
 
     # Register packages for udev.
     services.udev.packages = with pkgs; [
-      budgie.magpie
+      magpie
     ];
 
     # Shell integration for MATE Terminal.
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 7b2116950b68..7ba153090d30 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   accountsservice,
   alsa-lib,
-  budgie,
   budgie-screensaver,
   docbook-xsl-nons,
   glib,
@@ -24,6 +23,7 @@
   libpulseaudio,
   libuuid,
   libwnck,
+  magpie,
   mesa,
   meson,
   ninja,
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libuuid
     libwnck
-    budgie.magpie
+    magpie
     mesa
     polkit
     sassc
diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/by-name/ma/magpie/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/magpie/default.nix
rename to pkgs/by-name/ma/magpie/package.nix
diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
index 82e0f2cceddf..a2ac816b7c84 100644
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@@ -5,7 +5,5 @@ lib.makeScope newScope (
   let
     inherit (self) callPackage;
   in
-  {
-    magpie = callPackage ./magpie { };
-  }
+  { }
 )

From 285f1f32d97357db12cda7a93b17bb10e939261b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:43:25 -0400
Subject: [PATCH 24/37] magpie: use validatePkgConfig hook

---
 pkgs/by-name/ma/magpie/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix
index fa234e668872..3f9dfda74a05 100644
--- a/pkgs/by-name/ma/magpie/package.nix
+++ b/pkgs/by-name/ma/magpie/package.nix
@@ -34,6 +34,7 @@
   libwacom,
   mesa,
   meson,
+  validatePkgConfig,
   xorgserver,
   python3,
   wrapGAppsHook3,
@@ -95,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
     xvfb-run
     pkg-config
     python3
+    validatePkgConfig
     wrapGAppsHook3
     gi-docgen
     xorgserver

From ca1ec13de5886b56a12ecd8c769ef42a814f7816 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:44:04 -0400
Subject: [PATCH 25/37] magpie: add pkg-config test

---
 pkgs/by-name/ma/magpie/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix
index 3f9dfda74a05..66b6e40723e3 100644
--- a/pkgs/by-name/ma/magpie/package.nix
+++ b/pkgs/by-name/ma/magpie/package.nix
@@ -40,6 +40,7 @@
   wrapGAppsHook3,
   gi-docgen,
   sysprof,
+  testers,
   libsysprof-capture,
   desktop-file-utils,
   libcap_ng,
@@ -160,6 +161,8 @@ stdenv.mkDerivation (finalAttrs: {
         fi
         touch $out
       '';
+
+      pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     };
   };
 
@@ -169,5 +172,11 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     maintainers = lib.teams.budgie.members;
     platforms = lib.platforms.linux;
+    pkgConfigModules = [
+      "libmagpie-0"
+      "magpie-clutter-0"
+      "magpie-cogl-0"
+      "magpie-cogl-pango-0"
+    ];
   };
 })

From ece9778f28f7b5616ff27b75c6543d196eee07c1 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:45:00 -0400
Subject: [PATCH 26/37] magpie: modernize

---
 pkgs/by-name/ma/magpie/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix
index 66b6e40723e3..176c81fae2b8 100644
--- a/pkgs/by-name/ma/magpie/package.nix
+++ b/pkgs/by-name/ma/magpie/package.nix
@@ -34,6 +34,7 @@
   libwacom,
   mesa,
   meson,
+  nix-update-script,
   validatePkgConfig,
   xorgserver,
   python3,
@@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572
     (fetchpatch {
       url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
-      sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
+      hash = "sha256-/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
     })
   ];
 
@@ -164,11 +165,14 @@ stdenv.mkDerivation (finalAttrs: {
 
       pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     };
+
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "Softish fork of Mutter 43.x";
     homepage = "https://github.com/BuddiesOfBudgie/magpie";
+    changelog = "https://github.com/BuddiesOfBudgie/magpie/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = lib.teams.budgie.members;
     platforms = lib.platforms.linux;

From 26f83d251c2efbe92701238b55662a310d66c6dd Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:29:22 -0400
Subject: [PATCH 27/37] budgie: drop scope

---
 pkgs/desktops/budgie/default.nix | 9 ---------
 pkgs/top-level/aliases.nix       | 3 +++
 pkgs/top-level/all-packages.nix  | 1 -
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/desktops/budgie/default.nix

diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix
deleted file mode 100644
index a2ac816b7c84..000000000000
--- a/pkgs/desktops/budgie/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib, newScope }:
-
-lib.makeScope newScope (
-  self:
-  let
-    inherit (self) callPackage;
-  in
-  { }
-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c531a2a06b4c..1f8dddfc002d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -158,6 +158,9 @@ mapAliases ({
   bpftool = bpftools; # Added 2021-05-03
   bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16
   bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10
+
+  budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
+
   inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
   bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24
   butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a66aaf888fc3..c73774bbfcfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37145,7 +37145,6 @@ with pkgs;
     appls = [ prio ];
   };
 
-  budgie = recurseIntoAttrs (callPackage ../desktops/budgie { });
   budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { });
 
   cdesktopenv = callPackage ../desktops/cdesktopenv { };

From 731fb7477cffb5578f674d1bec0f6dafc6e3416b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:30:23 -0400
Subject: [PATCH 28/37] budgie-analogue-clock-applet: move from budgiePlugins
 scope to top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix          | 2 +-
 nixos/tests/budgie.nix                                          | 2 +-
 .../bu/budgie-analogue-clock-applet/package.nix}                | 0
 pkgs/desktops/budgie/plugins/default.nix                        | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix => by-name/bu/budgie-analogue-clock-applet/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 64df1804680e..e94a9e015935 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -80,7 +80,7 @@ in {
         description = "Extra plugins for the Budgie desktop";
         type = types.listOf types.package;
         default = [];
-        example = literalExpression "[ pkgs.budgiePlugins.budgie-analogue-clock-applet ]";
+        example = literalExpression "[ pkgs.budgie-analogue-clock-applet ]";
       };
     };
 
diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix
index f9d873af95e3..9f24ea71de1d 100644
--- a/nixos/tests/budgie.nix
+++ b/nixos/tests/budgie.nix
@@ -25,7 +25,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
     services.xserver.desktopManager.budgie = {
       enable = true;
       extraPlugins = [
-        pkgs.budgiePlugins.budgie-analogue-clock-applet
+        pkgs.budgie-analogue-clock-applet
       ];
     };
   };
diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
rename to pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix
index ad9da6bb4b85..885e7c01bb67 100644
--- a/pkgs/desktops/budgie/plugins/default.nix
+++ b/pkgs/desktops/budgie/plugins/default.nix
@@ -1,6 +1,5 @@
 { callPackage }:
 {
-  budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
   budgie-media-player-applet = callPackage ./budgie-media-player-applet { };
   budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };
 }

From 4c3e9f67f6dabcb4028c8ce68afcbd5e96d55905 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:32:33 -0400
Subject: [PATCH 29/37] budgie-analogue-clock-applet: ensure updateScript &
 meta.changelog

---
 pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
index 873ee28d4e86..ebc2947a4e5b 100644
--- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
@@ -9,6 +9,7 @@
   budgie-desktop,
   gtk3,
   libpeas,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -35,9 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
     libpeas
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Analogue Clock Applet for the Budgie desktop";
     homepage = "https://github.com/samlane-ma/analogue-clock-applet";
+    changelog = "https://github.com/samlane-ma/analogue-clock-applet/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = lib.teams.budgie.members;
     platforms = lib.platforms.linux;

From cb1ef2ba8b65b95a6d4a2376e6f2ec81d08c3be8 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:33:05 -0400
Subject: [PATCH 30/37] budgie-media-player-applet: move from budgiePlugins
 scope to top-level

---
 .../bu/budgie-media-player-applet/package.nix}                   | 0
 pkgs/desktops/budgie/plugins/default.nix                         | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{desktops/budgie/plugins/budgie-media-player-applet/default.nix => by-name/bu/budgie-media-player-applet/package.nix} (100%)

diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix
rename to pkgs/by-name/bu/budgie-media-player-applet/package.nix
diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix
index 885e7c01bb67..66d60303d55a 100644
--- a/pkgs/desktops/budgie/plugins/default.nix
+++ b/pkgs/desktops/budgie/plugins/default.nix
@@ -1,5 +1,4 @@
 { callPackage }:
 {
-  budgie-media-player-applet = callPackage ./budgie-media-player-applet { };
   budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };
 }

From ec4ac2bffc45829ca972e22460dee1aadc6b8a98 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:34:40 -0400
Subject: [PATCH 31/37] budgie-media-player-applet: ensure updateScript &
 meta.changelog

---
 pkgs/by-name/bu/budgie-media-player-applet/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
index 37e2429ac2c7..ee883480d3cb 100644
--- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
@@ -5,6 +5,7 @@
   glib,
   meson,
   ninja,
+  nix-update-script,
   python3Packages,
 }:
 
@@ -41,9 +42,14 @@ stdenv.mkDerivation (finalAttrs: {
     patchPythonScript "$out/lib/budgie-desktop/plugins/budgie-media-player-applet/applet.py"
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Media Control Applet for the Budgie Panel";
     homepage = "https://github.com/zalesyc/budgie-media-player-applet";
+    changelog = "https://github.com/zalesyc/budgie-media-player-applet/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = lib.teams.budgie.members;

From 6a8e6c209fcf02a02e52d478aec036d590d0428e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:35:23 -0400
Subject: [PATCH 32/37] budgie-user-indicator-redux: move from budgiePlugins
 scope to top-level

---
 .../bu/budgie-user-indicator-redux/package.nix}                  | 0
 pkgs/desktops/budgie/plugins/default.nix                         | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{desktops/budgie/plugins/budgie-user-indicator-redux/default.nix => by-name/bu/budgie-user-indicator-redux/package.nix} (100%)

diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
similarity index 100%
rename from pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
rename to pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix
index 66d60303d55a..b9e7043e3883 100644
--- a/pkgs/desktops/budgie/plugins/default.nix
+++ b/pkgs/desktops/budgie/plugins/default.nix
@@ -1,4 +1,3 @@
 { callPackage }:
 {
-  budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };
 }

From e287c7a3d248cc84a55a1dac19f0d77e43097b43 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:36:36 -0400
Subject: [PATCH 33/37] budgie-user-indicator-redux: add updateScript

---
 pkgs/by-name/bu/budgie-user-indicator-redux/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
index ddd0f45a34b5..dd95b40ceca9 100644
--- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
+++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
@@ -10,6 +10,7 @@
   libpeas,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   sassc,
   vala,
@@ -43,6 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
     sassc
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Manage your user session from the Budgie panel";
     homepage = "https://github.com/EbonJaeger/budgie-user-indicator-redux";

From d419ba0b56bd46acd87e88cda19fb819133f92f5 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 19:37:01 -0400
Subject: [PATCH 34/37] budgiePlugins: drop scope

---
 pkgs/desktops/budgie/plugins/default.nix | 3 ---
 pkgs/top-level/aliases.nix               | 1 +
 pkgs/top-level/all-packages.nix          | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 pkgs/desktops/budgie/plugins/default.nix

diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix
deleted file mode 100644
index b9e7043e3883..000000000000
--- a/pkgs/desktops/budgie/plugins/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ callPackage }:
-{
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1f8dddfc002d..ad60920f3f81 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -160,6 +160,7 @@ mapAliases ({
   bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10
 
   budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
+  budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
 
   inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
   bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c73774bbfcfc..7eca524039bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37145,8 +37145,6 @@ with pkgs;
     appls = [ prio ];
   };
 
-  budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { });
-
   cdesktopenv = callPackage ../desktops/cdesktopenv { };
 
   cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });

From 1b26960b0561305bac2a3a604f651153a0c591ff Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 20:14:16 -0400
Subject: [PATCH 35/37] nixos/doc/rl-2411: `budgie` and `budgiePlugins` have
 been removed

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 30be270e8ca1..7e1127ba6cb1 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -85,6 +85,10 @@
   Processes also now run as a dynamically allocated user by default instead of
   root.
 
+- The `budgie` and `budgiePlugins` scope have been removed and their packages
+  moved into the top level scope (i.e., `budgie.budgie-desktop` is now
+  `budgie-desktop`)
+
 - `services.cgit` now runs as the cgit user by default instead of root.
   This change requires granting access to the repositories to this user or
   setting the appropriate one through `services.cgit.some-instance.user`.

From f0f3d0dc56a495058c4d7f31da1273835995062f Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 20:19:11 -0400
Subject: [PATCH 36/37] maintainers/team-list: add getchoo to budgie

---
 maintainers/team-list.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 833aebadb86f..e0472b808170 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -95,7 +95,10 @@ with lib.maintainers;
   };
 
   budgie = {
-    members = [ bobby285271 ];
+    members = [
+      bobby285271
+      getchoo
+    ];
     scope = "Maintain Budgie desktop environment";
     shortName = "Budgie";
   };

From 4bd01dd76948a71de6bfd9ccaadcbc0de9d9f9f3 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 Jul 2024 20:15:18 -0400
Subject: [PATCH 37/37] budgie-desktop: passthru nixosTests.budgie

---
 pkgs/by-name/bu/budgie-desktop/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 7ba153090d30..e75704944f7a 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -28,6 +28,7 @@
   meson,
   ninja,
   nix-update-script,
+  nixosTests,
   pkg-config,
   polkit,
   sassc,
@@ -108,7 +109,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     providedSessions = [ "budgie-desktop" ];
-    tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+
+    tests = {
+      inherit (nixosTests) budgie;
+      pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+    };
+
     updateScript = nix-update-script { };
   };