diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix
index 7784db6..9c1ae34 100644
--- a/machines/Archie/configuration.nix
+++ b/machines/Archie/configuration.nix
@@ -21,7 +21,6 @@
 	boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
 
 	networking.hostName = "Archie"; # Define your hostname.
-	networking.networkmanager.enable = true; # Enable networking
 
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
@@ -30,9 +29,6 @@
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-	# Enable the X11 windowing system.
-	services.xserver.enable = true;
-
 	# Configure keymap in X11
 	# services.xserver.layout = "us";
 	# services.xserver.xkbOptions = "eurosign:e,caps:escape";
@@ -47,14 +43,6 @@
 	# Enable touchpad support (enabled default in most desktopManager).
 	# services.xserver.libinput.enable = true;
 
-	# Define a user account. Don't forget to set a password with ‘passwd’.
-	users.users.toast = {
-		isNormalUser = true;
-		extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-		packages = with pkgs; [
-			tree
-		];
-	};
 
 	hardware.bluetooth.enable = true;
 
diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix
index 3a860e1..085260d 100755
--- a/machines/Everest/configuration.nix
+++ b/machines/Everest/configuration.nix
@@ -38,10 +38,7 @@
   
 	# Define a user account. Don't forget to set a password with ‘passwd’.
 	users.users.toast = {
-		isNormalUser = true;
-		description = "Toast";
-		extraGroups = [ "networkmanager" "wheel" "transmission"];
-		packages = with pkgs; [];
+		extraGroups = [ "networkmanager" "transmission"];
 		openssh.authorizedKeys.keys = [
 			"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2bOVmxUNvg9qFv9DlzMmTRlzcNsyNq1F1wBuAXySwsWAzHGaO+WGdSCINxW3k2ccXn7M/o1r89LeTzRzi8sWQYCpBaIqYVszM/r7SvTS4gASyKhM6lNlyUEPOnvCXH7rdtF+fjoA1TJPv7GBk78QRhGh+eVO3qhY1m++5C1CPFlyrc6sSfgIBQJ5GQZFl/7YEgsrPo+M+0Sd7LkaCOyNmJA0Wi0BA3bbf5sJhrZVMMg/p7w+eMphz2kd1VTVjW3yeMq9zLCiu4SOTBNGCMEvKIdUZbQ83lNrqO2z1/3T1bDwJgpz3xusfkNCeNJSmhfFw5ydHEUp/9jshq38WmulKAMw2Kl/Zed62AVU7Ux7YjUkZkWvo8i3eXuLUxoG891S7cWV1/ijs9QMajOLLT14FG7RbzUYYaYlx+/iNGji9d4sp9/oMYyO45TMe+vEezFSBygP7TY0QFOr4xTi49ZRQFsszbFnGRv+k3wVKoGoeNt0xWB8pBEPFtaeHJpQyJX8= id_rsa_moon"
 			"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOeu3crGqtxwaqgoQPt5mWlC8+PL/Icvcvo0MBAaK80L Key for work laptop"
diff --git a/machines/SteamDeck/configuration.nix b/machines/SteamDeck/configuration.nix
index dc54043..930782a 100755
--- a/machines/SteamDeck/configuration.nix
+++ b/machines/SteamDeck/configuration.nix
@@ -20,7 +20,6 @@
 	boot.loader.efi.canTouchEfiVariables = true;
 
 	networking.hostName = "SteamDeck"; # Define your hostname.
-	networking.networkmanager.enable = true; # Enable networking
 
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
@@ -31,9 +30,6 @@
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-	# Enable the X11 windowing system.
-	services.xserver.enable = true;
-
 	jovian = {
 		devices.steamdeck = {
 			enable = true;
@@ -70,15 +66,6 @@
 	# Enable touchpad support (enabled default in most desktopManager).
 	# services.xserver.libinput.enable = true;
 
-	# Define a user account. Don't forget to set a password with ‘passwd’.
-	users.users.toast = {
-		isNormalUser = true;
-		extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-		packages = with pkgs; [
-			tree
-		];
-	};
-
 	# Large builds (the linux kernel) fail to build because /tmp is too small when using tmpfs
 	boot.tmp.useTmpfs = false;
 
diff --git a/machines/SurfaceGo/configuration.nix b/machines/SurfaceGo/configuration.nix
index 1dd588b..7b63b8d 100644
--- a/machines/SurfaceGo/configuration.nix
+++ b/machines/SurfaceGo/configuration.nix
@@ -27,7 +27,6 @@
 	security.tpm2.enable = true;
 
 	networking.hostName = "SurfaceGo"; # Define your hostname.
-	networking.networkmanager.enable = true; # Enable networking
 
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
@@ -36,9 +35,6 @@
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-	# Enable the X11 windowing system.
-	services.xserver.enable = true;
-
 	# Configure keymap in X11
 	# services.xserver.layout = "us";
 	# services.xserver.xkbOptions = "eurosign:e,caps:escape";
@@ -58,12 +54,6 @@
 	# Enable touchpad support (enabled default in most desktopManager).
 	# services.xserver.libinput.enable = true;
 
-	# Define a user account. Don't forget to set a password with ‘passwd’.
-	users.users.toast = {
-		isNormalUser = true;
-		extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-	};
-
 	# List packages installed in system profile. To search, run:
 	# $ nix search wget
 	# environment.systemPackages = with pkgs; [
diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix
index b41a681..1b8ddc8 100755
--- a/machines/WinMax2/configuration.nix
+++ b/machines/WinMax2/configuration.nix
@@ -33,7 +33,6 @@
 	};
 
 	networking.hostName = "WinMax2"; # Define your hostname.
-	networking.networkmanager.enable = true; # Enable networking
 
 	specialisation.noAVX512.configuration = {
 		# For some reason The Finals crashes on CPUs that support AVX512
@@ -57,15 +56,12 @@ ACTION=="add", SUBSYSTEM=="i2c", ATTR{name}=="PNP0C50:00", ATTR{power/wakeup}="d
 
 	nix.settings.auto-optimise-store = true;
 
-	services.xserver.layout = lib.mkForce "us";
-
 	# Configure network proxy if necessary
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-	# Enable the X11 windowing system.
 	services.xserver = {
-		enable = true;
+		xkb.layout = lib.mkForce "us";
 		displayManager.sddm.settings = {
 			General.GreeterEnvironment="QT_SCREEN_SCALE_FACTORS=1.75";
 		};
@@ -112,12 +108,6 @@ ACTION=="add", SUBSYSTEM=="i2c", ATTR{name}=="PNP0C50:00", ATTR{power/wakeup}="d
 	# Enable touchpad support (enabled default in most desktopManager).
 	# services.xserver.libinput.enable = true;
 
-	# Define a user account. Don't forget to set a password with ‘passwd’.
-	users.users.toast = {
-		isNormalUser = true;
-		extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-	};
-
 	# Large builds (the linux kernel) fail to build because /tmp is too small when using tmpfs
 	boot.tmp.useTmpfs = false;
 
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index a8f4887..0666e24 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -27,7 +27,7 @@
 	boot.kernelParams = [ "zswap.enabled=0" ];
 
 	# Set up keyboard layout
-	services.xserver.layout = "es";
+	services.xserver.xkb.layout = "es";
 
 	# Set up console
 	console = {
@@ -59,6 +59,13 @@
 
 	services.fwupd.enable = true;
 
+	# Set up my user
+	users.users.toast = {
+		isNormalUser = true;
+		description = "Toast";
+		extraGroupps = [ "wheel" ];
+	};
+
 	# Set up time zone.
 	time.timeZone = "Europe/Madrid";
 
diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix
index 7a07df6..3a10fee 100644
--- a/roles/desktop/configuration.nix
+++ b/roles/desktop/configuration.nix
@@ -8,6 +8,10 @@
 	};
 	users.users.toast.extraGroups = [ "scanner" ];
 
+	networking.networkmanager.enable = true;
+
+	services.xserver.enable = true;
+
 	# Set up fonts
 	fonts.packages = [
 		( pkgs.nerdfonts.override { fonts = [ "Hack" "JetBrainsMono" ]; } )