dvorak-progcaps makes capslock esc

3 files changed, 101 insertions, 1 deletions

diff --git a/mod.sh b/mod.sh
index 83bf360..244d8fc 100755
--- a/mod.sh
+++ b/mod.sh
@@ -2,3 +2,4 @@
 export TMP=`mktemp`
 sed 's/supplicant-%I/supplicant/g' /usr/lib/systemd/system/wpa_supplicant@.service > $TMP
 mv $TMP /usr/lib/systemd/system/wpa_supplicant@.service
+gzip /usr/share/kbd/keymaps/i386/dvorak-progcaps.map
diff --git a/regional.sh b/regional.sh
index 868a08e..31978be 100755
--- a/regional.sh
+++ b/regional.sh
@@ -2,7 +2,7 @@
 ln -sf /usr/share/zoneinfo/US/Eastern /etc/localtime
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
 echo -e "en_US.UTF-8 UTF-8\nen_US ISO-8859-1" > /etc/locale.gen
-echo "KEYMAP=dvorak-programmer" > /etc/vconsole.conf
+echo "KEYMAP=dvorak-progcaps" > /etc/vconsole.conf
 export HOST="bruh-moment"
 echo $HOST > /etc/hostname
 echo -e "127.0.0.1\tlocalhost\n::1\tlocalhost\n127.0.1.1\t$HOST.localdomain\t$HOST" > /etc/hosts
diff --git a/src/usr/share/kbd/keymaps/i386/dvorak/dvorak-progcaps.map b/src/usr/share/kbd/keymaps/i386/dvorak/dvorak-progcaps.map
new file mode 100644
index 0000000..9fe5dec
--- /dev/null
+++ b/src/usr/share/kbd/keymaps/i386/dvorak/dvorak-progcaps.map
@@ -0,0 +1,99 @@
+! Programmer Dvorak keymap
+!
+!   Original from: http://www.kaufmann.no/roland/dvorak/
+!   This file edited by: Merlin Dou (11 March 2014)
+!
+! This file is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License
+! along with this program; if not, write to the Free Software
+! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+!
+keymaps 0-2,4-6,8-9,12
+alt_is_meta
+include "linux-with-two-alt-keys.inc"
+strings as usual
+! --------------------------------------------------------------------------
+! Row 1
+! --------------------------------------------------------------------------
+keycode   1 = Escape
+! --------------------------------------------------------------------------
+! Row 2
+! --------------------------------------------------------------------------
+keycode  41 = dollar         asciitilde
+keycode   2 = ampersand      percent
+keycode   3 = bracketleft    seven
+keycode   4 = braceleft      five
+keycode   5 = braceright     three
+keycode   6 = parenleft      one
+keycode   7 = equal          nine
+keycode   8 = asterisk       zero
+keycode   9 = parenright     two
+keycode  10 = plus           four
+keycode  11 = bracketright   six
+keycode  12 = exclam         eight
+keycode  13 = numbersign     grave
+keycode  14 = Delete
+! --------------------------------------------------------------------------
+! Row 3
+! --------------------------------------------------------------------------
+keycode  15 = Tab
+keycode  16 = semicolon      colon
+keycode  17 = comma          less
+keycode  18 = period         greater
+keycode  19 = p
+keycode  20 = y
+keycode  21 = f
+keycode  22 = g
+keycode  23 = c
+keycode  24 = r
+keycode  25 = l
+keycode  26 = slash          question
+keycode  27 = at             asciicircum
+keycode  28 = Return
+! --------------------------------------------------------------------------
+! Row 4
+! --------------------------------------------------------------------------
+keycode  58 = Escape
+keycode  30 = a
+keycode  31 = o
+keycode  32 = e
+keycode  33 = u
+keycode  34 = i
+keycode  35 = d
+keycode  36 = h
+keycode  37 = t
+keycode  38 = n
+keycode  39 = s
+keycode  40 = minus          underscore
+keycode  43 = backslash      bar
+! --------------------------------------------------------------------------
+! Row 5
+! --------------------------------------------------------------------------
+keycode  42 = Shift
+keycode  44 = apostrophe     quotedbl
+keycode  45 = q
+keycode  46 = j
+keycode  47 = k
+keycode  48 = x
+keycode  49 = b
+keycode  50 = m
+keycode  51 = w
+keycode  52 = v
+keycode  53 = z
+keycode  54 = Shift
+! --------------------------------------------------------------------------
+! Row 6
+! --------------------------------------------------------------------------
+keycode  29 = Control
+keycode  56 = Alt
+keycode  57 = space
+keycode  97 = Control