summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-10-04 16:31:36 +0200
committerAlan Pearce2019-10-04 16:31:46 +0200
commit40aab9ce6874a9d60319058c24b475ff67adf88e (patch)
tree08bae0a40531cb0dedcc7eec1aca0231f6aa2b1b
parent5d859b419e1e1a850cd160e05d98bda3fd9883ea (diff)
downloadnixfiles-40aab9ce6874a9d60319058c24b475ff67adf88e.tar.lz
nixfiles-40aab9ce6874a9d60319058c24b475ff67adf88e.tar.zst
nixfiles-40aab9ce6874a9d60319058c24b475ff67adf88e.zip
Merge duplicate xkbOptions definitions
-rw-r--r--system/modules/hardware/qwerty.nix2
-rw-r--r--system/modules/services/xserver.nix1
2 files changed, 1 insertions, 2 deletions
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; [