treewide: Fix eval errors post 21.05 release

A few things have changed since the recent NixOS 21.05 release. Mostly
naming stuff, so nothing dramatic.

5 files changed, 8 insertions, 8 deletions

diff --git a/modules/core/tests.nix b/modules/core/tests.nix
index 68d64ab3..a04c7f3c 100644
--- a/modules/core/tests.nix
+++ b/modules/core/tests.nix
@@ -99,8 +99,8 @@ let
     { check = config.services.cloud-init.enable;
       path  = ["nixos" "cloud-init"];
     }
-    { check = config.services.codimd.enable;
-      path  = ["nixos" "codimd"];
+    { check = config.services.hedgedoc.enable;
+      path  = ["nixos" "hedgedoc"];
     }
     { check = config.services.consul.enable;
       path  = ["nixos" "consul"];
@@ -240,7 +240,7 @@ let
     { check = config.services.glusterfs.enable;
       path  = ["nixos" "glusterfs"];
     }
-    { check = config.services.xserver.desktopManager.gnome3.enable;
+    { check = config.services.xserver.desktopManager.gnome.enable;
       path  = ["nixos" "installed-tests"];
     }
     { check = config.services.gocd-agent.enable;
diff --git a/modules/user/aszlig/profiles/managed.nix b/modules/user/aszlig/profiles/managed.nix
index 5f240778..3c2fe029 100644
--- a/modules/user/aszlig/profiles/managed.nix
+++ b/modules/user/aszlig/profiles/managed.nix
@@ -54,7 +54,7 @@ in {
       unfreeAndNonDistributablePkgs.skype
     ];
 
-    i18n.consoleUseXkbConfig = true;
+    console.useXkbConfig = true;
 
     # Printing for the most common printers among the managed machines.
     services.printing.enable = true;
diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix
index 1132f48b..2e456be6 100644
--- a/modules/user/devhell/profiles/packages.nix
+++ b/modules/user/devhell/profiles/packages.nix
@@ -127,8 +127,8 @@ in {
       gitinspector
       gitui
       glow
-      gnome3.adwaita-icon-theme
-      gnome3.defaultIconTheme
+      gnome.adwaita-icon-theme
+      gnome.defaultIconTheme
       gnufdisk
       gnumake
       gnupg
diff --git a/modules/user/openlab/labtops.nix b/modules/user/openlab/labtops.nix
index 14aaff05..340a23e9 100644
--- a/modules/user/openlab/labtops.nix
+++ b/modules/user/openlab/labtops.nix
@@ -32,7 +32,7 @@ in
       baseGUI = [
         filezilla
         chromium
-        gnome3.gedit
+        gnome.gedit
         gmpc
         libreoffice
         vlc
diff --git a/modules/user/profpatsch/services/dunst.nix b/modules/user/profpatsch/services/dunst.nix
index 53758f20..55bc315b 100644
--- a/modules/user/profpatsch/services/dunst.nix
+++ b/modules/user/profpatsch/services/dunst.nix
@@ -26,7 +26,7 @@ let
     options = {
       package = lib.mkOption {
         type = lib.types.package;
-        example = lib.literalExample "pkgs.gnome3.adwaita-icon-theme";
+        example = lib.literalExample "pkgs.gnome.adwaita-icon-theme";
         description = "Package providing the theme.";
       };