From 40aab9ce6874a9d60319058c24b475ff67adf88e Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 4 Oct 2019 16:31:36 +0200
Subject: Merge duplicate xkbOptions definitions

---
 system/modules/hardware/qwerty.nix  | 2 +-
 system/modules/services/xserver.nix | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'system')

diff --git a/system/modules/hardware/qwerty.nix b/system/modules/hardware/qwerty.nix
index d220cb27..85a0056e 100644
--- a/system/modules/hardware/qwerty.nix
+++ b/system/modules/hardware/qwerty.nix
@@ -11,6 +11,6 @@
   services.xserver = {
     layout = "us";
     xkbVariant = "intl-unicode";
-    xkbOptions = "altwin:prtsc_rwin";
+    xkbOptions = "altwin:prtsc_rwin,caps:escape";
   };
 }
diff --git a/system/modules/services/xserver.nix b/system/modules/services/xserver.nix
index 15a45eed..80ed6a3a 100644
--- a/system/modules/services/xserver.nix
+++ b/system/modules/services/xserver.nix
@@ -4,7 +4,6 @@
     enable = true;
     enableCtrlAltBackspace = true;
     exportConfiguration = true;
-    xkbOptions = "caps:escape";
   };
 
   environment.systemPackages = with pkgs; [
-- 
cgit 1.4.1