diff --git a/README.md b/README.md index 84a5f8c..60fd55c 100644 --- a/README.md +++ b/README.md @@ -178,8 +178,8 @@ nix run github:shajra/shajra-keyboards#flash-ergodoxez Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap) ================================================================= - FLASH SOURCE: /nix/store/6z72fw22n203axzdl6f7fgsdrx3xmv9b-qmk-builtin-shajra-src - FLASH BINARY: /nix/store/0ixf6x2gy32xxirc67062iwip5sdi0gz-ergodoxez-builtin-shajra.hex + FLASH SOURCE: /nix/store/48ydvv28a9dd97qs953gwbz7j33abpyd-qmk-builtin-shajra-src + FLASH BINARY: /nix/store/450djgw5n8q4dw2vbdjd26b5cxadjdlh-ergodoxez-builtin-shajra.hex ⠋ Press the reset button of your keyboard @@ -240,11 +240,11 @@ If you want to check that everything builds before flashing your keyboard, you c tree $(nix build --no-link --print-out-paths) 2>/dev/null ``` - /nix/store/wchbyp897ncjfkh269qpf9610pxlzc6h-shajra-keyboards-ci - ├── build-ergodoxez-builtin-shajra-flash -> /nix/store/2r6s1lzlaqwdnaqis9lg9fihr23fvcm8-ergodoxez-builtin-shajra-flash - ├── build-ergodoxez-builtin-shajra-hex -> /nix/store/0ixf6x2gy32xxirc67062iwip5sdi0gz-ergodoxez-builtin-shajra.hex - ├── build-ergodoxez-factory-flash -> /nix/store/2vhkr6dpyhdi2c0i0vmjjigpal7p9j61-ergodoxez-factory-flash - ├── build-ergodoxez-factory-hex -> /nix/store/bck1agrsq0d5iwcaka4n4dlkbv8xz80f-ergodoxez-factory.hex + /nix/store/amxh7z22p8frbs2zzyf8cll8c4amhpaz-shajra-keyboards-ci + ├── build-ergodoxez-builtin-shajra-flash -> /nix/store/ky9aajizkp9czv2v523zhklb8jfhb44n-ergodoxez-builtin-shajra-flash + ├── build-ergodoxez-builtin-shajra-hex -> /nix/store/450djgw5n8q4dw2vbdjd26b5cxadjdlh-ergodoxez-builtin-shajra.hex + ├── build-ergodoxez-factory-flash -> /nix/store/44c0x85pp31bp7sbcg939rc1h4yd2n2i-ergodoxez-factory-flash + ├── build-ergodoxez-factory-hex -> /nix/store/9y7cf1l618qd7c9mrip1xy7ybkc6q055-ergodoxez-factory.hex ├── build-model01-builtin-shajra-flash -> /nix/store/c8h6f7h6bwil5irlja8ar2yvfd66wgr9-model01-builtin-shajra-flash ├── build-model01-builtin-shajra-hex -> /nix/store/1r99jri5yhmx8xk6k6a6g07xwzd425wl-model01-builtin-shajra-hex ├── build-model01-factory-flash -> /nix/store/0aq1fv3na7xczf44vqvlck15fpkgl5zs-model01-factory-flash @@ -253,15 +253,15 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null ├── build-model100-builtin-shajra-hex -> /nix/store/rwnlh5rv6ymq17yzmqzk6ks35y2521k7-model100-builtin-shajra-hex ├── build-model100-factory-flash -> /nix/store/464h1fs4lwb2czy32knhcf4jmn8i02yb-model100-factory-flash ├── build-model100-factory-hex -> /nix/store/2n6ccvybhmzappc3hfgkz91wdq51zf29-model100-factory-hex - ├── build-moonlander-builtin-shajra-flash -> /nix/store/1g8m7qcdf0v5l3z5j9mz4m7n673prg01-moonlander-builtin-shajra-flash - ├── build-moonlander-builtin-shajra-hex -> /nix/store/64rlbjpf5a7xdabijlhhyxpngk91srrj-moonlander-builtin-shajra.bin - ├── build-moonlander-factory-flash -> /nix/store/y4dmc272byzs08cjjf1l4brljnb0ndj1-moonlander-factory-flash - ├── build-moonlander-factory-hex -> /nix/store/hb8dc6n5myrdcag83b36bi726s7rqsbx-moonlander-factory.bin - ├── flash-ergodoxez -> /nix/store/cpw5mmysb40lxmd2lkmkc2yhgxir27wk-flash-ergodoxez - ├── flash-model01 -> /nix/store/21phfn7y7iaymwmrkq4jlcxc8d8nj5jf-flash-model01 - ├── flash-model100 -> /nix/store/0gs9w2k678h8i24za1vyzf4a53vwlizn-flash-model100 - ├── flash-moonlander -> /nix/store/in9crdrvsgaql2swaw7gkxyiwvz03hxx-flash-moonlander - └── licenses -> /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses + ├── build-moonlander-builtin-shajra-flash -> /nix/store/qk3jncf2li8sknfapw6yy3nmj5jb3p7a-moonlander-builtin-shajra-flash + ├── build-moonlander-builtin-shajra-hex -> /nix/store/266v0bgjq64gwj2vxjyyxd7lwair3zxd-moonlander-builtin-shajra.bin + ├── build-moonlander-factory-flash -> /nix/store/6w85y9j49nz3pf3zj6i97ispcwjcp9j8-moonlander-factory-flash + ├── build-moonlander-factory-hex -> /nix/store/mn04m93bn6mwyqk3bl9clzppljh9nliq-moonlander-factory.bin + ├── flash-ergodoxez -> /nix/store/9s9i0avg72r858lxdmlwmpa4gir3c7mq-flash-ergodoxez + ├── flash-model01 -> /nix/store/wsasdjcqph36qvsq5kwq65qqxc578f8c-flash-model01 + ├── flash-model100 -> /nix/store/4viv2v8izzbn8py98a1dkmv7qjk51id8-flash-model100 + ├── flash-moonlander -> /nix/store/hgag8qb3x6zhiw9522cis83714c0mm2p-flash-moonlander + └── licenses -> /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses 18 directories, 4 files diff --git a/README.org b/README.org index c2f4692..247819c 100644 --- a/README.org +++ b/README.org @@ -209,8 +209,8 @@ head -c350 < <(./flash-ergodoxez) | ansifilter : Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap) : ================================================================= : -: FLASH SOURCE: /nix/store/6z72fw22n203axzdl6f7fgsdrx3xmv9b-qmk-builtin-shajra-src -: FLASH BINARY: /nix/store/0ixf6x2gy32xxirc67062iwip5sdi0gz-ergodoxez-builtin-shajra.hex +: FLASH SOURCE: /nix/store/48ydvv28a9dd97qs953gwbz7j33abpyd-qmk-builtin-shajra-src +: FLASH BINARY: /nix/store/450djgw5n8q4dw2vbdjd26b5cxadjdlh-ergodoxez-builtin-shajra.hex : : ⠋ Press the reset button of your keyboard @@ -305,11 +305,11 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null #+results: nix-build #+begin_example -/nix/store/wchbyp897ncjfkh269qpf9610pxlzc6h-shajra-keyboards-ci -├── build-ergodoxez-builtin-shajra-flash -> /nix/store/2r6s1lzlaqwdnaqis9lg9fihr23fvcm8-ergodoxez-builtin-shajra-flash -├── build-ergodoxez-builtin-shajra-hex -> /nix/store/0ixf6x2gy32xxirc67062iwip5sdi0gz-ergodoxez-builtin-shajra.hex -├── build-ergodoxez-factory-flash -> /nix/store/2vhkr6dpyhdi2c0i0vmjjigpal7p9j61-ergodoxez-factory-flash -├── build-ergodoxez-factory-hex -> /nix/store/bck1agrsq0d5iwcaka4n4dlkbv8xz80f-ergodoxez-factory.hex +/nix/store/amxh7z22p8frbs2zzyf8cll8c4amhpaz-shajra-keyboards-ci +├── build-ergodoxez-builtin-shajra-flash -> /nix/store/ky9aajizkp9czv2v523zhklb8jfhb44n-ergodoxez-builtin-shajra-flash +├── build-ergodoxez-builtin-shajra-hex -> /nix/store/450djgw5n8q4dw2vbdjd26b5cxadjdlh-ergodoxez-builtin-shajra.hex +├── build-ergodoxez-factory-flash -> /nix/store/44c0x85pp31bp7sbcg939rc1h4yd2n2i-ergodoxez-factory-flash +├── build-ergodoxez-factory-hex -> /nix/store/9y7cf1l618qd7c9mrip1xy7ybkc6q055-ergodoxez-factory.hex ├── build-model01-builtin-shajra-flash -> /nix/store/c8h6f7h6bwil5irlja8ar2yvfd66wgr9-model01-builtin-shajra-flash ├── build-model01-builtin-shajra-hex -> /nix/store/1r99jri5yhmx8xk6k6a6g07xwzd425wl-model01-builtin-shajra-hex ├── build-model01-factory-flash -> /nix/store/0aq1fv3na7xczf44vqvlck15fpkgl5zs-model01-factory-flash @@ -318,15 +318,15 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null ├── build-model100-builtin-shajra-hex -> /nix/store/rwnlh5rv6ymq17yzmqzk6ks35y2521k7-model100-builtin-shajra-hex ├── build-model100-factory-flash -> /nix/store/464h1fs4lwb2czy32knhcf4jmn8i02yb-model100-factory-flash ├── build-model100-factory-hex -> /nix/store/2n6ccvybhmzappc3hfgkz91wdq51zf29-model100-factory-hex -├── build-moonlander-builtin-shajra-flash -> /nix/store/1g8m7qcdf0v5l3z5j9mz4m7n673prg01-moonlander-builtin-shajra-flash -├── build-moonlander-builtin-shajra-hex -> /nix/store/64rlbjpf5a7xdabijlhhyxpngk91srrj-moonlander-builtin-shajra.bin -├── build-moonlander-factory-flash -> /nix/store/y4dmc272byzs08cjjf1l4brljnb0ndj1-moonlander-factory-flash -├── build-moonlander-factory-hex -> /nix/store/hb8dc6n5myrdcag83b36bi726s7rqsbx-moonlander-factory.bin -├── flash-ergodoxez -> /nix/store/cpw5mmysb40lxmd2lkmkc2yhgxir27wk-flash-ergodoxez -├── flash-model01 -> /nix/store/21phfn7y7iaymwmrkq4jlcxc8d8nj5jf-flash-model01 -├── flash-model100 -> /nix/store/0gs9w2k678h8i24za1vyzf4a53vwlizn-flash-model100 -├── flash-moonlander -> /nix/store/in9crdrvsgaql2swaw7gkxyiwvz03hxx-flash-moonlander -└── licenses -> /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses +├── build-moonlander-builtin-shajra-flash -> /nix/store/qk3jncf2li8sknfapw6yy3nmj5jb3p7a-moonlander-builtin-shajra-flash +├── build-moonlander-builtin-shajra-hex -> /nix/store/266v0bgjq64gwj2vxjyyxd7lwair3zxd-moonlander-builtin-shajra.bin +├── build-moonlander-factory-flash -> /nix/store/6w85y9j49nz3pf3zj6i97ispcwjcp9j8-moonlander-factory-flash +├── build-moonlander-factory-hex -> /nix/store/mn04m93bn6mwyqk3bl9clzppljh9nliq-moonlander-factory.bin +├── flash-ergodoxez -> /nix/store/9s9i0avg72r858lxdmlwmpa4gir3c7mq-flash-ergodoxez +├── flash-model01 -> /nix/store/wsasdjcqph36qvsq5kwq65qqxc578f8c-flash-model01 +├── flash-model100 -> /nix/store/4viv2v8izzbn8py98a1dkmv7qjk51id8-flash-model100 +├── flash-moonlander -> /nix/store/hgag8qb3x6zhiw9522cis83714c0mm2p-flash-moonlander +└── licenses -> /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses 18 directories, 4 files #+end_example diff --git a/doc/nix-usage-flakes.md b/doc/nix-usage-flakes.md index 954b748..1a0ad10 100644 --- a/doc/nix-usage-flakes.md +++ b/doc/nix-usage-flakes.md @@ -262,7 +262,7 @@ After a successful call of `nix build`, you'll see one or more symlinks for each readlink result* ``` - /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses + /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses Following these symlinks, we can see the files the project provides: @@ -284,7 +284,7 @@ It's common to configure these “result” symlinks as ignored in source contro nix path-info .#licenses-thirdparty ``` - /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses + /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses ## Running commands in a shell @@ -397,7 +397,7 @@ nix shell --ignore-environment \ --command which shajra-keyboards-licenses ``` - /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses/bin/shajra-keyboards-licenses + /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses/bin/shajra-keyboards-licenses What we do with local flake references can work just as well with remote flake references. @@ -425,7 +425,7 @@ nix profile list Flake attribute: packages.x86_64-linux.licenses-thirdparty Original flake URL: git+file:///home/shajra/src/shajra-keyboards Locked flake URL: git+file:///home/shajra/src/shajra-keyboards - Store paths: /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses + Store paths: /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses If we want to uninstall a program from our profile, we do so by the index from this list: diff --git a/doc/nix-usage-flakes.org b/doc/nix-usage-flakes.org index fe1a80c..88d8f0d 100644 --- a/doc/nix-usage-flakes.org +++ b/doc/nix-usage-flakes.org @@ -442,7 +442,7 @@ readlink result* #+end_src #+RESULTS: nix-build-link -: /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses +: /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses Following these symlinks, we can see the files the project provides: @@ -471,7 +471,7 @@ nix path-info .#<> #+end_src #+results: nix-build-path -: /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses +: /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses ** Running commands in a shell @@ -633,7 +633,7 @@ nix shell --ignore-environment \ #+end_src #+RESULTS: nix-shell-remote -: /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses/bin/shajra-keyboards-licenses +: /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses/bin/shajra-keyboards-licenses What we do with local flake references can work just as well with remote flake references. @@ -684,7 +684,7 @@ nix profile list --profile /tmp/nix-profile | ansifilter : Flake attribute: packages.x86_64-linux.licenses-thirdparty : Original flake URL: git+file:///home/shajra/src/shajra-keyboards : Locked flake URL: git+file:///home/shajra/src/shajra-keyboards -: Store paths: /nix/store/35v7dk3i6drqp2q5y30q9xxf1wg1zybp-shajra-keyboards-licenses +: Store paths: /nix/store/psddp0d7mk9ymk63x9z4is1wvs7kwxcd-shajra-keyboards-licenses If we want to uninstall a program from our profile, we do so by the index from this list: diff --git a/flake.lock b/flake.lock index b6f35c3..d72961f 100644 --- a/flake.lock +++ b/flake.lock @@ -335,11 +335,11 @@ "ox-gfm": "ox-gfm" }, "locked": { - "lastModified": 1714793339, - "narHash": "sha256-vflbTdmpStWYoeUQ6ht37QICcDp5aF6vrhjOL+qatOE=", + "lastModified": 1714920732, + "narHash": "sha256-QRUfKaqT+TLNSczpDUqTveLc6KTnF05/SWVDhCRBzCo=", "owner": "shajra", "repo": "nix-project", - "rev": "1b0cff9b1825ce453049e4dfcf39cf9b139753f8", + "rev": "5d60e5ff4b74c65712340b690764b40d3b2b13c2", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1714791338, - "narHash": "sha256-CdBT96Q1X929R681ZuhPMXYADqFSlMXAB2Zv/fg/dE4=", + "lastModified": 1714920575, + "narHash": "sha256-IrRQy/zSIUgEYSGqV5bA9NoDEH4h85W08MkIXQYrjDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a013465da267a19c3f5134afa1bd42caa62ec330", + "rev": "84caa2e32cb17601888a58df408fdfb1c8c2dc11", "type": "github" }, "original": { @@ -390,11 +390,11 @@ }, "nixpkgs-stable-darwin": { "locked": { - "lastModified": 1714726917, - "narHash": "sha256-OymlYDS9CulrPjkINuxHAqNYDrQus1y43Hmia77uk8Y=", + "lastModified": 1714858427, + "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c074794caba4d641b67ceeea9db3aa9022cdc4cc", + "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs-stable-linux": { "locked": { - "lastModified": 1714531828, - "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", + "lastModified": 1714782413, + "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", + "rev": "651b4702e27a388f0f18e1b970534162dec09aff", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714656196, - "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", + "lastModified": 1714809261, + "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", + "rev": "d32560238207b8e26d88b265207b216ee46b8450", "type": "github" }, "original": { @@ -455,11 +455,11 @@ "qmk-factory": { "flake": false, "locked": { - "lastModified": 1714713083, - "narHash": "sha256-ETEC7TtcjRbB8l5Nk3MlSdDA4KYMqLB0BKrUgxUnRek=", + "lastModified": 1714905511, + "narHash": "sha256-GW3zLbEAZ1yLZnB0kb60Gwn6M9qij4Hv/Dgs5ftv2fw=", "ref": "refs/heads/master", - "rev": "8075003e6068d6f8fa5396972c2a17d39d14c584", - "revCount": 27051, + "rev": "7fc552632eb41b031d9557fe317f71e43377dde7", + "revCount": 27053, "submodules": true, "type": "git", "url": "https://github.com/qmk/qmk_firmware"