Fix swap-hands to cover outer columns

flake.lock

@@ -2,15 +2,17 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708118438,
-        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
-        "path": "/nix/store/bg5fbkfa5x53clcjf4p5p92k1l3w8x38-source",
-        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
-        "type": "path"
+        "lastModified": 1767366107,
+        "narHash": "sha256-xW+NPcKsmSj8Gg4qBKhmV5/fHU57E8SwoZjqGVvu2yo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b49a5346c419b4aaa421f96529c05fa70469acc3",
+        "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -1,4 +1,5 @@
 {
+  inputs.nixpkgs.url = "github:nixos/nixpkgs";
   outputs = {
     self,
     nixpkgs,
@@ -11,48 +12,16 @@
           pkgs = nixpkgs.legacyPackages.${sys};
         });
   in {
-    packages = eachSystem ({
-      sys,
-      pkgs,
-    }: rec {
-      python3 = pkgs.python3.override {
-        packageOverrides = final: prev: {
-          milc = prev.milc.overrideAttrs {
-            patches = [
-              # Logs pre-initialization give long exceptions without this - they try to write directly to str('/dev/null')
-              # This effects every `qmk` command post-userspaces, as they have an import-time 'find the userspace' operation
-              # that logs in several different substeps
-              # I have *no* idea how noone else has run into this at all, but I can't find any mention of it as an issue anywhere
-              (pkgs.writeText "patch" ''
-                diff --git a/milc/__init__.py b/milc/__init__.py
-                index b3e7158..4f2843e 100644
-                --- a/milc/__init__.py
-                +++ b/milc/__init__.py
-                @@ -39,7 +39,7 @@ if 'MILC_IGNORE_DEPRECATED' not in os.environ:
-                         if name in os.environ:
-                             warnings.warn(f'Using {name} is deprecated and will not be supported in the future, please use set_metadata() instead.', stacklevel=2)
-
-                -logging.basicConfig(stream=os.devnull)  # Disable logging until we can configure it how the user wants
-                +logging.basicConfig(filename=os.devnull)  # Disable logging until we can configure it how the user wants
-
-                 cli = MILC(APP_NAME, APP_VERSION, APP_AUTHOR)
-              '')
-            ];
-          };
-        };
-      };
-
-      qmk = pkgs.qmk.override {inherit python3;};
-    });
     devShells = eachSystem ({
       sys,
       pkgs,
     }: {
       default = pkgs.mkShell {
         packages = with pkgs; [
-          self.packages.${sys}.qmk
+          qmk
           clang
           clang-tools
+          dos2unix
         ];
         shellHook = ''
           export QMK_HOME=$PWD/qmk_firmware

keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c

@@ -15,6 +15,24 @@
  */
 #include QMK_KEYBOARD_H
 
+#undef OS_LSFT
+#undef OS_LCTL
+#undef OS_LALT
+#undef OS_LGUI
+
+// clang-format off
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}},
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}},
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}, {6, 6}},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}, {6, 7}},
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}},
+};
+// clang-format on
+
 enum keycodes {
     OS_LSFT = SAFE_RANGE,
     OS_LCTL,
@@ -42,7 +60,6 @@ enum layers {
 #define C_RET C(KC_ENTER)
 /* TODO:
  *   - Mouse Keys?
- *   - Swap hand keys?
  */
 
 // clang-format off
@@ -50,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_TYPE] = LAYOUT(
        XXXXXXX,  KC_Q,     KC_W,    KC_F,    KC_P,    KC_B,                                        KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_RCTL,
         KC_TAB,  KC_A,     KC_R,    KC_S,    KC_T,    KC_G,                                        KC_M,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
-       XXXXXXX,  KC_Z,     KC_X,    KC_C,    KC_D,    KC_V,  QK_REP,     NUM,     FUN, QK_AREP,    KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+       XXXXXXX,  KC_Z,     KC_X,    KC_C,    KC_D,    KC_V,   SH_OS,     NUM,     FUN,   SH_OS,    KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
                                  XXXXXXX, XXXXXXX, OS_LSFT,  KC_ENT,     SYM,     NAV,  KC_SPC,  KC_ESC, KC_RGUI, KC_RALT
     ),
     [_NAV] = LAYOUT(
@@ -87,8 +104,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // clang-format on
 
 void keyboard_pre_init_user(void) {
-    setPinOutput(24);
-    writePinHigh(24);
+    gpio_set_pin_output(24);
+    gpio_write_pin_high(24);
 }
 
 typedef enum {

keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk

@@ -1,2 +1,2 @@
 CONVERT_TO = liatris
-REPEAT_KEY_ENABLE = yes
+SWAP_HANDS_ENABLE = yes