diff --git a/flake.nix b/flake.nix
index 34fd2cc..590d963 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
     nixosConfigurations = let
       defaultModules = [
         home-manager.nixosModules.home-manager
+        ./main/configuration.nix
         ./main/fonts.nix
         ./main/general.nix
         ./main/kernel.nix
diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix
index e33a415..8b400c0 100644
--- a/machines/hephaestus/configuration.nix
+++ b/machines/hephaestus/configuration.nix
@@ -15,13 +15,6 @@
   networking.useDHCP = false;
   networking.interfaces.enp34s0.useDHCP = true;
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
   services.xserver.videoDrivers = [ "nvidia" ];
 
   # Evolution
@@ -31,35 +24,5 @@
   services.gnome3.gnome-keyring.enable = true;
   programs.seahorse.enable = true;
 
-  # 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;
-
-  # Virtualization
-  virtualisation.libvirtd.enable = true;
-  systemd.services.libvirtd.enable = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  # Open ports in the firewall.
-  networking.firewall.enable = true;
 }
 
diff --git a/machines/hermes/configuration.nix b/machines/hermes/configuration.nix
index adc81a1..7eb9bb8 100644
--- a/machines/hermes/configuration.nix
+++ b/machines/hermes/configuration.nix
@@ -15,39 +15,5 @@
   networking.useDHCP = false;
   networking.interfaces.wlp61s0.useDHCP = true;
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
-  # 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;
-  };
-
-  # Open ports in the firewall.
-  networking.firewall.enable = true;
-
 }
 
diff --git a/main/configuration.nix b/main/configuration.nix
new file mode 100644
index 0000000..04f0872
--- /dev/null
+++ b/main/configuration.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+
+{
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  # 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;
+  };
+
+}
+