From patchwork Tue Sep 26 19:04:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 54319 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2F5C227BBEA; Tue, 26 Sep 2023 20:39:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,TVD_SPACE_RATIO,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1580827BBE2 for ; Tue, 26 Sep 2023 20:39:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlDtY-0006jL-H1; Tue, 26 Sep 2023 15:38:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qlDtW-0006gH-Ft for guix-patches@gnu.org; Tue, 26 Sep 2023 15:38:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qlDtV-0006Ml-Uq for guix-patches@gnu.org; Tue, 26 Sep 2023 15:38:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlDth-000123-SK; Tue, 26 Sep 2023 15:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66217] [PATCH 11/22] gnu: Add qmk-firmware-ergodox-ez-hacker-dvorak. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2023 19:39:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66217 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66217@debbugs.gnu.org Cc: Maxim Cournoyer , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 66217-submit@debbugs.gnu.org id=B66217.16957571163765 (code B ref 66217); Tue, 26 Sep 2023 19:39:05 +0000 Received: (at 66217) by debbugs.gnu.org; 26 Sep 2023 19:38:36 +0000 Received: from localhost ([127.0.0.1]:49833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlDtD-0000yY-Ga for submit@debbugs.gnu.org; Tue, 26 Sep 2023 15:38:36 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:49657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlDsy-0000ve-HO for 66217@debbugs.gnu.org; Tue, 26 Sep 2023 15:38:21 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-7740c8509c8so557682285a.3 for <66217@debbugs.gnu.org>; Tue, 26 Sep 2023 12:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695757081; x=1696361881; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hFJfrBU3GqRQeDwB9FyK3UooGqM1XQhh7ElRbSvw9qM=; b=iav+wWg6V3jpcYszv5fJN0MaLrEiRKSiIg8i2rvInITDB4q+X24+lPbOMsylGfRoqd DxbLzom+HSF+zODNT+QmLjA6v18ZK8zU1iRlyoWwpZQN8K+cuDwmhFu+0IzQKMf0feSd /urqNQTW+HXUTWygUr485XO+abRdRcacmcqQ5IxvmB5EI1tX9cuJyDrPAiIdEN741d1p nVY6xIwZAp4uxwOr5iuF7K9fQ+w2Uh0dIKWM+Ovd21SZw7VvqVZ/MPnTRRUN0hoQJpiV yUItXR87UQcXf/B/Wd+J0BLDbpNasGzTNou0az5Z6wpHofYLPNcS6ER3CtYLb6dLlBnj zqcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695757081; x=1696361881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hFJfrBU3GqRQeDwB9FyK3UooGqM1XQhh7ElRbSvw9qM=; b=IYi+r51Mg5ZStCy+Zm5MKFsoHyPThTkZlWll1zRoIUkoAIKzg8bPipXCXEVSi76jvD TQfeZE5F2dxpIkTVP1JgWS/3uQg4hJWOWHSbHbBBV9xdKMh0hsQYhcNZZvGYKQDAev+o YIXpCe/PyK7Q2b0UJxD+DCShCsyzg4B3eAQSJMWJx2S3RGZS0H123OKKx21hsdz5M82Q 6L3OqBesfhZpx3V1j9ZGiEjZG2AP6V7Q2KKXb0fbkgW+88ijBOYqjo++VKMcPVauLnQQ i3x7F5jArr96l2TKxVPNRe1feE1yJlhyHCcRj9ZiuT3M8W2R0nvILvQEYaXMWc34/2C3 0iJg== X-Gm-Message-State: AOJu0YxPUhvfQOjp+YJjvdDSh3QhCDrXsH5TC91mndODletOJrrQld1m auYSPjQ+cQMcATWpb3pUD+gIWz8VcM0= X-Google-Smtp-Source: AGHT+IH0PqNWeq2/NCMjGDsYoN5buleDhcXfDm3OUgYvi4nYFWhoy33ySILJLGx2YdMpdCqJ0znPgA== X-Received: by 2002:a05:620a:222a:b0:76f:1f8c:cc1b with SMTP id n10-20020a05620a222a00b0076f1f8ccc1bmr8064245qkh.78.1695757081593; Tue, 26 Sep 2023 12:38:01 -0700 (PDT) Received: from localhost.localdomain (dsl-10-130-229.b2b2c.ca. [72.10.130.229]) by smtp.gmail.com with ESMTPSA id a13-20020a05620a16cd00b0076cbcf8ad3bsm2887595qkn.55.2023.09.26.12.38.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 12:38:01 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 26 Sep 2023 15:04:34 -0400 Message-ID: <3913e3181ace6703af58aed05be334c059e57ef1.1695754731.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm (qmk-firmware-ergodox-ez-hacker-dvorak): New variable. * gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/firmware.scm | 25 ++++++++++++++++++- .../qmk-firmware-fix-hacker-dvorak.patch | 15 +++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch diff --git a/gnu/local.mk b/gnu/local.mk index bfa816d717c..c04c4196cdf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1893,6 +1893,7 @@ dist_patch_DATA = \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quilt-grep-compat.patch \ + %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ %D%/packages/patches/ragel-char-signedness.patch \ diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 22be7ee62dd..6a488d672ff 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1340,7 +1340,9 @@ (define* (make-qmk-firmware/implementation keyboard keymap (file-name (git-file-name "qmk-firmware" version)) (sha256 (base32 - "0s1lcnv7cddpn768p7mrc5bkxhx0ba5p77ya007dnkbk36c33d0w")))) + "0s1lcnv7cddpn768p7mrc5bkxhx0ba5p77ya007dnkbk36c33d0w")) + (patches + (search-patches "qmk-firmware-fix-hacker-dvorak.patch")))) (build-system gnu-build-system) (arguments (list @@ -1444,6 +1446,27 @@ (define-public qmk-firmware-ergodox-ez-dvorak-42-key See the @file{keyboards/atreus/keymaps/dvorak_42_key/keymap.c} source file for the keymap definition.")) +(define-public qmk-firmware-ergodox-ez-hacker-dvorak + (make-qmk-firmware "ergodox_ez" "hacker_dvorak" #:description "\ +This is a Dvorak layout for the ErgoDox EZ. It is inspired by the +@url{https://www.kaufmann.no/roland/dvorak, Programmer Dvorak}. The operating +system keyboard layout should be set to US for this keymap to function +normally. It defines 10 layers: +@enumerate +@item Dvorak +@item Querty +@item Gaming +@item Arrows +@item Mouse +@item Numpad +@item Hyper Fn +@item Media Fn +@item Meh Fn +@item Meh Fn + +@end enumerate +The complete keymap can be inspected at the ErgoDox EZ Configurator web site: +@url{https://configure.ergodox-ez.com/ergodox-ez/layouts/Wadz/latest/0}.")) + (define-public qmk-udev-rules (package (inherit qmk-firmware-ergodox-ez-default) diff --git a/gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch b/gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch new file mode 100644 index 00000000000..69e68cc8e12 --- /dev/null +++ b/gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch @@ -0,0 +1,15 @@ +Submitted upstream: https://github.com/qmk/qmk_firmware/pull/22102 + +diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c +index bd4fd10ad1..5ce5f5298f 100644 +--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c ++++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c +@@ -4,7 +4,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { + + switch (layer) { + case DVORAK: +- rgblight_sethsv_noeeprom(GREEN); ++ rgblight_sethsv_noeeprom(HSV_GREEN); + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + + if (PLOVER_MODE) {