about summary refs log tree commit diff
path: root/users/glittershark/keyboard
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2021-04-11T21·53-0400
committerglittershark <grfn@gws.fyi>2021-04-12T14·45+0000
commit6266c5d32f9ff651fcfc3a4cc0c68e89da56ca65 (patch)
tree5be3967585787c4456e17cb29423770217fdcede /users/glittershark/keyboard
parent968effb5dc1a4617a0dceaffc70e986abe300c6e (diff)
refactor(users/glittershark): Rename to grfn r/2485
Rename my //users directory and all places that refer to glittershark to
grfn, including nix references and documentation.

This may require some extra attention inside of gerrit's database after
it lands to allow me to actually push things.

Change-Id: I4728b7ec2c60024392c1c1fa6e0d4a59b3e266fa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2933
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'users/glittershark/keyboard')
-rw-r--r--users/glittershark/keyboard/.gitignore1
-rw-r--r--users/glittershark/keyboard/README.org10
-rw-r--r--users/glittershark/keyboard/default.nix63
-rwxr-xr-xusers/glittershark/keyboard/flash2
-rw-r--r--users/glittershark/keyboard/increase-tapping-delay.patch13
-rw-r--r--users/glittershark/keyboard/keymap.c206
6 files changed, 0 insertions, 295 deletions
diff --git a/users/glittershark/keyboard/.gitignore b/users/glittershark/keyboard/.gitignore
deleted file mode 100644
index b2be92b7db01..000000000000
--- a/users/glittershark/keyboard/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-result
diff --git a/users/glittershark/keyboard/README.org b/users/glittershark/keyboard/README.org
deleted file mode 100644
index b085883a1049..000000000000
--- a/users/glittershark/keyboard/README.org
+++ /dev/null
@@ -1,10 +0,0 @@
-This repository contains the source of the keyboard layout for my Ergodox EZ,
-plus build tooling based on Nix.
-
-To flash to an Ergodox EZ that's connected to your computer via USB, run:
-
-#+BEGIN_SRC shell
-./flash
-#+END_SRC
-
-then press the reset switch on the keyboard.
diff --git a/users/glittershark/keyboard/default.nix b/users/glittershark/keyboard/default.nix
deleted file mode 100644
index 7e004860672a..000000000000
--- a/users/glittershark/keyboard/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ pkgs, ... }:
-
-with pkgs;
-
-let avrlibc = pkgsCross.avr.libcCross; in
-
-rec {
-  qmkSource = fetchgit {
-    url = "https://github.com/qmk/qmk_firmware";
-    rev = "ab1650606c36f85018257aba65d9c3ff8ec42e71";
-    sha256 = "1k59flkvhjzmfl0yz9z37lqhvad7m9r5wy1p1sjk5274rsmylh79";
-    fetchSubmodules = true;
-  };
-
-  layout = stdenv.mkDerivation rec {
-    name = "ergodox_ez_grfn.hex";
-
-    src = qmkSource;
-
-    buildInputs = [
-      dfu-programmer
-      dfu-util
-      diffutils
-      git
-      python3
-      pkgsCross.avr.buildPackages.binutils
-      pkgsCross.avr.buildPackages.gcc8
-      avrlibc
-      avrdude
-    ];
-
-    AVR_CFLAGS = [
-      "-isystem ${avrlibc}/avr/include"
-      "-L${avrlibc}/avr/lib/avr5"
-    ];
-
-    AVR_ASFLAGS = AVR_CFLAGS;
-
-    patches = [ ./increase-tapping-delay.patch ];
-
-    postPatch = ''
-      mkdir keyboards/ergodox_ez/keymaps/grfn
-      cp ${./keymap.c} keyboards/ergodox_ez/keymaps/grfn/keymap.c
-    '';
-
-    buildPhase = ''
-      make ergodox_ez:grfn
-    '';
-
-    installPhase = ''
-      cp ergodox_ez_grfn.hex $out
-    '';
-  };
-
-  flash = writeShellScript "flash.sh" ''
-    ${teensy-loader-cli}/bin/teensy-loader-cli \
-      -v \
-      --mcu=atmega32u4 \
-      -w ${layout}
-  '';
-
-  meta.targets = [ "layout" ];
-}
diff --git a/users/glittershark/keyboard/flash b/users/glittershark/keyboard/flash
deleted file mode 100755
index efc89463c84b..000000000000
--- a/users/glittershark/keyboard/flash
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-exec "$(nix-build --no-out-link ../../.. -A users.glittershark.keyboard.flash)"
diff --git a/users/glittershark/keyboard/increase-tapping-delay.patch b/users/glittershark/keyboard/increase-tapping-delay.patch
deleted file mode 100644
index 316c435fed6c..000000000000
--- a/users/glittershark/keyboard/increase-tapping-delay.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
-index ae70c4f2e..776110c09 100644
---- a/keyboards/ergodox_ez/config.h
-+++ b/keyboards/ergodox_ez/config.h
-@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- /* define if matrix has ghost */
- //#define MATRIX_HAS_GHOST
- 
--#define TAPPING_TERM    200
-+#define TAPPING_TERM    150
- #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
- 
- /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/users/glittershark/keyboard/keymap.c b/users/glittershark/keyboard/keymap.c
deleted file mode 100644
index fbb28c9aac59..000000000000
--- a/users/glittershark/keyboard/keymap.c
+++ /dev/null
@@ -1,206 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-
-#include "keymap_german.h"
-
-#include "keymap_nordic.h"
-
-
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD,
-
-  EX_PIPE, // |>
-  THIN_ARROW, // ->
-  FAT_ARROW, // =>
-};
-
-
-
-#define LAMBDA UC(0x03BB)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT_ergodox(
-      KC_EQUAL,       KC_1,           KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
-      KC_TAB,         KC_Q,           KC_W,   KC_E,   KC_R,   KC_T,   KC_LALT,
-      KC_ESCAPE,      KC_A,           KC_S,   KC_D,   KC_F,   KC_G,
-      KC_RSFT,        CTL_T(KC_Z),    KC_X,   KC_C,   KC_V,   KC_B,   KC_TAB,
-      LT(1,KC_GRAVE), KC_QUOTE,       LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,
-                                        ALT_T(KC_APPLICATION),      LAMBDA,
-                                                                    KC_LBRACKET,
-                                        GUI_T(KC_NO), LSFT_T(KC_BSPACE),    KC_COLN,
-
-      KC_MY_COMPUTER, KC_6,   KC_7,   KC_8,       KC_9,       KC_0,               KC_MINUS,
-      KC_RALT,      KC_Y,   KC_U,   KC_I,       KC_O,       KC_P,               KC_BSLASH,
-                    KC_H,   KC_J,   KC_K,       KC_L,       LT(2,KC_SCOLON),    LT(1,KC_QUOTE),
-      KC_MINUS,     KC_N,   KC_M,   KC_COMMA,   KC_DOT,     CTL_T(KC_SLASH),    KC_RSFT,
-                    KC_DOWN,KC_UP,  KC_LBRACKET,KC_RBRACKET,MO(1),
-
-      KC_PAUSE,  TG(3),
-      KC_RBRACKET,
-      KC_COLN,  RSFT_T(KC_ENTER),   KC_SPACE
-   ),
-
-  [1] = LAYOUT_ergodox(
-      KC_ESCAPE,        KC_F1,          KC_F2,          KC_F3,          KC_F4,      KC_F5,          KC_TRANSPARENT,
-      KC_TRANSPARENT,   KC_EXLM,        KC_AT,          KC_LCBR,        KC_RCBR,    KC_PIPE,        KC_RABK,
-      KC_TRANSPARENT,   KC_HASH,        KC_DLR,         KC_LPRN,        KC_RPRN,    KC_UNDERSCORE,
-      KC_LABK,          KC_PERC,          KC_CIRC,        KC_LBRACKET,    KC_RBRACKET,    KC_TILD,    KC_TRANSPARENT,
-      KC_TRANSPARENT,   KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                        RGB_MOD,  KC_TRANSPARENT,
-                                                                  KC_TRANSPARENT,
-                                                        RGB_VAD,    RGB_VAI, EX_PIPE,
-
-      KC_TRANSPARENT,   KC_F6,          KC_F7,          KC_F8,          KC_F9,      KC_F10,         KC_F11,
-      KC_PGUP,          KC_UP,          KC_7,           KC_8,           KC_9,       KC_ASTR,        KC_F12,
-                        KC_DOWN,        KC_4,           KC_5,           KC_6,       KC_PLUS,        KC_TRANSPARENT,
-      KC_PGDOWN,        KC_AMPR,        KC_1,           KC_2,           KC_3,       KC_BSLASH,      KC_TRANSPARENT,
-                                        KC_TRANSPARENT, KC_DOT,         KC_0,       KC_EQUAL,       KC_TRANSPARENT,
-      RGB_TOG,          RGB_SLD,
-      THIN_ARROW,
-      EX_PIPE,          RGB_HUD,    RGB_HUI
-  ),
-
-  [2] = LAYOUT_ergodox(
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_UP,       KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_LEFT,     KC_MS_DOWN,     KC_MS_RIGHT,    KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_BTN1,     KC_MS_BTN2,
-                                                       KC_TRANSPARENT,                 KC_TRANSPARENT,
-                                                                                       KC_TRANSPARENT,
-                                                       KC_MS_BTN1,     KC_MS_BTN2,     KC_TRANSPARENT,
-
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,    KC_TRANSPARENT,      KC_TRANSPARENT,      KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,    KC_TRANSPARENT,      KC_TRANSPARENT,      KC_TRANSPARENT, KC_TRANSPARENT,
-                      KC_TRANSPARENT, KC_MS_WH_DOWN,     KC_MS_WH_UP,         KC_TRANSPARENT,      KC_TRANSPARENT, KC_MEDIA_PLAY_PAUSE,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,    KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_TRANSPARENT, KC_TRANSPARENT,
-                                      KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP,     KC_AUDIO_MUTE,       KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_WWW_BACK),
-
-  // FPS layout
-  [3] = LAYOUT_ergodox(
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                      KC_TRANSPARENT,           KC_TRANSPARENT,
-                                                                                KC_TRANSPARENT,
-                                                      KC_SPACE, KC_TRANSPARENT, KC_TRANSPARENT,
-
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      KC_TRANSPARENT, KC_TRANSPARENT,
-                      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      KC_TRANSPARENT, KC_TRANSPARENT,
-                                      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      KC_TRANSPARENT, KC_TRANSPARENT,
-      KC_TRANSPARENT, TG(3),
-      KC_TRANSPARENT,
-      KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT),
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-  [1] = ACTION_LAYER_TAP_TOGGLE(1)
-};
-
-// leaving this in place for compatibilty with old keymaps cloned and re-compiled.
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        rgblight_mode(1);
-      }
-      return false;
-      break;
-    case EX_PIPE:
-      if (record->event.pressed) {
-        SEND_STRING ( "|> " );
-      }
-      return false;
-      break;
-    case THIN_ARROW:
-      if (record->event.pressed) {
-        SEND_STRING ( "-> " );
-      }
-      return false;
-      break;
-
-
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {
-
-    uint8_t layer = biton32(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case 5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        case 6:
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        case 7:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-    }
-
-};