diff --git a/flake.nix b/flake.nix
index 7e992f8..f8d9172 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,11 +12,12 @@
     nixosConfigurations = let
       defaultModules = [
         home-manager.nixosModules.home-manager
-        ./main/configuration.nix
+        ./main/desktop.nix
         ./main/fonts.nix
         ./main/general.nix
         ./main/kernel.nix
         ./main/netdata/default.nix
+        ./main/networking.nix
         ./main/packages.nix
         ./main/printing.nix
 
diff --git a/main/configuration.nix b/main/configuration.nix
deleted file mode 100644
index 3c9224f..0000000
--- a/main/configuration.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
-  networking.firewall = {
-    allowPing = false;
-    enable = true;
-    trustedInterfaces = [ "tailscale0" ];
-  };
-
-  # Enable the GNOME 3 Desktop Environment.
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome3.enable = true;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound.
-  sound.enable = true;
-
-  # Enable 32bit for steam
-  hardware.pulseaudio.enable = true;
-  hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
-  hardware.pulseaudio.support32Bit = true;
-
-  virtualisation.docker.enable = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-}
-
diff --git a/main/desktop.nix b/main/desktop.nix
new file mode 100644
index 0000000..31d397e
--- /dev/null
+++ b/main/desktop.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+
+  # Enable the GNOME 3 Desktop Environment.
+  services.xserver.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome3.enable = true;
+
+}
diff --git a/main/general.nix b/main/general.nix
index 4209f15..25e4c7d 100644
--- a/main/general.nix
+++ b/main/general.nix
@@ -30,6 +30,23 @@
   # Set your time zone.
   time.timeZone = "America/Toronto";
 
-  services.tailscale.enable = true;
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound.
+  sound.enable = true;
+
+  # Enable 32bit for steam
+  hardware.pulseaudio.enable = true;
+  hardware.opengl.driSupport32Bit = true;
+  hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
+  hardware.pulseaudio.support32Bit = true;
+
+  virtualisation.docker.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
 
 }
diff --git a/main/networking.nix b/main/networking.nix
new file mode 100644
index 0000000..3931fee
--- /dev/null
+++ b/main/networking.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  services.tailscale.enable = true;
+
+  networking.firewall = {
+    allowPing = false;
+    enable = true;
+    trustedInterfaces = [ "tailscale0" ];
+  };
+}