From 88937aa1a2eaad74946fe3eaf3ea5d2ff51ab027 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 4 Oct 2019 19:45:25 +0200
Subject: Simplify console keyboard config by using Xkb config

---
 system/modules/hardware/qwerty.nix  | 9 +--------
 system/modules/services/xserver.nix | 2 ++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/system/modules/hardware/qwerty.nix b/system/modules/hardware/qwerty.nix
index 85a0056e..c967d561 100644
--- a/system/modules/hardware/qwerty.nix
+++ b/system/modules/hardware/qwerty.nix
@@ -1,13 +1,6 @@
 { config, pkgs, ... }:
 
-{ services.kmscon = {
-    extraConfig = ''
-      xkb-model=pc104
-      xkb-layout=us
-      xkb-variant=intl-unicode
-      xkb-options="altwin:prtsc_rwin"
-    '';
-  };
+{
   services.xserver = {
     layout = "us";
     xkbVariant = "intl-unicode";
diff --git a/system/modules/services/xserver.nix b/system/modules/services/xserver.nix
index 80ed6a3a..f20afd8d 100644
--- a/system/modules/services/xserver.nix
+++ b/system/modules/services/xserver.nix
@@ -6,6 +6,8 @@
     exportConfiguration = true;
   };
 
+  i18n.consoleUseXkbConfig = true;
+
   environment.systemPackages = with pkgs; [
     xorg.xmodmap
     xorg.xinit
-- 
cgit 1.4.1