From 3968832c2d9d7b69b097ac424b0a124d92426483 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 15 Apr 2021 09:33:50 -0500
Subject: [PATCH] Some cleanup, add a makefile for simplicity, and add F* keys

---
 zorne/config/corne.keymap      | 34 +++++++++++++++++-----------------
 zorne/{flash.sh => flash.fish} |  0
 zorne/makefile                 |  9 +++++++++
 3 files changed, 26 insertions(+), 17 deletions(-)
 rename zorne/{flash.sh => flash.fish} (100%)
 create mode 100644 zorne/makefile

diff --git a/zorne/config/corne.keymap b/zorne/config/corne.keymap
index b1e286f..57b503a 100644
--- a/zorne/config/corne.keymap
+++ b/zorne/config/corne.keymap
@@ -44,44 +44,44 @@
       >;
     };
     left_layer {
-      // --------------------------------------   --------------------------------------
-      // |  ~  |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  | BKSP |
-      // |     |     |     |     |     |     |   |     |  _  |  +  |  {  |  }  | "|"  |
-      // |     |     |     |     |     |     |   |     |     |  <  |  >  |  ?  |      | // TODO: Fix this row when &mkp is committed
-      // ------------------|     |     |     |   | ADJ | ENT |     |-------------------
+      // --------------------------------------   ------------------------------------
+      // |  ~  |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  |     |
+      // |     |     |     |     |     |     |   |     |  _  |  +  |  {  |  }  | "|" |
+      // |     |     |     |     |     |     |   |     |     |  <  |  >  |  ?  |     | // TODO: Fix this row when &mkp is committed
+      // ------------------|     |     |     |   | ADJ | ENT |     |------------------
       //                   -------------------   -------------------
       bindings = <
-        &kp TILDE &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR &kp RPAR  &kp BSPC
+        &kp TILDE &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR &kp RPAR  &trans
         &trans    &trans   &trans &trans   &trans   &trans      &trans    &kp UNDER &kp PLUS        &kp LBRC &kp RBRC  &kp PIPE
         &trans    &trans   &trans &trans   &trans   &trans      &trans    &trans    &kp LT          &kp GT   &kp QMARK &kp TILDE
                                       &trans &trans &trans      &mo 3 &kp RET &trans
       >;
     };
     right_layer {
-      // --------------------------------------   --------------------------------------
-      // |  `  |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | BKSP |
-      // |     |     |     |     |     |     |   |     |  -  |  =  |  [  |  ]  |  \   |
-      // |     |     |     |     |     |     |   |     | INS |     |     |     |      |
-      // ------------------|     | ALT | ADJ |   |     |     |     |-------------------
+      // --------------------------------------   ------------------------------------
+      // |  `  |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | DEL |
+      // | F1  | F2  | F3  | F4  | F5  | F6  |   |     |  -  |  =  |  [  |  ]  |  \  |
+      // | F7  | F8  | F9  | F10 | F11 | F12 |   |     | INS |     |     |     |     |
+      // ------------------|     | ALT | ADJ |   |     |     |     |------------------
       //                   -------------------   -------------------
       bindings = <
-        &kp GRAV &kp N1 &kp N2 &kp N3 &kp N4 &kp N5   &kp N6 &kp N7    &kp N8    &kp N9   &kp N0   &kp BSPC
-        &trans   &trans &trans &trans &trans &trans   &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH
-        &trans   &trans &trans &trans &trans &trans   &trans &kp INS   &trans    &trans   &trans   &trans
-                              &trans &kp LALT &mo 3   &trans &trans &trans
+        &kp GRAV &kp N1 &kp N2 &kp N3  &kp N4  &kp N5    &kp N6 &kp N7    &kp N8    &kp N9   &kp N0   &kp DEL
+        &kp F1   &kp F2 &kp F3 &kp F4  &kp F5  &kp F6    &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH
+        &kp F7   &kp F8 &kp F9 &kp F10 &kp F11 &kp F12   &trans &kp INS   &trans    &trans   &trans   &trans
+                                 &trans &kp LALT &mo 3   &trans &trans &trans
       >;
     };
     adjust_layer {
       // -------------------------------------   -------------------------------------
       // |     | LCL | MSU | RCL | MWU |     |   | MNX | MVD | MPL | MVU | MPV |     | // TODO: once mouse keys exist
       // |     | MSL | MSD | MSR | MWD | USB |   | LFT | DWN |  UP | RGT |     |     | // TODO: once mouse keys exist
-      // |CONFG| BT1 | BT2 | BT3 | BT4 | BT5 |   |     |     |     |     |     |     |
+      // |CONFG| BT1 | BT2 | BT3 | BT4 | BT5 |   | HOM | PGD | PGU | END |     |     |
       // ------------------|     |     |     |   |     |     |     |------------------
       //                   -------------------   -------------------
       bindings = <
         &trans &trans       &trans       &trans       &trans       &trans         &kp C_NEXT &kp C_VOL_DN &kp K_PP &kp C_VOL_UP &kp C_PREV &trans
         &trans &trans       &trans       &trans       &trans       &out OUT_USB   &kp LEFT   &kp DOWN     &kp UP   &kp RIGHT    &trans     &trans
-        &mo 4  &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4   &trans     &trans       &trans   &trans       &trans     &trans
+        &mo 4  &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4   &kp HOME   &kp PGDN     &kp PGUP &kp END      &trans     &trans
                                                            &trans &trans &trans   &trans &trans &trans
       >;
     };
diff --git a/zorne/flash.sh b/zorne/flash.fish
similarity index 100%
rename from zorne/flash.sh
rename to zorne/flash.fish
diff --git a/zorne/makefile b/zorne/makefile
new file mode 100644
index 0000000..457c5d2
--- /dev/null
+++ b/zorne/makefile
@@ -0,0 +1,9 @@
+.PHONY: build
+build:
+	@fish build.fish
+
+flash-left:
+	@sudo fish flash.fish /dev/disk/by-label/NICENANO ./build/corne_left_nice_nano.uf2
+
+flash-right:
+	@sudo fish flash.fish /dev/disk/by-label/NICENANO ./build/corne_right_nice_nano.uf2