refactor: use gnu stow to manage qmk symlinks

EdenEast · Oct 31, 2023 · 62e6fe0 · 62e6fe0
1 parent c39839c
commit 62e6fe0
Show file tree

Hide file tree

Showing 53 changed files with 250 additions and 27 deletions.
diff --git a/flake.nix b/flake.nix
@@ -65,6 +65,7 @@
             just
             keymap-drawer
             qmk
+            stow
             watchexec
           ];
 

diff --git a/justfile b/justfile
@@ -15,6 +15,9 @@ alias f := flash
 alias l := layout
 alias w := watch-layout
 
+stow:
+  stow -d {{justfile_directory()}}/qmk -t {{justfile_directory()}}/firmware .
+
 # Build all keyboards
 all:
     @just dm4
@@ -111,40 +114,18 @@ right keyboard:
 # Setup submodule and link directories to submodules
 init:
     #!/usr/bin/env bash
-    git config submodule.firmware.ignore all
     git submodule update --init --recursive --recommend-shallow
-    if [ ! -L "{{user_symlink}}" ] ; then
-        ln -sf $(pwd)/user {{user_symlink}}
-    fi
-    if [ ! -L "{{dm4_symlink}}" ] ; then
-        ln -sf $(pwd)/keyboard/dm/4x6 {{dm4_symlink}}
-    fi
-    if [ ! -L "{{dm5_symlink}}" ] ; then
-        ln -sf $(pwd)/keyboard/dm/5x6 {{dm5_symlink}}
-    fi
-    if [ ! -L "{{crkbd_symlink}}" ] ; then
-        ln -sf $(pwd)/keyboard/crkbd {{crkbd_symlink}}
-    fi
-    if [ ! -L "{{tofu_symlink}}" ] ; then
-        ln -sf $(pwd)/keyboard/tofu {{tofu_symlink}}
+    stow -d {{justfile_directory()}}/qmk -t {{justfile_directory()}}/firmware .
+    if [ $(git config submodule.firmware.ignore) != "all" ]; then
+      git config submodule.firmware.ignore all
     fi
     if [ "$(qmk config user.qmk_home | cut -d '=' -f 2)" != "{{justfile_directory()}}/firmware" ]; then
       qmk config user.qmk_home="{{justfile_directory()}}/firmware"
     fi
 
-# Re-initialize symlinks
-reinit:
-    #!/usr/bin/env bash
-    rm -rf {{user_symlink}}
-    rm -rf {{dm4_symlink}}
-    rm -rf {{dm5_symlink}}
-    rm -rf {{crkbd_symlink}}
-    rm -rf {{tofu_symlink}}
-    just init
-
 # Format c files
 fmt:
-    clang-format --style=llvm -i $(fd --exclude firmware --exclude user/features --extension c --extension h .)
+    clang-format --style=llvm -i $(fd --exclude firmware --exclude qmk/users/edeneast/features --extension c --extension h .)
 
 # Generate layout map
 layout:
@@ -176,7 +157,7 @@ qmk-update:
     git submodule update --init --recursive --recommend-shallow
     popd
     git add -f ./firmware
-    just reinit
+    just init
 
 # Update features subtree
 subtree-update:

