shell.nix improvements, and fix problems on Darwin (#9551)

Co-authored-by: Ryan <[email protected]>

keyboards/aos/tkl/config.h

@@ -53,4 +53,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 50
 #endif

keyboards/ghs/rar/keymaps/via/keymap.c

@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN,
         KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_NO,   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
         RGB_TOG,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RESET,

keyboards/ghs/rar/rar.h

@@ -32,7 +32,7 @@
 #define LAYOUT_ansi( \
     k00,     k01, k11, k02, k12,   k03, k13, k04, k14,   k15, k06, k16,  k07,     k17, \
     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,    k36,      k37, \
-    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56,   k47,     k57, \
+    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,   k47,     k57, \
     k60,    k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,     k76,       k77, \
     k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,     k86,    k87,  k97, \
     ka0, kb0, ka1,                 ka3,               ka5,   ka6,      kb6, ka7, kb7 \
@@ -42,8 +42,8 @@
     { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, k22, k23, k24, k25, k26, XXX }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
     { k60, k61, k62, k63, k64, k65, XXX, XXX }, \
     { k70, k71, k72, k73, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87 }, \
@@ -55,7 +55,7 @@
 #define LAYOUT_ansi_wkl( \
     k00,     k01, k11, k02, k12,   k03, k13, k04, k14,   k15, k06, k16,  k07,     k17, \
     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,    k36,      k37, \
-    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56,   k47,     k57, \
+    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,   k47,     k57, \
     k60,    k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,     k76,       k77, \
     k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,     k86,    k87,  k97, \
     ka0,   kb0,                    ka3,               ka5,   ka6,      kb6, ka7, kb7 \
@@ -65,8 +65,8 @@
     { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, k22, k23, k24, k25, k26, XXX }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
     { k60, k61, k62, k63, k64, k65, XXX, XXX }, \
     { k70, k71, k72, k73, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87 }, \
@@ -78,7 +78,7 @@
 #define LAYOUT_iso( \
     k00,     k01, k11, k02, k12,   k03, k13, k04, k14,   k15, k06, k16,  k07,     k17, \
     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,    k36,      k37, \
-    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56,   k47,     k57, \
+    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,   k47,     k57, \
     k60,    k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76,           k77, \
     k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,     k86,    k87,  k97, \
     ka0, kb0, ka1,                 ka3,               ka5,   ka6,      kb6, ka7, kb7 \
@@ -88,8 +88,8 @@
     { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, k22, k23, k24, k25, k26, XXX }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
     { k60, k61, k62, k63, k64, k65, XXX, XXX }, \
     { k70, k71, k72, k73, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87 }, \
@@ -101,7 +101,7 @@
 #define LAYOUT_iso_wkl( \
     k00,     k01, k11, k02, k12,   k03, k13, k04, k14,   k15, k06, k16,  k07,     k17, \
     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,    k36,      k37, \
-    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56,   k47,     k57, \
+    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,   k47,     k57, \
     k60,    k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76,           k77, \
     k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,     k86,    k87,  k97, \
     ka0,   kb0,                    ka3,               ka5,   ka6,      kb6, ka7, kb7 \
@@ -111,8 +111,8 @@
     { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, k22, k23, k24, k25, k26, XXX }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
     { k60, k61, k62, k63, k64, k65, XXX, XXX }, \
     { k70, k71, k72, k73, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87 }, \
@@ -124,7 +124,7 @@
 #define LAYOUT_all( \
     k00,     k01, k11, k02, k12,   k03, k13, k04, k14,   k15, k06, k16,  k07,     k17, \
     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,    k37, \
-    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56,   k47,     k57, \
+    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,   k47,     k57, \
     k60,    k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,     k76,       k77, \
     k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,     k86,    k87,  k97, \
     ka0, kb0, ka1,                 ka3,               ka5, kb5, ka6,   kb6, ka7, kb7 \
@@ -134,8 +134,8 @@
     { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, k22, k23, k24, k25, k26, k27 }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
     { k60, k61, k62, k63, k64, k65, XXX, XXX }, \
     { k70, k71, k72, k73, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87 }, \

keyboards/nightmare/config.h

@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xB00B
+#define VENDOR_ID       0x434B // "CK"
-#define PRODUCT_ID      0x0000
+#define PRODUCT_ID      0x4E49 // "NI"
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    cfbender
 #define PRODUCT         nightmare

keyboards/nightmare/keymaps/via/keymap.c

@@ -0,0 +1,43 @@
+/* Copyright 2019 cfbender
+ *
+ * This program 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, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_split(/* Base */
+        KC_HOME, KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+        KC_END, LCTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
+        KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+        KC_PGDN, KC_LGUI, KC_LALT, KC_LALT, KC_SPACE, KC_SPACE, KC_RGUI, KC_RCTL, MO(2)),
+
+    [1] = LAYOUT_split(
+        _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+    [2] = LAYOUT_split(
+        _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_UP, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+    [3] = LAYOUT_split(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+

keyboards/nightmare/keymaps/via/readme.md

@@ -0,0 +1,3 @@
+# The default keymap for nightmare
+
+![Default Layout](https://imgur.com/G0Hh7F3.png)

keyboards/nightmare/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

quantum/keymap_extras/keymap_us_international.h

@@ -59,7 +59,7 @@
 #define US_O    KC_O    // O
 #define US_P    KC_P    // P
 #define US_LBRC KC_LBRC // [
-#define US_RBRC KC_LBRC // ]
+#define US_RBRC KC_RBRC // ]
 #define US_BSLS KC_BSLS // (backslash)
 // Row 3
 #define US_A    KC_A    // A

shell.nix

@@ -1,21 +1,36 @@
 { avr ? true, arm ? true, teensy ? true }:
 
 let
-  overlay = self: super:
-    let addDarwinSupport = pkg: pkg.overrideAttrs (oldAttrs: {
-      meta.platforms = (oldAttrs.meta.platforms or []) ++ self.lib.platforms.darwin;
-    });
-    in {
-      dfu-programmer = addDarwinSupport super.dfu-programmer;
-      teensy-loader-cli = addDarwinSupport super.teensy-loader-cli;
-    };
-
   nixpkgs = builtins.fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/903266491b7b9b0379e88709feca0af900def0d9.tar.gz";
     sha256 = "1b5wjrfgyha6s15k1yjyx41hvrpmd5szpkpkxk6l5hyrfqsr8wip";
   };
 
-  pkgs = import nixpkgs { overlays = [ overlay ]; };
+  pkgs = import nixpkgs { };
+
+  hjson = with pkgs.python3Packages; buildPythonPackage rec {
+    pname = "hjson";
+    version = "3.0.1";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1yaimcgz8w0ps1wk28wk9g9zdidp79d14xqqj9rjkvxalvx2f5qx";
+    };
+    doCheck = false;
+  };
+
+  pythonEnv = pkgs.python3.withPackages (p: with p; [
+    # requirements.txt
+    appdirs
+    argcomplete
+    colorama
+    hjson
+    # requirements-dev.txt
+    nose2
+    flake8
+    pep8-naming
+    yapf
+  ]);
 in
 
 with pkgs;
@@ -32,10 +47,10 @@ let
     "-L${avrlibc}/avr/lib/avr51"
   ];
 in
-stdenv.mkDerivation {
+mkShell {
   name = "qmk-firmware";
 
-  buildInputs = [ dfu-programmer dfu-util diffutils git python3 ]
+  buildInputs = [ dfu-programmer dfu-util diffutils git pythonEnv ]
     ++ lib.optional avr [
       pkgsCross.avr.buildPackages.binutils
       pkgsCross.avr.buildPackages.gcc8
@@ -47,4 +62,9 @@ stdenv.mkDerivation {
 
   AVR_CFLAGS = lib.optional avr avr_incflags;
   AVR_ASFLAGS = lib.optional avr avr_incflags;
+  shellHook = ''
+    # Prevent the avr-gcc wrapper from picking up host GCC flags
+    # like -iframework, which is problematic on Darwin
+    unset NIX_TARGET_CFLAGS_COMPILE
+  '';
 }