diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index 99b0725..acd64d1 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 let
+  inherit (lib.${namespace}) enabled disabled;
   cfg = config.${namespace}.desktop.gnome;
 in
 {
@@ -14,14 +15,36 @@ in
   config = lib.mkIf cfg.enable {
     services = {
       # Enable Desktop Environment.
-      desktopManager.gnome.enable = true;
+      desktopManager.gnome = enabled;
       # Enable Desktop Environment.
       displayManager = {
-        gdm.enable = lib.mkDefault true;
+        gdm = lib.mkDefault enabled;
         gdm.wayland = lib.mkDefault true;
       };
 
-      gnome.gnome-remote-desktop.enable = true;
+      gnome = {
+        at-spi2-core = disabled;
+        core-apps = enabled;
+        core-developer-tools = disabled;
+        core-os-services = enabled;
+        core-shell = enabled;
+        evolution-data-server = disabled;
+        games = disabled;
+        gcr-ssh-agent = enabled;
+        glib-networking = enabled;
+        gnome-browser-connector = enabled;
+        gnome-initial-setup = disabled;
+        gnome-keyring = enabled;
+        gnome-online-accounts = enabled;
+        gnome-remote-desktop = enabled;
+        gnome-settings-daemon = enabled;
+        gnome-software = disabled;
+        gnome-user-share = enabled;
+        localsearch = enabled;
+        rygel = enabled;
+        sushi = enabled;
+        tinysparql = enabled;
+      };
     };
 
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];