diff --git a/keyboard/crkbd/config.h → ...keyboards/crkbd/keymaps/edeneast/config.h b/keyboard/crkbd/config.h → ...keyboards/crkbd/keymaps/edeneast/config.h
diff --git a/keyboard/crkbd/keymap.c → ...keyboards/crkbd/keymaps/edeneast/keymap.c b/keyboard/crkbd/keymap.c → ...keyboards/crkbd/keymaps/edeneast/keymap.c
diff --git a/keyboard/crkbd/rules.mk → ...keyboards/crkbd/keymaps/edeneast/rules.mk b/keyboard/crkbd/rules.mk → ...keyboards/crkbd/keymaps/edeneast/rules.mk
diff --git a/keyboard/tofu/keymap.c → qmk/keyboards/dz60/keymaps/edeneast/keymap.c b/keyboard/tofu/keymap.c → qmk/keyboards/dz60/keymaps/edeneast/keymap.c
diff --git a/keyboard/tofu/readme.md → ...keyboards/dz60/keymaps/edeneast/readme.md b/keyboard/tofu/readme.md → ...keyboards/dz60/keymaps/edeneast/readme.md
diff --git a/keyboard/dm/4x6/config.h → ...yl_manuform/4x6/keymaps/edeneast/config.h b/keyboard/dm/4x6/config.h → ...yl_manuform/4x6/keymaps/edeneast/config.h
diff --git a/keyboard/dm/4x6/keymap.c → ...yl_manuform/4x6/keymaps/edeneast/keymap.c b/keyboard/dm/4x6/keymap.c → ...yl_manuform/4x6/keymaps/edeneast/keymap.c
diff --git a/keyboard/dm/4x6/rules.mk → ...yl_manuform/4x6/keymaps/edeneast/rules.mk b/keyboard/dm/4x6/rules.mk → ...yl_manuform/4x6/keymaps/edeneast/rules.mk
diff --git a/keyboard/dm/4x6/swap_hand.c → ...manuform/4x6/keymaps/edeneast/swap_hand.c b/keyboard/dm/4x6/swap_hand.c → ...manuform/4x6/keymaps/edeneast/swap_hand.c
diff --git a/qmk/keyboards/handwired/dactyl_manuform/4x6/via.json b/qmk/keyboards/handwired/dactyl_manuform/4x6/via.json
@@ -0,0 +1,112 @@
+{
+  "name": "Dactyl Manuform 4x6",
+  "vendorId": "0x444D",
+  "productId": "0x3436",
+  "matrix": {
+    "rows": 10,
+    "cols": 6
+  },
+  "layouts": {
+    "keymap": [
+      [
+        "0,0",
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        {
+          "x": 3.5
+        },
+        "5,0",
+        "5,1",
+        "5,2",
+        "5,3",
+        "5,4",
+        "5,5"
+      ],
+      [
+        "1,0",
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        {
+          "x": 3.5
+        },
+        "6,0",
+        "6,1",
+        "6,2",
+        "6,3",
+        "6,4",
+        "6,5"
+      ],
+      [
+        "2,0",
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        {
+          "x": 3.5
+        },
+        "7,0",
+        "7,1",
+        "7,2",
+        "7,3",
+        "7,4",
+        "7,5"
+      ],
+      [
+        {
+          "x": 2
+        },
+        "3,2",
+        "3,3",
+        {
+          "x": 7.5
+        },
+        "8,2",
+        "8,3"
+      ],
+      [
+        {
+          "x": 4
+        },
+        "3,4",
+        "3,5",
+        {
+          "x": 3.5
+        },
+        "8,0",
+        "8,1"
+      ],
+      [
+        {
+          "x": 5
+        },
+        "4,4",
+        "4,5",
+        {
+          "x": 1.5
+        },
+        "9,0",
+        "9,1"
+      ],
+      [
+        {
+          "x": 5
+        },
+        "4,2",
+        "4,3",
+        {
+          "x": 1.5
+        },
+        "9,2",
+        "9,3"
+      ]
+    ]
+  }
+}
diff --git a/keyboard/dm/5x6/config.h → ...yl_manuform/5x6/keymaps/edeneast/config.h b/keyboard/dm/5x6/config.h → ...yl_manuform/5x6/keymaps/edeneast/config.h
diff --git a/keyboard/dm/5x6/keymap.c → ...yl_manuform/5x6/keymaps/edeneast/keymap.c b/keyboard/dm/5x6/keymap.c → ...yl_manuform/5x6/keymaps/edeneast/keymap.c
diff --git a/keyboard/dm/5x6/rules.mk → ...yl_manuform/5x6/keymaps/edeneast/rules.mk b/keyboard/dm/5x6/rules.mk → ...yl_manuform/5x6/keymaps/edeneast/rules.mk
diff --git a/keyboard/dm/5x6/swap_hand.c → ...manuform/5x6/keymaps/edeneast/swap_hand.c b/keyboard/dm/5x6/swap_hand.c → ...manuform/5x6/keymaps/edeneast/swap_hand.c
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6/via.json b/qmk/keyboards/handwired/dactyl_manuform/5x6/via.json
@@ -0,0 +1,129 @@
+{
+  "name": "Dactyl Manuform 5x6",
+  "vendorId": "0x444D",
+  "productId": "0x3436",
+  "matrix": {
+    "rows": 12,
+    "cols": 6
+  },
+  "layouts": {
+    "keymap": [
+      [
+        "0,0",
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        {
+          "x": 3.5
+        },
+        "6,0",
+        "6,1",
+        "6,2",
+        "6,3",
+        "6,4",
+        "6,5"
+      ],
+      [
+        "1,0",
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        {
+          "x": 3.5
+        },
+        "7,0",
+        "7,1",
+        "7,2",
+        "7,3",
+        "7,4",
+        "7,5"
+      ],
+      [
+        "2,0",
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        {
+          "x": 3.5
+        },
+        "8,0",
+        "8,1",
+        "8,2",
+        "8,3",
+        "8,4",
+        "8,5"
+      ],
+      [
+        "3,0",
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        {
+          "x": 3.5
+        },
+        "9,0",
+        "9,1",
+        "9,2",
+        "9,3",
+        "9,4",
+        "9,5"
+      ],
+      [
+        {
+          "x": 2
+        },
+        "4,2",
+        "4,3",
+        {
+          "x": 7.5
+        },
+        "10,2",
+        "10,3"
+      ],
+      [
+        {
+          "x": 4
+        },
+        "4,4",
+        "4,5",
+        {
+          "x": 3.5
+        },
+        "10,0",
+        "10,1"
+      ],
+      [
+        {
+          "x": 5
+        },
+        "5,4",
+        "5,5",
+        {
+          "x": 1.5
+        },
+        "11,0",
+        "11,1"
+      ],
+      [
+        {
+          "x": 5
+        },
+        "5,2",
+        "5,3",
+        {
+          "x": 1.5
+        },
+        "11,2",
+        "11,3"
+      ]
+    ]
+  }
+}
diff --git a/keyboard/dm/reference.md → ...ds/handwired/dactyl_manuform/reference.md b/keyboard/dm/reference.md → ...ds/handwired/dactyl_manuform/reference.md
diff --git a/user/combos.c → qmk/users/edeneast/combos.c b/user/combos.c → qmk/users/edeneast/combos.c
diff --git a/user/config.h → qmk/users/edeneast/config.h b/user/config.h → qmk/users/edeneast/config.h
diff --git a/user/dances.c → qmk/users/edeneast/dances.c b/user/dances.c → qmk/users/edeneast/dances.c
diff --git a/user/dances.h → qmk/users/edeneast/dances.h b/user/dances.h → qmk/users/edeneast/dances.h
diff --git a/user/edeneast.c → qmk/users/edeneast/edeneast.c b/user/edeneast.c → qmk/users/edeneast/edeneast.c
diff --git a/user/edeneast.h → qmk/users/edeneast/edeneast.h b/user/edeneast.h → qmk/users/edeneast/edeneast.h
diff --git a/user/features/achordion.c → qmk/users/edeneast/features/achordion.c b/user/features/achordion.c → qmk/users/edeneast/features/achordion.c
diff --git a/user/features/achordion.h → qmk/users/edeneast/features/achordion.h b/user/features/achordion.h → qmk/users/edeneast/features/achordion.h
diff --git a/user/features/autocorrection.c → qmk/users/edeneast/features/autocorrection.c b/user/features/autocorrection.c → qmk/users/edeneast/features/autocorrection.c
diff --git a/user/features/autocorrection.h → qmk/users/edeneast/features/autocorrection.h b/user/features/autocorrection.h → qmk/users/edeneast/features/autocorrection.h
diff --git a/user/features/autocorrection_data.h → ...s/edeneast/features/autocorrection_data.h b/user/features/autocorrection_data.h → ...s/edeneast/features/autocorrection_data.h
diff --git a/user/features/autocorrection_dict.txt → ...edeneast/features/autocorrection_dict.txt b/user/features/autocorrection_dict.txt → ...edeneast/features/autocorrection_dict.txt
diff --git a/user/features/autocorrection_dict_extra.txt → ...st/features/autocorrection_dict_extra.txt b/user/features/autocorrection_dict_extra.txt → ...st/features/autocorrection_dict_extra.txt
diff --git a/user/features/caps_word.c → qmk/users/edeneast/features/caps_word.c b/user/features/caps_word.c → qmk/users/edeneast/features/caps_word.c
diff --git a/user/features/caps_word.h → qmk/users/edeneast/features/caps_word.h b/user/features/caps_word.h → qmk/users/edeneast/features/caps_word.h
diff --git a/user/features/custom_shift_keys.c → ...ers/edeneast/features/custom_shift_keys.c b/user/features/custom_shift_keys.c → ...ers/edeneast/features/custom_shift_keys.c
diff --git a/user/features/custom_shift_keys.h → ...ers/edeneast/features/custom_shift_keys.h b/user/features/custom_shift_keys.h → ...ers/edeneast/features/custom_shift_keys.h
diff --git a/user/features/layer_lock.c → qmk/users/edeneast/features/layer_lock.c b/user/features/layer_lock.c → qmk/users/edeneast/features/layer_lock.c
diff --git a/user/features/layer_lock.h → qmk/users/edeneast/features/layer_lock.h b/user/features/layer_lock.h → qmk/users/edeneast/features/layer_lock.h
diff --git a/user/features/make_autocorrection_data.py → ...east/features/make_autocorrection_data.py b/user/features/make_autocorrection_data.py → ...east/features/make_autocorrection_data.py
diff --git a/user/features/mouse_turbo_click.c → ...ers/edeneast/features/mouse_turbo_click.c b/user/features/mouse_turbo_click.c → ...ers/edeneast/features/mouse_turbo_click.c
diff --git a/user/features/mouse_turbo_click.h → ...ers/edeneast/features/mouse_turbo_click.h b/user/features/mouse_turbo_click.h → ...ers/edeneast/features/mouse_turbo_click.h
diff --git a/user/features/repeat_key.c → qmk/users/edeneast/features/repeat_key.c b/user/features/repeat_key.c → qmk/users/edeneast/features/repeat_key.c
diff --git a/user/features/repeat_key.h → qmk/users/edeneast/features/repeat_key.h b/user/features/repeat_key.h → qmk/users/edeneast/features/repeat_key.h
diff --git a/user/features/select_word.c → qmk/users/edeneast/features/select_word.c b/user/features/select_word.c → qmk/users/edeneast/features/select_word.c
diff --git a/user/features/select_word.h → qmk/users/edeneast/features/select_word.h b/user/features/select_word.h → qmk/users/edeneast/features/select_word.h
diff --git a/user/features/sentence_case.c → qmk/users/edeneast/features/sentence_case.c b/user/features/sentence_case.c → qmk/users/edeneast/features/sentence_case.c
diff --git a/user/features/sentence_case.h → qmk/users/edeneast/features/sentence_case.h b/user/features/sentence_case.h → qmk/users/edeneast/features/sentence_case.h
diff --git a/user/oled.c → qmk/users/edeneast/oled.c b/user/oled.c → qmk/users/edeneast/oled.c
diff --git a/user/os_detect.c → qmk/users/edeneast/os_detect.c b/user/os_detect.c → qmk/users/edeneast/os_detect.c
diff --git a/user/os_detect.h → qmk/users/edeneast/os_detect.h b/user/os_detect.h → qmk/users/edeneast/os_detect.h
diff --git a/user/process_records.c → qmk/users/edeneast/process_records.c b/user/process_records.c → qmk/users/edeneast/process_records.c
diff --git a/user/process_records.h → qmk/users/edeneast/process_records.h b/user/process_records.h → qmk/users/edeneast/process_records.h
diff --git a/user/rules.mk → qmk/users/edeneast/rules.mk b/user/rules.mk → qmk/users/edeneast/rules.mk
diff --git a/user/wrappers.h → qmk/users/edeneast/wrappers.h b/user/wrappers.h → qmk/users/edeneast/wrappers.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,7 @@ @@
                 just
                 keymap-drawer
                 qmk
+                stow
                 watchexec
               ];
@@ Expand Down @@