diff --git a/modules/nixos/hardware/keyboard.nix b/modules/nixos/hardware/keyboard.nix
index e5eee1b..4c23bee 100644
--- a/modules/nixos/hardware/keyboard.nix
+++ b/modules/nixos/hardware/keyboard.nix
@@ -1,15 +1,22 @@
-{ ... }: {
+{ config, ... }: {
 
-  services.xserver = {
+  config = {
 
-    layout = "us";
+    services.xserver = {
 
-    # Keyboard responsiveness
-    autoRepeatDelay = 250;
-    autoRepeatInterval = 40;
+      layout = "us";
 
-    # Swap escape key with caps lock key
-    xkbOptions = "eurosign:e,caps:swapescape";
+      # Keyboard responsiveness
+      autoRepeatDelay = 250;
+      autoRepeatInterval = 40;
+
+      # Swap escape key with caps lock key
+      xkbOptions = "eurosign:e,caps:swapescape";
+
+    };
+
+    # Enable num lock on login
+    home-manager.users.${config.user}.xsession.numlock.enable = true;
 
   };