From c2e573441ec7c8b3d0d9b5ad174ae4069e7c6c80 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Mon, 16 Sep 2024 05:51:14 +0300
Subject: [PATCH] Keyd : Rework numbers layer for spreadsheet use
 (numpad-like).

---
 .readme/keyd/number/keyboard-layout.json | 40 +++++++++++-------------
 Readme.md                                |  2 +-
 module/Keyd.nix                          | 33 +++++++++----------
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/.readme/keyd/number/keyboard-layout.json b/.readme/keyd/number/keyboard-layout.json
index ab42be1..405ec07 100644
--- a/.readme/keyd/number/keyboard-layout.json
+++ b/.readme/keyd/number/keyboard-layout.json
@@ -4,10 +4,13 @@
     {
       "c": "#8ec07c"
     },
-    "f13",
-    "f14",
-    "f15",
-    "f16",
+    "=",
+    "/",
+    "*",
+    "-",
+    {
+      "c": "#cccccc"
+    },
     "f17",
     "f18",
     "f19",
@@ -17,7 +20,6 @@
     "f23",
     "f24",
     {
-      "c": "#cccccc",
       "w": 2
     },
     "Backspace"
@@ -30,13 +32,13 @@
     {
       "c": "#8ec07c"
     },
-    "1",
-    "2",
-    "3",
+    "7",
+    "8",
+    "9",
+    "+",
     {
       "c": "#cccccc"
     },
-    "R",
     "T",
     "Y",
     "U",
@@ -61,10 +63,10 @@
     "4",
     "5",
     "6",
+    "Enter",
     {
       "c": "#cccccc"
     },
-    "F",
     "G",
     "H",
     "J",
@@ -73,27 +75,23 @@
     ":\n;",
     "\"\n'",
     {
-      "c": "#8ec07c",
       "w": 2.25
     },
-    "NP Enter"
+    "Enter"
   ],
   [
     {
-      "c": "#cccccc",
+      "c": "#8ec07c",
       "w": 2.25
     },
-    "Shift",
-    {
-      "c": "#8ec07c"
-    },
-    "7",
-    "8",
-    "9",
+    "Backspace",
+    "1",
+    "2",
+    "3",
+    ". (dot)",
     {
       "c": "#cccccc"
     },
-    "V",
     "B",
     "N",
     "M",
diff --git a/Readme.md b/Readme.md
index 558cd08..7c429e1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -94,7 +94,7 @@ Tmux:<br>
 
 <details>
 <summary>Extra numbers</summary>
-<img src="https://i.imgur.com/PW5eGSF.png" />
+<img src="https://i.imgur.com/89ERKd9.png" />
 </details>
 
 <details>
diff --git a/module/Keyd.nix b/module/Keyd.nix
index e9f4c04..b3dba1a 100644
--- a/module/Keyd.nix
+++ b/module/Keyd.nix
@@ -61,29 +61,24 @@ in {
 
 					# Number inputs.
 					layer_number = {
-						q = "1";
-						w = "2";
-						e = "3";
+						q = "7";
+						w = "8";
+						e = "9";
 						a = "4";
 						s = "5";
 						d = "6";
-						z = "7";
-						x = "8";
-						c = "9";
+						z = "1";
+						x = "2";
+						c = "3";
 						space = "0";
-						"1" = "f13";
-						"2" = "f14";
-						"3" = "f15";
-						"4" = "f16";
-						"5" = "f17";
-						"6" = "f18";
-						"7" = "f19";
-						"8" = "f20";
-						"9" = "f21";
-						"0" = "f22";
-						"-" = "f23";
-						"=" = "f24";
-						enter = "kpenter";
+						"1" = "kpequal";
+						"2" = "kpslash";
+						"3" = "kpasterisk";
+						"4" = "kpminus";
+						f = "kpenter";
+						r = "kpplus";
+						v = "kpcomma";
+						shift = "backspace";
 					};
 				};
 			};