From 7d81e2997e129689465cda08c982918887cc0cd5 Mon Sep 17 00:00:00 2001
From: fbt <fbt@fleshless.org>
Date: Mon, 29 Jan 2018 05:30:51 +0300
Subject: [PATCH] ?

Signed-off-by: fbt <fbt@fleshless.org>
---
 PKGBUILD   |  2 ++
 ducky-mini | 48 ++++++++++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index d37248f..0c5038c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,3 +15,5 @@ package() {
 }
 
 sha1sums=('41648191bde2fd0e8dbb6bbe729a98381425d318')
+sha1sums=('0128e991bb1b5a6e9732aca48fb52df3a7d2d291')
+sha1sums=('a470f6a8647d75a4829fa2c15b0b802c97983aa6')
diff --git a/ducky-mini b/ducky-mini
index fefe1e5..b861bbd 100644
--- a/ducky-mini
+++ b/ducky-mini
@@ -5,25 +5,26 @@ xkb_symbols "us" {
 	include "us(basic)"
 	include "ducky-mini(common)"
 
+	# Numbers row
+	key <TLDE> { [ Escape, asciitilde, grave ] };
 	key <AE02> { [ 2, at, F2 ] };
 	key <AE03> { [ 3, numbersign, F3 ] };
 	key <AE04> { [ 4, dollar, F4 ] };
 	key <AE06> { [ 6, asciicircum, F6 ] };
 	key <AE07> { [ 7, ampersand, F7 ] };
 
-	key <AD09> { [ o, O, Up ] };
-	key <AC08> { [ k, K, Left ] };
-	key <AC09> { [ l, L, Down ] };
-	key <AC10> { [ semicolon, colon, Right ] };
-
-	key <AC07> { [ j, J, Prior ] };
-	key <AB07> { [ m, M, Next ] };
-
-	key <AB08> { [ comma, less, Home ] };
-	key <AB09> { [ period, greater, End ] };
+	# Navigational keys
+	key <AD10> { [ p, P, Up ] };
+	key <AC09> { [ l, L, Left ] };
+	key <AC10> { [ semicolon, colon, Down ] };
+	key <AC11> { [ apostrophe, quotedbl. Right ] };
+	key <AC08> { [ k, K, Prior ] };
+	key <AB08> { [ comma, less, Next ] };
+	key <AB09> { [ period, greater, Home ] };
+	key <AB10> { [ slash, question, End ] };
 
+	# Insert
 	key <BKSL> { [ backslash, bar, Insert ] };
-	key <TLDE> { [ Escape, asciitilde, grave ] };
 };
 
 partial alphanumeric_keys
@@ -33,31 +34,33 @@ xkb_symbols "ru" {
 	include "ru(winkeys)"
 	include "ducky-mini(common)"
 
+	# Number row
+	key <TLDE> { [ Escape, Cyrillic_IO, Cyrillic_io ] };
 	key <AE02> { [ 2, quotedbl, F2 ] };
 	key <AE03> { [ 3, numerosign, F3 ] };
 	key <AE04> { [ 4, semicolon, F4 ] };
 	key <AE06> { [ 6, colon, F6 ] };
 	key <AE07> { [ 7, question, F7 ] };
 
-	key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA, Up ] };
-
-	key <AC07> { [ Cyrillic_o, Cyrillic_O, Prior ] };
-	key <AC08> { [ Cyrillic_el, Cyrillic_EL, Left ] };
-	key <AC09> { [ Cyrillic_de, Cyrillic_DE, Down ] };
-	key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, Right ] };
-
-	key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, Next ] };
-	key <AB08> { [ Cyrillic_be, Cyrillic_BE, Home ] };
-	key <AB09> { [ Cyrillic_yu, Cyrillic_YU, End ] };
+	# Navigational keys
+	key <AD10> { [ Cyrillic_ze,  Cyrillic_ZE,  Up  ] };
+	key <AC09> { [ Cyrillic_de,  Cyrillic_DE,  Left ] };
+	key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, Down ] };
+	key <AC11> { [ Cyrillic_e,   Cyrillic_E,   Right ] };
+	key <AC08> { [ Cyrillic_el, Cyrillic_EL, Prior ] };
+	key <AB08> { [ Cyrillic_be, Cyrillic_BE, Next ] };
+	key <AB09> { [ Cyrillic_yu, Cyrillic_YU, Home ] };
+	key <AB10> { [ period, comma, End ] };
 
+	# Insert
 	key <BKSL> { [ backslash, slash, Insert ] };
-	key <TLDE> { [ Escape, Cyrillic_IO, Cyrillic_io ] };
 };
 
 hidden partial alphanumeric_keys
 xkb_symbols "common" {
 	name[Group1]= "Common (layout mimicking the Ducky Mini)";
 	
+	# Number row
 	key <AE01> { [ 1, exclam, F1 ] };
 	key <AE05> { [ 5, percent, F5 ] };
 	key <AE08> { [ 8, asterisk, F8 ] };
@@ -66,5 +69,6 @@ xkb_symbols "common" {
 	key <AE11> { [ minus, underscore, F11 ] };
 	key <AE12> { [ equal, plus, F12 ] };
 
+	# Delete
 	key <BKSP> { [ BackSpace, BackSpace, Delete ] };
 };