From 365f6f780add5b16ce194a3a8d3fca511eb9eabc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 21 Jun 2022 19:34:55 +0200
Subject: [PATCH] feat(xkeymap): set options in kb-* scripts

---
 configs/keyboard.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/keyboard.nix b/configs/keyboard.nix
index 1d12eaa..b0a6a7a 100644
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -4,6 +4,7 @@
   ...
 }: let
   commaSep = builtins.concatStringsSep ",";
+  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
   languages = {
     de = "T3";
     gr = "polytonic";
@@ -19,7 +20,7 @@ in {
     # buckwalter: http://www.qamus.org/transliteration.htm
     xkbVariant = "T3";
     xkbOptions =
-      commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
+      commaSep xkbOptions;
     libinput.enable = true;
   };
 
@@ -29,7 +30,7 @@ in {
     lib.mapAttrsToList
     (language: variant:
       pkgs.writers.writeDashBin "kb-${language}" ''
-        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant}
+        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
       '')
     languages;