extract gnome into module

nixos/common/desktop/default.nix

@@ -1,7 +1,4 @@
-{ pkgs, config, lib, ... }: {
-  imports = [
-    ./desktop-env.nix
-  ];
+{ pkgs, ... }: {
   # Bootloader.
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
@@ -17,6 +14,9 @@
     };
   };
 
+  # Enable my config for the gnome desktop environment
+  services.v.gnome.enable = true;
+
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
 
@@ -82,4 +82,9 @@
     # Open ports in the firewall for Steam Remote Play
     remotePlay.openFirewall = true;
   };
+
+  # Networking
+  networking.networkmanager.enable = true;
+  networking.firewall.checkReversePath = false;
+  networking.firewall.enable = false;
 }

nixos/common/desktop/desktop-env.nix

@@ -1,48 +0,0 @@
-{ pkgs, ...}: {
-  # TODO: Create Module
-  services.xserver.enable = true;
-  services.xserver.excludePackages = [ pkgs.xterm ];
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "altgr-intl";
-  };
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
-  environment.gnome.excludePackages =
-    (with pkgs; [ gnome-photos gnome-tour gnome-connections ])
-    ++ (with pkgs.gnome; [
-      atomix # puzzle game
-      epiphany # web browser
-      geary # email reader
-      gedit # text editor
-      gnome-calendar
-      gnome-clocks
-      gnome-contacts
-      gnome-maps
-      gnome-music
-      gnome-notes
-      gnome-terminal
-      gnome-weather
-      hitori # sudoku game
-      iagno # go game
-      simple-scan # document scanner
-      tali # poker game
-      totem # video player
-    ]);
-
-  # Services required for gnome
-  programs.dconf.enable = true;
-  services.dbus.enable = true;
-  services.udisks2.enable = true;
-
-  # Extra gnome packages
-  environment.systemPackages = with pkgs; [
-    gnome.gnome-tweaks
-    gnome.gnome-boxes
-  ];
-}