feat: add Halo65 keys support

mishamyrt · Mar 19, 2024 · c25b56d · c25b56d
1 parent fc34a7c
commit c25b56d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog][],
 and this project adheres to [Semantic Versioning][].
 
+## 2.2.0-beta1
+
+### Added
+
+- Initial support for Halo65 keys configuration.
+
 ## [2.1.1]
 
 ### Fixed

diff --git a/frontend/src/entities/keys/lib/layouts/halo65.ts b/frontend/src/entities/keys/lib/layouts/halo65.ts
@@ -3,18 +3,18 @@ import type { KeyboardLayout } from '../../model/types'
 export const Halo65: KeyboardLayout = [
   [
     { code: 'esc', color: 'mint' },
-    { code: 'num1' },
-    { code: 'num2' },
-    { code: 'num3' },
-    { code: 'num4' },
-    { code: 'num5' },
-    { code: 'num6' },
-    { code: 'num7' },
-    { code: 'num8' },
-    { code: 'num9' },
-    { code: 'num0' },
-    { code: 'minus' },
-    { code: 'equal' },
+    { code: 'num1', secondaryCode: 'fn_num1' },
+    { code: 'num2', secondaryCode: 'fn_num2' },
+    { code: 'num3', secondaryCode: 'fn_num3' },
+    { code: 'num4', secondaryCode: 'fn_num4' },
+    { code: 'num5', secondaryCode: 'fn_num5' },
+    { code: 'num6', secondaryCode: 'fn_num6' },
+    { code: 'num7', secondaryCode: 'fn_num7' },
+    { code: 'num8', secondaryCode: 'fn_num8' },
+    { code: 'num9', secondaryCode: 'fn_num9' },
+    { code: 'num0', secondaryCode: 'fn_num0' },
+    { code: 'minus', secondaryCode: 'fn_minus' },
+    { code: 'equal', secondaryCode: 'fn_equal' },
     { code: 'backspace', color: 'dark', width: 2 },
     { code: 'del', color: 'dark' }
   ],
@@ -60,9 +60,9 @@ export const Halo65: KeyboardLayout = [
     { code: 'b' },
     { code: 'n' },
     { code: 'm' },
-    { code: '<' },
-    { code: '>' },
-    { code: '/' },
+    { code: 'comma' },
+    { code: 'period' },
+    { code: 'fwdslash' },
     { code: 'rshift', color: 'dark', width: 1.75 },
     { code: 'up', color: 'dark' },
     { code: 'end', color: 'dark' }
@@ -73,7 +73,7 @@ export const Halo65: KeyboardLayout = [
     { code: 'lmeta', color: 'dark', width: 1.25 },
     { code: 'space', color: 'yellow', width: 6.25 },
     { code: 'rmeta', color: 'dark', width: 1.25 },
-    { code: 'fn', color: 'dark', width: 1.25 },
+    { code: 'fn', color: 'dark', width: 1.25, readonly: true },
     { width: 0.5 },
     { code: 'left', color: 'dark' },
     { code: 'down', color: 'dark' },

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.21.4
 
 require (
 	github.com/jpillora/overseer v1.1.6
-	github.com/mishamyrt/nuga-lib v0.5.8
+	github.com/mishamyrt/nuga-lib v0.6.1
 	github.com/wailsapp/wails/v2 v2.8.0
 )
 
@@ -39,7 +39,7 @@ require (
 	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
 	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 )
 

diff --git a/go.sum b/go.sum
@@ -44,8 +44,8 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mishamyrt/nuga-lib v0.5.8 h1:8pRNVyB5NqAprXWTn6tdcuY0RCBbZoWnWuE1mthoLUc=
-github.com/mishamyrt/nuga-lib v0.5.8/go.mod h1:Zvch+eplvbZyH0ubJSIV9bWoSDLJtbjOiuwu/YEPsYA=
+github.com/mishamyrt/nuga-lib v0.6.1 h1:QqAf4j5O366PSoFWZKexP03AAu7nK2tSrDfD+bIoprY=
+github.com/mishamyrt/nuga-lib v0.6.1/go.mod h1:Zvch+eplvbZyH0ubJSIV9bWoSDLJtbjOiuwu/YEPsYA=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -97,8 +97,8 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=