From 96983c4ecb8806779df7e42f899f60e8c2a4ad67 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Thu, 13 May 2021 07:32:53 -0400
Subject: [PATCH] Update to GNOME 40

---
 flake.lock                            | 18 +++++++++---------
 machines/hephaestus/configuration.nix |  4 ++--
 main/desktop.nix                      |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index dfe58bc..66491d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1620466752,
-        "narHash": "sha256-PvG6OWDCnjpZhUXDl9MHLBOZaiNjekEJY5Q90cqwSMg=",
+        "lastModified": 1620692082,
+        "narHash": "sha256-s/eBXs4OI47yPWNTKoAg4f/H7wMLyO+VEMmobXkzfI8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4896c500742a2a2e86e71018e17e617c5ffc74c6",
+        "rev": "23769994e8f7b212d9a257799173b120ed87736b",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1619336929,
-        "narHash": "sha256-joIC2D26jtSbHodR/o8r+5T9XL2hXs6NIp5mVyA4JOc=",
+        "lastModified": 1620849144,
+        "narHash": "sha256-DJWzAPc4o6+fSKSAAqx3YXyQZppAR9LBVYn+WWYuKcI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f7540d6c27704ec0fe56ecc8b2a9b663181850b0",
+        "rev": "9e58ee154c06289390cd28aeb87bdc099248a6aa",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1620340338,
-        "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=",
+        "lastModified": 1620830445,
+        "narHash": "sha256-CE4R4OlOcTUATacRZMo5hyS9n47U6A0G5SASNoo4TbI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63586475587d7e0e078291ad4b49b6f6a6885100",
+        "rev": "65d6153aec85c8cb46023f0a7248628f423ca4ee",
         "type": "github"
       },
       "original": {
diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix
index 412dbb9..1c61134 100644
--- a/machines/hephaestus/configuration.nix
+++ b/machines/hephaestus/configuration.nix
@@ -25,8 +25,8 @@
   # Evolution
   programs.evolution.enable = true;
   programs.evolution.plugins = [ pkgs.evolution-ews ];
-  services.gnome3.evolution-data-server.enable = true;
-  services.gnome3.gnome-keyring.enable = true;
+  services.gnome.evolution-data-server.enable = true;
+  services.gnome.gnome-keyring.enable = true;
   programs.seahorse.enable = true;
 
 }
diff --git a/main/desktop.nix b/main/desktop.nix
index 31d397e..11673e3 100644
--- a/main/desktop.nix
+++ b/main/desktop.nix
@@ -2,9 +2,9 @@
 
 {
 
-  # Enable the GNOME 3 Desktop Environment.
+  # Enable the GNOME Desktop Environment.
   services.xserver.enable = true;
   services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome3.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
 }