From ab8c99f7875592b29f4b6c3edccf8fda512299f4 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 16 Mar 2020 10:05:41 +0100
Subject: keyboard: use qwerty,norman

---
 system/prefect.nix                    | 2 +-
 system/satoshipad.nix                 | 2 +-
 system/settings/hardware/keyboard.nix | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 system/settings/hardware/keyboard.nix

(limited to 'system')

diff --git a/system/prefect.nix b/system/prefect.nix
index f3afd852..0300f2c6 100644
--- a/system/prefect.nix
+++ b/system/prefect.nix
@@ -14,7 +14,7 @@
     ./settings/hardware/mouse.nix
     ./settings/hardware/systemd-boot.nix
     ./settings/hardware/nvidia-gpu.nix
-    ./settings/hardware/qwerty.nix
+    ./settings/hardware/keyboard.nix
     ./settings/hardware/trezor.nix
     ./settings/services/zeroconf.nix
     ./settings/user-interface.nix
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
index a6b20e35..b4eeef6f 100644
--- a/system/satoshipad.nix
+++ b/system/satoshipad.nix
@@ -18,7 +18,7 @@
     ./settings/hardware/systemd-boot.nix
     ./settings/hardware/keyboardio-model01.nix
     ./settings/hardware/network-manager.nix
-    ./settings/hardware/qwerty.nix
+    ./settings/hardware/keyboard.nix
     ./settings/hardware/printing.nix
     ./settings/hardware/trackball.nix
     ./settings/hardware/trezor.nix
diff --git a/system/settings/hardware/keyboard.nix b/system/settings/hardware/keyboard.nix
new file mode 100644
index 00000000..5a0ea5f4
--- /dev/null
+++ b/system/settings/hardware/keyboard.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  services.xserver = {
+    layout = "us,us";
+    xkbVariant = "intl-unicode,norman";
+    xkbOptions = "altwin:prtsc_rwin,caps:escape,grp:shifts_toggle";
+  };
+}
-- 
cgit 1.4.1