diff --git a/README.md b/README.md index 5fb67a7..c7bfa11 100644 --- a/README.md +++ b/README.md @@ -180,8 +180,8 @@ nix run github:shajra/shajra-keyboards#flash-ergodoxez Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap) ================================================================= - FLASH SOURCE: /nix/store/kzh61nl5fhipcmhx66vxs7qwh4im9kva-qmk-builtin-shajra-src - FLASH BINARY: /nix/store/dqhsjba9qna2k7g2ac21sbsa025jy021-ergodoxez-builtin-shajra.hex + FLASH SOURCE: /nix/store/jh8amnmmz0l144sjxhgvn7i5kmfc6671-qmk-builtin-shajra-src + FLASH BINARY: /nix/store/5ab4pw23lb691s6snkawgfxh6idx5wzf-ergodoxez-builtin-shajra.hex ⠋ Press the reset button of your keyboard @@ -242,11 +242,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/1cvs7slmj8131i05w837i1y35lfdzkhi-shajra-keyboards-ci - ├── build-ergodoxez-builtin-shajra-flash -> /nix/store/xnrj344dc9l06jqn304ishbxdgpwa4b2-ergodoxez-builtin-shajra-flash - ├── build-ergodoxez-builtin-shajra-hex -> /nix/store/dqhsjba9qna2k7g2ac21sbsa025jy021-ergodoxez-builtin-shajra.hex - ├── build-ergodoxez-factory-flash -> /nix/store/8lgc4cl3am3a5ajh9iiyrmvhni0fkhnm-ergodoxez-factory-flash - ├── build-ergodoxez-factory-hex -> /nix/store/al7pcqv436p7w116729nfmma29izxwip-ergodoxez-factory.hex + /nix/store/k9xvsycfi78r7sld054cg6n72d2dc1i8-shajra-keyboards-ci + ├── build-ergodoxez-builtin-shajra-flash -> /nix/store/sk0qj7k0cibag98gsn3sfdd1x188d5b7-ergodoxez-builtin-shajra-flash + ├── build-ergodoxez-builtin-shajra-hex -> /nix/store/5ab4pw23lb691s6snkawgfxh6idx5wzf-ergodoxez-builtin-shajra.hex + ├── build-ergodoxez-factory-flash -> /nix/store/xgsj221cxppsg7pa0rdm08iiwqv14c3v-ergodoxez-factory-flash + ├── build-ergodoxez-factory-hex -> /nix/store/cwd1ksbknjvc0nq6d29jkrsms86nfpqr-ergodoxez-factory.hex ├── build-model01-builtin-shajra-flash -> /nix/store/92mdwd12v03azygy6x0k3k99xcil5idq-model01-builtin-shajra-flash ├── build-model01-builtin-shajra-hex -> /nix/store/kvik2b3r96d3g3sfxzl2fppkq6afin7f-model01-builtin-shajra-hex ├── build-model01-factory-flash -> /nix/store/8h7idnxnk6lqxfdk599iggfz8a47k7hn-model01-factory-flash @@ -255,15 +255,15 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null ├── build-model100-builtin-shajra-hex -> /nix/store/c67gyphcghhqv2hhbnvwl5fvjdwavrys-model100-builtin-shajra-hex ├── build-model100-factory-flash -> /nix/store/l7nwf0afsw6z2k06w13pnzldaazvag4z-model100-factory-flash ├── build-model100-factory-hex -> /nix/store/lfgm06rj71hq5brfljyw845a5gpxjfn1-model100-factory-hex - ├── build-moonlander-builtin-shajra-flash -> /nix/store/ybfqxcp7m0ah44l16fhlighqh9sa8msv-moonlander-builtin-shajra-flash - ├── build-moonlander-builtin-shajra-hex -> /nix/store/qiznnlymwh7wn5pdc0b87i527carcalk-moonlander-builtin-shajra.bin - ├── build-moonlander-factory-flash -> /nix/store/m349s0ml89pfmaxp2swzs5d5zqxd60p3-moonlander-factory-flash - ├── build-moonlander-factory-hex -> /nix/store/5136516h4jqlwij63kn4y4fzdb7bjjgs-moonlander-factory.bin - ├── flash-ergodoxez -> /nix/store/in8mcv0adj19f3k41wmfbxf9y4clrixp-flash-ergodoxez - ├── flash-model01 -> /nix/store/xmpdcg42yfbp1vmwgy0l1mgn29jagynk-flash-model01 - ├── flash-model100 -> /nix/store/dk7p44k58wk7c6y5037cixa20hvfzlam-flash-model100 - ├── flash-moonlander -> /nix/store/1cw5qz47apslk9438mdic03rz9avqyal-flash-moonlander - └── licenses -> /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses + ├── build-moonlander-builtin-shajra-flash -> /nix/store/zxycnxpzzpbx5dbbkpdq1fgywd552vk8-moonlander-builtin-shajra-flash + ├── build-moonlander-builtin-shajra-hex -> /nix/store/k93d4an9bc6pnb2lhypazkmig7hbjdxg-moonlander-builtin-shajra.bin + ├── build-moonlander-factory-flash -> /nix/store/4byywkmxx3qjm6s41wfhbqmjqcxvin4r-moonlander-factory-flash + ├── build-moonlander-factory-hex -> /nix/store/18zykf6ngak6wy128cng3ryy371p9ksa-moonlander-factory.bin + ├── flash-ergodoxez -> /nix/store/5y23f63f34bix7s5xx2z81cm6wy06zdc-flash-ergodoxez + ├── flash-model01 -> /nix/store/h023yg6nx832f3pzn99gqp3i12x51vi4-flash-model01 + ├── flash-model100 -> /nix/store/cn65ivb44dqix87h6j822x8w41lgyq96-flash-model100 + ├── flash-moonlander -> /nix/store/vnb7jz97ipc6hj3zx6lmdnfkilcfz301-flash-moonlander + └── licenses -> /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses 18 directories, 4 files diff --git a/README.org b/README.org index 05eece3..b653afc 100644 --- a/README.org +++ b/README.org @@ -212,8 +212,8 @@ head -c350 < <(./flash-ergodoxez) | ansifilter : Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap) : ================================================================= : -: FLASH SOURCE: /nix/store/kzh61nl5fhipcmhx66vxs7qwh4im9kva-qmk-builtin-shajra-src -: FLASH BINARY: /nix/store/dqhsjba9qna2k7g2ac21sbsa025jy021-ergodoxez-builtin-shajra.hex +: FLASH SOURCE: /nix/store/jh8amnmmz0l144sjxhgvn7i5kmfc6671-qmk-builtin-shajra-src +: FLASH BINARY: /nix/store/5ab4pw23lb691s6snkawgfxh6idx5wzf-ergodoxez-builtin-shajra.hex : : ⠋ Press the reset button of your keyboard @@ -308,11 +308,11 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null #+results: nix-build #+begin_example -/nix/store/1cvs7slmj8131i05w837i1y35lfdzkhi-shajra-keyboards-ci -├── build-ergodoxez-builtin-shajra-flash -> /nix/store/xnrj344dc9l06jqn304ishbxdgpwa4b2-ergodoxez-builtin-shajra-flash -├── build-ergodoxez-builtin-shajra-hex -> /nix/store/dqhsjba9qna2k7g2ac21sbsa025jy021-ergodoxez-builtin-shajra.hex -├── build-ergodoxez-factory-flash -> /nix/store/8lgc4cl3am3a5ajh9iiyrmvhni0fkhnm-ergodoxez-factory-flash -├── build-ergodoxez-factory-hex -> /nix/store/al7pcqv436p7w116729nfmma29izxwip-ergodoxez-factory.hex +/nix/store/k9xvsycfi78r7sld054cg6n72d2dc1i8-shajra-keyboards-ci +├── build-ergodoxez-builtin-shajra-flash -> /nix/store/sk0qj7k0cibag98gsn3sfdd1x188d5b7-ergodoxez-builtin-shajra-flash +├── build-ergodoxez-builtin-shajra-hex -> /nix/store/5ab4pw23lb691s6snkawgfxh6idx5wzf-ergodoxez-builtin-shajra.hex +├── build-ergodoxez-factory-flash -> /nix/store/xgsj221cxppsg7pa0rdm08iiwqv14c3v-ergodoxez-factory-flash +├── build-ergodoxez-factory-hex -> /nix/store/cwd1ksbknjvc0nq6d29jkrsms86nfpqr-ergodoxez-factory.hex ├── build-model01-builtin-shajra-flash -> /nix/store/92mdwd12v03azygy6x0k3k99xcil5idq-model01-builtin-shajra-flash ├── build-model01-builtin-shajra-hex -> /nix/store/kvik2b3r96d3g3sfxzl2fppkq6afin7f-model01-builtin-shajra-hex ├── build-model01-factory-flash -> /nix/store/8h7idnxnk6lqxfdk599iggfz8a47k7hn-model01-factory-flash @@ -321,15 +321,15 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null ├── build-model100-builtin-shajra-hex -> /nix/store/c67gyphcghhqv2hhbnvwl5fvjdwavrys-model100-builtin-shajra-hex ├── build-model100-factory-flash -> /nix/store/l7nwf0afsw6z2k06w13pnzldaazvag4z-model100-factory-flash ├── build-model100-factory-hex -> /nix/store/lfgm06rj71hq5brfljyw845a5gpxjfn1-model100-factory-hex -├── build-moonlander-builtin-shajra-flash -> /nix/store/ybfqxcp7m0ah44l16fhlighqh9sa8msv-moonlander-builtin-shajra-flash -├── build-moonlander-builtin-shajra-hex -> /nix/store/qiznnlymwh7wn5pdc0b87i527carcalk-moonlander-builtin-shajra.bin -├── build-moonlander-factory-flash -> /nix/store/m349s0ml89pfmaxp2swzs5d5zqxd60p3-moonlander-factory-flash -├── build-moonlander-factory-hex -> /nix/store/5136516h4jqlwij63kn4y4fzdb7bjjgs-moonlander-factory.bin -├── flash-ergodoxez -> /nix/store/in8mcv0adj19f3k41wmfbxf9y4clrixp-flash-ergodoxez -├── flash-model01 -> /nix/store/xmpdcg42yfbp1vmwgy0l1mgn29jagynk-flash-model01 -├── flash-model100 -> /nix/store/dk7p44k58wk7c6y5037cixa20hvfzlam-flash-model100 -├── flash-moonlander -> /nix/store/1cw5qz47apslk9438mdic03rz9avqyal-flash-moonlander -└── licenses -> /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses +├── build-moonlander-builtin-shajra-flash -> /nix/store/zxycnxpzzpbx5dbbkpdq1fgywd552vk8-moonlander-builtin-shajra-flash +├── build-moonlander-builtin-shajra-hex -> /nix/store/k93d4an9bc6pnb2lhypazkmig7hbjdxg-moonlander-builtin-shajra.bin +├── build-moonlander-factory-flash -> /nix/store/4byywkmxx3qjm6s41wfhbqmjqcxvin4r-moonlander-factory-flash +├── build-moonlander-factory-hex -> /nix/store/18zykf6ngak6wy128cng3ryy371p9ksa-moonlander-factory.bin +├── flash-ergodoxez -> /nix/store/5y23f63f34bix7s5xx2z81cm6wy06zdc-flash-ergodoxez +├── flash-model01 -> /nix/store/h023yg6nx832f3pzn99gqp3i12x51vi4-flash-model01 +├── flash-model100 -> /nix/store/cn65ivb44dqix87h6j822x8w41lgyq96-flash-model100 +├── flash-moonlander -> /nix/store/vnb7jz97ipc6hj3zx6lmdnfkilcfz301-flash-moonlander +└── licenses -> /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses 18 directories, 4 files #+end_example diff --git a/doc/nix-introduction.md b/doc/nix-introduction.md index f67eaf8..f9baa5a 100644 --- a/doc/nix-introduction.md +++ b/doc/nix-introduction.md @@ -66,7 +66,7 @@ Nix addresses all the problems discussed above. To build or install any project, we should be able to start with only the Nix package manager installed. No other library or system dependency should be required to be installed or configured. -Even if we have a library or system dependency installed, it shouldn't interfere with any build or installation we want to do. Nix builds and installs in its own directories. +Even if we have a library or system dependency installed, it shouldn't interfere with any build or installation we want to do. Nix builds and installs in its own meticulously sandboxed and controlled directories. Our build should get everything we need, all the way down to the system-level dependencies, irrespective of which programming language the dependencies have been authored in. If anything has been pre-built, we should download a cached result. diff --git a/doc/nix-introduction.org b/doc/nix-introduction.org index ee562fd..046efe8 100644 --- a/doc/nix-introduction.org +++ b/doc/nix-introduction.org @@ -101,7 +101,7 @@ required to be installed or configured. Even if we have a library or system dependency installed, it shouldn't interfere with any build or installation we want to do. Nix builds and installs in its own -directories. +meticulously sandboxed and controlled directories. Our build should get everything we need, all the way down to the system-level dependencies, irrespective of which programming language the dependencies have diff --git a/doc/nix-usage-flakes.md b/doc/nix-usage-flakes.md index b42ff09..94aec3e 100644 --- a/doc/nix-usage-flakes.md +++ b/doc/nix-usage-flakes.md @@ -265,7 +265,7 @@ After a successful call of `nix build`, you'll see one or more symlinks for each readlink result* ``` - /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses + /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses Following these symlinks, we can see the files the project provides: @@ -287,7 +287,7 @@ It's common to configure these “result” symlinks as ignored in source contro nix path-info .#licenses-thirdparty ``` - /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses + /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses ## Running commands in a shell @@ -400,7 +400,7 @@ nix shell --ignore-environment \ --command which shajra-keyboards-licenses ``` - /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses/bin/shajra-keyboards-licenses + /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses/bin/shajra-keyboards-licenses What we do with local flake references can work just as well with remote flake references. @@ -428,7 +428,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/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses + Store paths: /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses If we want to uninstall a program from our profile, we can reference it by name: diff --git a/doc/nix-usage-flakes.org b/doc/nix-usage-flakes.org index 3a6f6f4..6f9073c 100644 --- a/doc/nix-usage-flakes.org +++ b/doc/nix-usage-flakes.org @@ -445,7 +445,7 @@ readlink result* #+end_src #+RESULTS: nix-build-link -: /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses +: /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses Following these symlinks, we can see the files the project provides: @@ -474,7 +474,7 @@ nix path-info .#<> #+end_src #+results: nix-build-path -: /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses +: /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses ** Running commands in a shell @@ -636,7 +636,7 @@ nix shell --ignore-environment \ #+end_src #+RESULTS: nix-shell-remote -: /nix/store/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses/bin/shajra-keyboards-licenses +: /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses/bin/shajra-keyboards-licenses What we do with local flake references can work just as well with remote flake references. @@ -687,7 +687,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/cbb8gmijyrrcp89r8c4z9z3a041aq183-shajra-keyboards-licenses +: Store paths: /nix/store/lqwjdfl0889ywzm74aqkxr67kfli45mp-shajra-keyboards-licenses If we want to uninstall a program from our profile, we can reference it by name: diff --git a/flake.lock b/flake.lock index ebf0d37..6dcc0f2 100644 --- a/flake.lock +++ b/flake.lock @@ -333,11 +333,11 @@ "ox-gfm": "ox-gfm" }, "locked": { - "lastModified": 1733865011, - "narHash": "sha256-935mHob6gQg1lOiZUnS4VIlca/WAz3OsgSkm+NDeM0o=", + "lastModified": 1733980206, + "narHash": "sha256-pcgGO18LtaTF8/Ns2FgPOwfpXwDmU/u4G5PxA198mno=", "owner": "shajra", "repo": "nix-project", - "rev": "c449626a88cfc5a23bca13aed5b4d597f1775fd5", + "rev": "93f3c6bfdaf3e0a9a04d5e219cfd6a7d3a763233", "type": "github" }, "original": { @@ -372,11 +372,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1733862875, - "narHash": "sha256-UVKKGsfXYQVqKB8Yq8x4joju9lpDD95NZFYP8fImZt0=", + "lastModified": 1733977386, + "narHash": "sha256-euGUlu9WBeHGHDNXIeD75ZCRU0Svjg5zT+rws2DCvow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f425ed85dc5cac064a55718b81812935062f3db9", + "rev": "5731d41e47a19e9b048a54d3f2fffdc534fac24a", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nixpkgs-stable-darwin": { "locked": { - "lastModified": 1733693873, - "narHash": "sha256-WQHUGmsaZnizDwGAGlt3KNottVHj4E8HKzxseULqrzo=", + "lastModified": 1733874782, + "narHash": "sha256-U1iCUaFCDJepmQuauoo408q8ZzVqAoxZx+T4f7+CBPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4dbea6e2d4bfa443e7d7329ac81532626fc78c8d", + "rev": "df99c810dcdac631c3326a3e73c03bdd535b4eed", "type": "github" }, "original": { @@ -404,11 +404,11 @@ }, "nixpkgs-stable-linux": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -420,11 +420,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733686850, - "narHash": "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=", + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd51f52372a20a93c219e8216fe528a648ffcbf4", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "type": "github" }, "original": { @@ -453,11 +453,11 @@ "qmk-factory": { "flake": false, "locked": { - "lastModified": 1733726047, - "narHash": "sha256-H2YzTsQpZs2sF2pUceoqQcrsOTLx51M3Ied0jUuDzYk=", + "lastModified": 1734026347, + "narHash": "sha256-WRdq+gxX9hCsbbWoBm0GiAQtgzl7RnyFBvzRpw83ldQ=", "ref": "refs/heads/master", - "rev": "847257c3c757c475eb9f47493252cc55b0e08f51", - "revCount": 28243, + "rev": "d589dbb05b31a318086cbf01588230831140d95f", + "revCount": 28245, "submodules": true, "type": "git", "url": "https://github.com/qmk/qmk_firmware"