cleanup

modules/nixos/desktop/gnome/default.nix

@@ -10,16 +10,16 @@ let
   cfg = config.${namespace}.desktop.gnome;
 in
 {
-  imports = [ ../../../home/desktop/gnome/options.nix ];
+  options.${namespace}.desktop.gnome = {
+    enable = lib.mkEnableOption "GNOME desktop environment";
+  };
 
   config = lib.mkIf cfg.enable {
     services = {
-      # Enable Desktop Environment.
       desktopManager.gnome = enabled;
-      # Enable Desktop Environment.
-      displayManager = {
-        gdm = lib.mkDefault enabled;
-        gdm.wayland = lib.mkDefault true;
+      displayManager.gdm = {
+        enable = lib.mkDefault true;
+        wayland = lib.mkDefault true;
       };
 
       gnome = {
@@ -49,11 +49,9 @@ in
 
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
-    programs = {
-      kdeconnect = {
-        enable = false;
-        package = pkgs.gnomeExtensions.gsconnect;
-      };
+    programs.kdeconnect = {
+      enable = false;
+      package = pkgs.gnomeExtensions.gsconnect;
     };
   };
 }