From 2d4d2f58de43b9614df29807eabb5fc856a6630a Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Wed, 8 May 2024 15:22:30 +0300
Subject: [PATCH] lib: unwrap special keys in shift, ctrl, meta and super mods

---
 lib/mod.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/mod.nix b/lib/mod.nix
index 8d539bb..76b1699 100644
--- a/lib/mod.nix
+++ b/lib/mod.nix
@@ -2,15 +2,16 @@
 
 let
   inherit (builtins) listToAttrs;
-  inherit (lib) nameValuePair;
+  inherit (lib) nameValuePair removePrefix removeSuffix;
 
   wrap = val: "<${val}>";
+  unwrap = val: removePrefix "<" (removeSuffix ">" val);
 
   char = num: wrap "Char-${num}"; # map a character by its decimal, octal or hexadecimal number
-  shift = key: wrap "S-${key}"; #	shift-key			*shift* *<S-*
-  ctrl = key: wrap "C-${key}"; #		control-key			*control* *ctrl* *<C-*
-  meta = key: wrap "M-${key}"; #	alt-key or meta-key		*META* *ALT* *<M-*
-  super = key: wrap "D-${key}"; # command-key or "super" key	*<D-*
+  shift = key: wrap "S-${unwrap key}"; #	shift-key			*shift* *<S-*
+  ctrl = key: wrap "C-${unwrap key}"; #		control-key			*control* *ctrl* *<C-*
+  meta = key: wrap "M-${unwrap key}"; #	alt-key or meta-key		*META* *ALT* *<M-*
+  super = key: wrap "D-${unwrap key}"; # command-key or "super" key	*<D-*
 
   keys = listToAttrs (map (v: nameValuePair v (wrap v)) (
     [