From 3b51c35515bfa8a74cbe6437465d8a9263b106a5 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 8 Mar 2018 18:39:19 +0100
Subject: Use US intl layout for QWERTY

---
 modules/hardware/qwerty.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hardware/qwerty.nix b/modules/hardware/qwerty.nix
index 3783b3a9..d220cb27 100644
--- a/modules/hardware/qwerty.nix
+++ b/modules/hardware/qwerty.nix
@@ -4,11 +4,13 @@
     extraConfig = ''
       xkb-model=pc104
       xkb-layout=us
+      xkb-variant=intl-unicode
       xkb-options="altwin:prtsc_rwin"
     '';
   };
   services.xserver = {
     layout = "us";
+    xkbVariant = "intl-unicode";
     xkbOptions = "altwin:prtsc_rwin";
   };
 }
-- 
cgit 1.4.1


From 267a09991b8344356f307f3bc8bc84cc5fff0884 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 8 Mar 2018 18:40:17 +0100
Subject: marvin: use qwerty

---
 marvin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/marvin.nix b/marvin.nix
index df798d49..62a0b660 100644
--- a/marvin.nix
+++ b/marvin.nix
@@ -12,7 +12,7 @@
     ./modules/development/lisp.nix
     ./modules/hardware/adb.nix
     ./modules/hardware/audio.nix
-    ./modules/hardware/colemak.nix
+    ./modules/hardware/qwerty.nix
     ./modules/hardware/network-manager.nix
     ./modules/hardware/nitrokey.nix
     ./modules/hardware/systemd-boot.nix
-- 
cgit 1.4.1


From 0326d3a143e58601300504608cca8af5a92b176f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 8 Mar 2018 18:40:28 +0100
Subject: kde: force-disable physlock

---
 modules/programs/kde.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/kde.nix b/modules/programs/kde.nix
index e9d99fd6..652eb2a6 100644
--- a/modules/programs/kde.nix
+++ b/modules/programs/kde.nix
@@ -10,6 +10,8 @@ with lib;
         sddm.enable = true;
       };
     };
+
+    physlock.enable = lib.mkForce false;
   };
 
   environment.systemPackages = with pkgs; [
-- 
cgit 1.4.1


From 404f3ad2d3a8bd5961c4e55ae621f87e40f9c7dc Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 8 Mar 2018 18:40:40 +0100
Subject: marvin: try KDE

---
 marvin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/marvin.nix b/marvin.nix
index 62a0b660..92ba5db4 100644
--- a/marvin.nix
+++ b/marvin.nix
@@ -22,6 +22,7 @@
     ./modules/programs/accounting.nix
     ./modules/programs/dotfiles.nix
     ./modules/programs/i3.nix
+    ./modules/programs/kde.nix
     ./modules/programs/infrastructure.nix
     ./modules/programs/passwords.nix
     ./modules/programs/shell.nix
-- 
cgit 1.4.1