From db9ae25dca40580497b79d6a638e62647e50ec53 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Aug 2024 18:34:18 +0200
Subject: [PATCH] gnome-initial-setup: Move from gnome scope to top-level

---
 .../modules/services/desktops/gnome/gnome-initial-setup.nix | 6 +++---
 .../gn}/gnome-initial-setup/0001-fix-paths.patch            | 0
 .../gn/gnome-initial-setup/package.nix}                     | 5 +----
 .../core => by-name/gn}/gnome-initial-setup/vendor.conf     | 0
 pkgs/desktops/gnome/default.nix                             | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-initial-setup/0001-fix-paths.patch (100%)
 rename pkgs/{desktops/gnome/core/gnome-initial-setup/default.nix => by-name/gn/gnome-initial-setup/package.nix} (92%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-initial-setup/vendor.conf (100%)

diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
index 8deb12ec18bf..4f1b23c8f36e 100644
--- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
@@ -64,13 +64,13 @@ in
   config = lib.mkIf config.services.gnome.gnome-initial-setup.enable {
 
     environment.systemPackages = [
-      pkgs.gnome.gnome-initial-setup
+      pkgs.gnome-initial-setup
     ]
     ++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
     ;
 
     systemd.packages = [
-      pkgs.gnome.gnome-initial-setup
+      pkgs.gnome-initial-setup
     ];
 
     systemd.user.targets."gnome-session".wants = [
@@ -84,7 +84,7 @@ in
     ];
 
     programs.dconf.profiles.gnome-initial-setup.databases = [
-      "${pkgs.gnome.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
+      "${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
     ];
   };
 
diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch
rename to pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix
similarity index 92%
rename from pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
rename to pkgs/by-name/gn/gnome-initial-setup/package.nix
index 6286830a0b88..e2d3e9eefdcb 100644
--- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
+++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix
@@ -92,10 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-initial-setup";
-      attrPath = "gnome.gnome-initial-setup";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-initial-setup"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf b/pkgs/by-name/gn/gnome-initial-setup/vendor.conf
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf
rename to pkgs/by-name/gn/gnome-initial-setup/vendor.conf
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 7869b92ba506..8714314df445 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -30,8 +30,6 @@ in
 
   gnome-control-center = callPackage ./core/gnome-control-center { };
 
-  gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
-
   gnome-session = callPackage ./core/gnome-session { };
 
   gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { };
@@ -131,6 +129,7 @@ in
   gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22.
   gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
   gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.
+  gnome-initial-setup = lib.warn "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly." pkgs.gnome-initial-setup; # Added on 2024-08-11.
   gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22.
   gnome-klotski = lib.warn "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly." pkgs.gnome-klotski; # Added on 2024-08-11.
   gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11.