diff --git a/modules/system/default.nix b/modules/system/default.nix
index 9610823..e669639 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, ... }: {
   options = {
     withNiri = with lib; mkEnableOption "Enable niri";
     withGnome = with lib; mkEnableOption "Enable gnome";
@@ -47,28 +47,26 @@
     time.timeZone = "Europe/Amsterdam";
 
     # Select internationalisation properties.
-    i18n.defaultLocale = "en_US.UTF-8";
+    i18n = {
+      defaultLocale = "en_US.UTF-8";
 
-    i18n.extraLocaleSettings = {
-      LC_ADDRESS = "en_US.UTF-8";
-      LC_IDENTIFICATION = "en_US.UTF-8";
-      LC_MEASUREMENT = "en_US.UTF-8";
-      LC_MONETARY = "en_US.UTF-8";
-      LC_NAME = "en_US.UTF-8";
-      LC_NUMERIC = "en_US.UTF-8";
-      LC_PAPER = "en_US.UTF-8";
-      LC_TELEPHONE = "en_US.UTF-8";
-      LC_TIME = "en_US.UTF-8";
+      extraLocaleSettings = {
+        LC_ADDRESS = "en_US.UTF-8";
+        LC_IDENTIFICATION = "en_US.UTF-8";
+        LC_MEASUREMENT = "en_US.UTF-8";
+        LC_MONETARY = "en_US.UTF-8";
+        LC_NAME = "en_US.UTF-8";
+        LC_NUMERIC = "en_US.UTF-8";
+        LC_PAPER = "en_US.UTF-8";
+        LC_TELEPHONE = "en_US.UTF-8";
+        LC_TIME = "en_US.UTF-8";
+      };
     };
 
-    # Enable the X11 windowing system.
-    services.xserver.enable = true;
-
-    # Remove XTerm
-    services.xserver.excludePackages = [ pkgs.xterm ];
-
-    # Configure keymap in X11
+    # Configure xserver
     services.xserver = {
+      enable = true;
+      excludePackages = [ pkgs.xterm ];
       layout = "us";
       xkbVariant = "";
     };