From 3be6acafb6f17b987c9493942636e7f6e626dd3d Mon Sep 17 00:00:00 2001
From: Baitinq <manuelpalenzuelamerino@gmail.com>
Date: Wed, 22 Jun 2022 16:21:37 +0200
Subject: Configure the keymap on a per host basis

---
 hosts/configuration.nix  | 1 +
 hosts/phobos/default.nix | 3 +++
 hosts/vm/default.nix     | 3 +++
 modules/xorg/default.nix | 3 ---
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index cf81bcf..1fe6e28 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -44,6 +44,7 @@
 
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
+  console.useXkbConfig = true; #use same kb settings (layout) as xorg
 
   # Enable CUPS to print documents.
   # services.printing.enable = true;
diff --git a/hosts/phobos/default.nix b/hosts/phobos/default.nix
index c10295f..5790b67 100644
--- a/hosts/phobos/default.nix
+++ b/hosts/phobos/default.nix
@@ -9,6 +9,9 @@
     ./hardware.nix
   ];
 
+  # Configure keymap in X11
+  services.xserver.layout = "gb";
+
   # Pick only one of the below networking options.
   networking = {
     wireless = {
diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix
index cb55ce6..f20f8be 100644
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -9,6 +9,9 @@
     ./hardware.nix
   ];
 
+  # Configure keymap in X11
+  services.xserver.layout = "gb";
+
   # Pick only one of the below networking options.
   networking = {
     # networkmanager.enable = true;  # Easiest to use and most distros use this by default.
diff --git a/modules/xorg/default.nix b/modules/xorg/default.nix
index f75716a..50b070e 100644
--- a/modules/xorg/default.nix
+++ b/modules/xorg/default.nix
@@ -3,9 +3,6 @@
   services.xserver = {
     enable = true;
 
-    # Configure keymap in X11
-    layout = "gb";
-
     displayManager.startx.enable = true;
     windowManager.dwm.enable = true;
 
-- 
cgit 1.4.1