summary refs log tree commit diff stats
path: root/system/modules
diff options
context:
space:
mode:
authorAlan Pearce2019-10-04 19:45:25 +0200
committerAlan Pearce2019-10-04 19:45:25 +0200
commit88937aa1a2eaad74946fe3eaf3ea5d2ff51ab027 (patch)
treeb29ca7c00d9048ce4b6eeecc6756eb970d01e49c /system/modules
parent9ad3e8ffd82fd8d681be90dea70e5c0c643afa65 (diff)
downloadnixfiles-88937aa1a2eaad74946fe3eaf3ea5d2ff51ab027.tar.lz
nixfiles-88937aa1a2eaad74946fe3eaf3ea5d2ff51ab027.tar.zst
nixfiles-88937aa1a2eaad74946fe3eaf3ea5d2ff51ab027.zip
Simplify console keyboard config by using Xkb config
Diffstat (limited to 'system/modules')
-rw-r--r--system/modules/hardware/qwerty.nix9
-rw-r--r--system/modules/services/xserver.nix2
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