diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix
index dfd748a..4b56c96 100644
--- a/machines/Archie/configuration.nix
+++ b/machines/Archie/configuration.nix
@@ -26,10 +26,19 @@
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
 
+	# Set your time zone.
+	time.timeZone = "Europe/Madrid";
+
 	# Configure network proxy if necessary
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
+	# Select internationalisation properties.
+	i18n.defaultLocale = "en_US.UTF-8";
+	console = {
+		keyMap = "es";
+	};
+
 	# Enable the X11 windowing system.
 	services.xserver.enable = true;
 
diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix
index 8cd3198..2b6f110 100755
--- a/machines/Everest/configuration.nix
+++ b/machines/Everest/configuration.nix
@@ -32,6 +32,33 @@
 		nameservers = [ "8.8.8.8" ];
 	};
 
+	# Set your time zone.
+	time.timeZone = "Europe/Madrid";
+
+	# Select internationalisation properties.
+	i18n.defaultLocale = "en_US.UTF-8";
+
+	i18n.extraLocaleSettings = {
+		LC_ADDRESS = "es_ES.UTF-8";
+		LC_IDENTIFICATION = "es_ES.UTF-8";
+		LC_MEASUREMENT = "es_ES.UTF-8";
+		LC_MONETARY = "es_ES.UTF-8";
+		LC_NAME = "es_ES.UTF-8";
+		LC_NUMERIC = "es_ES.UTF-8";
+		LC_PAPER = "es_ES.UTF-8";
+		LC_TELEPHONE = "es_ES.UTF-8";
+		LC_TIME = "es_ES.UTF-8";
+	};
+
+	# Configure keymap in X11
+	services.xserver = {
+		layout = "es";
+		xkbVariant = "";
+	};
+
+	# Configure console keymap
+	console.keyMap = "es";
+
 	# Define a user account. Don't forget to set a password with ‘passwd’.
 	users.users.toast = {
 		isNormalUser = true;
diff --git a/machines/SurfaceGo/configuration.nix b/machines/SurfaceGo/configuration.nix
index 3f91f65..f0e31af 100644
--- a/machines/SurfaceGo/configuration.nix
+++ b/machines/SurfaceGo/configuration.nix
@@ -26,10 +26,19 @@
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
 
+	# Set your time zone.
+	time.timeZone = "Europe/Madrid";
+
 	# Configure network proxy if necessary
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
+	# Select internationalisation properties.
+	i18n.defaultLocale = "en_US.UTF-8";
+	console = {
+		keyMap = "es";
+	};
+
 	# Enable the X11 windowing system.
 	services.xserver.enable = true;
   
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index 67ea919..ba301c4 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -17,31 +17,7 @@
 		# Cleaning out /tmp at boot if it's a tmpfs is quite stupid
 		cleanOnBoot = !config.boot.tmp.useTmpfs;
 	};
-
-	# Set up keyboard layout
-	services.xserver.layout = "es";
-	# Make the console use X's keyboard configuration
-	console.useXkbConfig = true;
-
-	# Set up localisation
-	i18n = {
-		defaultLocale = "en_US.UTF-8";
-		extraLocaleSettings = {
-			LC_NUMERIC = "es_ES.UTF-8";
-			# am/pm is nice but mm/dd/yy is yucky
-			LC_TIME = "es_US.UTF-8";
-			LC_MONETARY = "es_ES.UTF-8";
-			LC_MEASUREMENT = "es_ES.UTF-8";
-			LC_PAPER = "es_ES.UTF-8";
-			LC_ADDRESS = "es_US.UTF-8";
-			LC_NAME = "es_ES.UTF-8";
-			LC_TELEPHONE = "es_ES.UTF-8";
-		};
-	};
-
-	# Set up time zone.
-	time.timeZone = "Europe/Madrid";
-
+	
 	# Set up secrets
 	age = {
 		identityPaths = [