From d3cdabb5c9fb3dc57b3a0c02ca5fa92719970a30 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 30 May 2021 22:47:03 +0200
Subject: [PATCH] Replace references to pkgs.gnome3 by pkgs.gnome

---
 doc/faq.adoc                        | 2 +-
 modules/misc/gtk.nix                | 2 +-
 modules/programs/gnome-terminal.nix | 2 +-
 modules/programs/rofi.nix           | 2 +-
 modules/services/dunst.nix          | 2 +-
 modules/services/gnome-keyring.nix  | 2 +-
 modules/services/pulseeffects.nix   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/faq.adoc b/doc/faq.adoc
index f0777161a..904a56227 100644
--- a/doc/faq.adoc
+++ b/doc/faq.adoc
@@ -92,7 +92,7 @@ error: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name ca.desrt.
 The solution on NixOS is to add
 
 [source,nix]
-services.dbus.packages = with pkgs; [ gnome3.dconf ];
+services.dbus.packages = with pkgs; [ gnome.dconf ];
 
 to your system configuration.
 
diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix
index cec6abd09..db0a8e7a3 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk.nix
@@ -33,7 +33,7 @@ let
       package = mkOption {
         type = types.nullOr types.package;
         default = null;
-        example = literalExample "pkgs.gnome3.gnome_themes_standard";
+        example = literalExample "pkgs.gnome.gnome_themes_standard";
         description = ''
           Package providing the theme. This package will be installed
           to your profile. If <literal>null</literal> then the theme
diff --git a/modules/programs/gnome-terminal.nix b/modules/programs/gnome-terminal.nix
index 1754edd91..149cc5ebd 100644
--- a/modules/programs/gnome-terminal.nix
+++ b/modules/programs/gnome-terminal.nix
@@ -315,7 +315,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ pkgs.gnome3.gnome-terminal ];
+    home.packages = [ pkgs.gnome.gnome-terminal ];
 
     dconf.settings = let dconfPath = "org/gnome/terminal/legacy";
     in {
diff --git a/modules/programs/rofi.nix b/modules/programs/rofi.nix
index 042b0b211..9c6badbfd 100644
--- a/modules/programs/rofi.nix
+++ b/modules/programs/rofi.nix
@@ -261,7 +261,7 @@ in {
       description = ''
         Path to the terminal which will be used to run console applications
       '';
-      example = "\${pkgs.gnome3.gnome_terminal}/bin/gnome-terminal";
+      example = "\${pkgs.gnome.gnome_terminal}/bin/gnome-terminal";
     };
 
     separator = mkOption {
diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index 90c3160fc..34e48cc19 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -25,7 +25,7 @@ let
     options = {
       package = mkOption {
         type = types.package;
-        example = literalExample "pkgs.gnome3.adwaita-icon-theme";
+        example = literalExample "pkgs.gnome.adwaita-icon-theme";
         description = "Package providing the theme.";
       };
 
diff --git a/modules/services/gnome-keyring.nix b/modules/services/gnome-keyring.nix
index ce39cea93..7e3f8bbce 100644
--- a/modules/services/gnome-keyring.nix
+++ b/modules/services/gnome-keyring.nix
@@ -36,7 +36,7 @@ in {
           args = concatStringsSep " " ([ "--start" "--foreground" ]
             ++ optional (cfg.components != [ ])
             ("--components=" + concatStringsSep "," cfg.components));
-        in "${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon ${args}";
+        in "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon ${args}";
         Restart = "on-abort";
       };
 
diff --git a/modules/services/pulseeffects.nix b/modules/services/pulseeffects.nix
index 89a7fef81..184c2af79 100644
--- a/modules/services/pulseeffects.nix
+++ b/modules/services/pulseeffects.nix
@@ -38,7 +38,7 @@ in {
     # "AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files"
     home.packages = [ cfg.package pkgs.at-spi2-core ];
 
-    # Will need to add `services.dbus.packages = with pkgs; [ gnome3.dconf ];`
+    # Will need to add `services.dbus.packages = with pkgs; [ gnome.dconf ];`
     # to /etc/nixos/configuration.nix for daemon to work correctly
 
     systemd.user.services.pulseeffects = {