Skip to content

Commit 1c43bed

Browse files
author
Sukant Hajra
committed
Update dependencies and documentation
1 parent 1bb87bc commit 1c43bed

7 files changed

+80
-80
lines changed

Diff for: README.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ nix run github:shajra/shajra-keyboards#flash-ergodoxez
180180
Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap)
181181
=================================================================
182182

183-
FLASH SOURCE: /nix/store/1ah1jp68w7kfry630i13c0mlinz2rncs-qmk-builtin-shajra-src
184-
FLASH BINARY: /nix/store/1l9l2jskv3ak0vg4hnb8vhrp8ak6cdhy-ergodoxez-builtin-shajra.hex
183+
FLASH SOURCE: /nix/store/6pjngynz6x6yn6djy4cd8kfwz69lryn3-qmk-builtin-shajra-src
184+
FLASH BINARY: /nix/store/wx45dcml68gjqidvz4c7y5gqpivmfcd6-ergodoxez-builtin-shajra.hex
185185

186186
⠋ Press the reset button of your keyboard
187187

@@ -242,28 +242,28 @@ If you want to check that everything builds before flashing your keyboard, you c
242242
tree $(nix build --no-link --print-out-paths) 2>/dev/null
243243
```
244244

245-
/nix/store/ljnwl55c115birn4nzzwifd7fign0hg3-shajra-keyboards-ci
246-
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/rggmy8wcjamm2z7bf0dlfhbhxk2harxa-ergodoxez-builtin-shajra-flash
247-
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/1l9l2jskv3ak0vg4hnb8vhrp8ak6cdhy-ergodoxez-builtin-shajra.hex
248-
├── build-ergodoxez-factory-flash -> /nix/store/z8acs1vhc6cd9hkldpdmjranzni391r7-ergodoxez-factory-flash
249-
├── build-ergodoxez-factory-hex -> /nix/store/cbmxzxgn9hrdwnjry5afj40kvii2vx5h-ergodoxez-factory.hex
250-
├── build-model01-builtin-shajra-flash -> /nix/store/mwbksqhbm8ms2z77505v59m348gh4iz2-model01-builtin-shajra-flash
251-
├── build-model01-builtin-shajra-hex -> /nix/store/dn0r0dfmdk69qi41hi7yj6qc2jnkdpj5-model01-builtin-shajra-hex
252-
├── build-model01-factory-flash -> /nix/store/562lgm0hg9as3kgc7afryqphsf8zr3lc-model01-factory-flash
253-
├── build-model01-factory-hex -> /nix/store/yysvcxa0bkahg3aaxa3wf39w47kkxg6k-model01-factory-hex
254-
├── build-model100-builtin-shajra-flash -> /nix/store/9vyr53zsksi4hsqkbmz96llph4f7p9xx-model100-builtin-shajra-flash
255-
├── build-model100-builtin-shajra-hex -> /nix/store/xjx8w717hkci7jx03r4qr91flb1dfipx-model100-builtin-shajra-hex
256-
├── build-model100-factory-flash -> /nix/store/yqyx3fa2aaiib9r16czybyk0ffvq7f9m-model100-factory-flash
257-
├── build-model100-factory-hex -> /nix/store/mkf9q6c2na4r6cyn62yirqrda7ynpdkp-model100-factory-hex
258-
├── build-moonlander-builtin-shajra-flash -> /nix/store/89cykmx50c9n1nfgi2p0vgqsjl9rdvba-moonlander-builtin-shajra-flash
259-
├── build-moonlander-builtin-shajra-hex -> /nix/store/1k4mvaph1g9zbxj040v1f67zgzfhj5hq-moonlander-builtin-shajra.bin
260-
├── build-moonlander-factory-flash -> /nix/store/mhwdv0inx96bf7qhi0w3cziq6i754ddc-moonlander-factory-flash
261-
├── build-moonlander-factory-hex -> /nix/store/c0jmds3ycviyqj9xd5g2018zq6y61bsd-moonlander-factory.bin
262-
├── flash-ergodoxez -> /nix/store/2nfk6ayadixpjabdnjzrv87lzb9fkxf3-flash-ergodoxez
263-
├── flash-model01 -> /nix/store/21khrzwpyjhph22d9f9jz3kx2lspydrz-flash-model01
264-
├── flash-model100 -> /nix/store/64g0lrjq1my2gbgymi4d7g4kkki6vffw-flash-model100
265-
├── flash-moonlander -> /nix/store/m42pwy5fr79w1pdd19yzygr45iqlm6md-flash-moonlander
266-
└── licenses -> /nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
245+
/nix/store/wmfgrlxp4iy61cs8irmmzhi1h4qmgja9-shajra-keyboards-ci
246+
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/fj94x1d59wjjing8q3mcigb9a29kaavy-ergodoxez-builtin-shajra-flash
247+
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/wx45dcml68gjqidvz4c7y5gqpivmfcd6-ergodoxez-builtin-shajra.hex
248+
├── build-ergodoxez-factory-flash -> /nix/store/r4hggnsyvr0nbsgw6b644z6xb0wr3dhg-ergodoxez-factory-flash
249+
├── build-ergodoxez-factory-hex -> /nix/store/z92bgwlkilqx0gqn2ippz0nsvpvq2g64-ergodoxez-factory.hex
250+
├── build-model01-builtin-shajra-flash -> /nix/store/af3lxn5v37plbl8bd19kz2y7v1vpmhmf-model01-builtin-shajra-flash
251+
├── build-model01-builtin-shajra-hex -> /nix/store/vf5y2kf1qc7hw5jjlw2yfxmdzfabpc5m-model01-builtin-shajra-hex
252+
├── build-model01-factory-flash -> /nix/store/mhc2610zh9sqbbx3sa54fgmjrxs65kgd-model01-factory-flash
253+
├── build-model01-factory-hex -> /nix/store/s3a8f8m1qcm97i92djkrpwrgkg0wk0js-model01-factory-hex
254+
├── build-model100-builtin-shajra-flash -> /nix/store/3p1vgy6xlkshqdpjrck0jchbwvkr0wma-model100-builtin-shajra-flash
255+
├── build-model100-builtin-shajra-hex -> /nix/store/4j2b1nkdgcis3h90d0fq2s1nc5lr7h03-model100-builtin-shajra-hex
256+
├── build-model100-factory-flash -> /nix/store/cpb883vv9cdxy3l2n8kzn8d33vnq3nr4-model100-factory-flash
257+
├── build-model100-factory-hex -> /nix/store/77yaiax9p92in5s89fg05p7f2f2pyim9-model100-factory-hex
258+
├── build-moonlander-builtin-shajra-flash -> /nix/store/l5irmqr6injbrnc1awn0yx1gdr1wxq3g-moonlander-builtin-shajra-flash
259+
├── build-moonlander-builtin-shajra-hex -> /nix/store/ihxn8nh5pvgiwsbd3asds5n3zaraq24h-moonlander-builtin-shajra.bin
260+
├── build-moonlander-factory-flash -> /nix/store/423r0y2hdwsxmjq6fy746aifjsygynqn-moonlander-factory-flash
261+
├── build-moonlander-factory-hex -> /nix/store/ayf6yr8nbnfrf9hfgp6sl3gf78x2w0nk-moonlander-factory.bin
262+
├── flash-ergodoxez -> /nix/store/7y7srw0w79q708c2wf8gkkbdad6x9zk5-flash-ergodoxez
263+
├── flash-model01 -> /nix/store/c4z2fs12bmy4c1jcjcb01r6lk25i46wv-flash-model01
264+
├── flash-model100 -> /nix/store/i6zi8wk7k3qdcxjbj3jj7ynzql453sl4-flash-model100
265+
├── flash-moonlander -> /nix/store/13vf8idinc22gfd4kn9qqh7kf0d0zxzx-flash-moonlander
266+
└── licenses -> /nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
267267

268268
18 directories, 4 files
269269

Diff for: README.org

+24-24
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ head -c350 < <(./flash-ergodoxez) | ansifilter
212212
: Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap)
213213
: =================================================================
214214
:
215-
: FLASH SOURCE: /nix/store/1ah1jp68w7kfry630i13c0mlinz2rncs-qmk-builtin-shajra-src
216-
: FLASH BINARY: /nix/store/1l9l2jskv3ak0vg4hnb8vhrp8ak6cdhy-ergodoxez-builtin-shajra.hex
215+
: FLASH SOURCE: /nix/store/6pjngynz6x6yn6djy4cd8kfwz69lryn3-qmk-builtin-shajra-src
216+
: FLASH BINARY: /nix/store/wx45dcml68gjqidvz4c7y5gqpivmfcd6-ergodoxez-builtin-shajra.hex
217217
:
218218
: ⠋ Press the reset button of your keyboard
219219

@@ -308,28 +308,28 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null
308308

309309
#+results: nix-build
310310
#+begin_example
311-
/nix/store/ljnwl55c115birn4nzzwifd7fign0hg3-shajra-keyboards-ci
312-
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/rggmy8wcjamm2z7bf0dlfhbhxk2harxa-ergodoxez-builtin-shajra-flash
313-
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/1l9l2jskv3ak0vg4hnb8vhrp8ak6cdhy-ergodoxez-builtin-shajra.hex
314-
├── build-ergodoxez-factory-flash -> /nix/store/z8acs1vhc6cd9hkldpdmjranzni391r7-ergodoxez-factory-flash
315-
├── build-ergodoxez-factory-hex -> /nix/store/cbmxzxgn9hrdwnjry5afj40kvii2vx5h-ergodoxez-factory.hex
316-
├── build-model01-builtin-shajra-flash -> /nix/store/mwbksqhbm8ms2z77505v59m348gh4iz2-model01-builtin-shajra-flash
317-
├── build-model01-builtin-shajra-hex -> /nix/store/dn0r0dfmdk69qi41hi7yj6qc2jnkdpj5-model01-builtin-shajra-hex
318-
├── build-model01-factory-flash -> /nix/store/562lgm0hg9as3kgc7afryqphsf8zr3lc-model01-factory-flash
319-
├── build-model01-factory-hex -> /nix/store/yysvcxa0bkahg3aaxa3wf39w47kkxg6k-model01-factory-hex
320-
├── build-model100-builtin-shajra-flash -> /nix/store/9vyr53zsksi4hsqkbmz96llph4f7p9xx-model100-builtin-shajra-flash
321-
├── build-model100-builtin-shajra-hex -> /nix/store/xjx8w717hkci7jx03r4qr91flb1dfipx-model100-builtin-shajra-hex
322-
├── build-model100-factory-flash -> /nix/store/yqyx3fa2aaiib9r16czybyk0ffvq7f9m-model100-factory-flash
323-
├── build-model100-factory-hex -> /nix/store/mkf9q6c2na4r6cyn62yirqrda7ynpdkp-model100-factory-hex
324-
├── build-moonlander-builtin-shajra-flash -> /nix/store/89cykmx50c9n1nfgi2p0vgqsjl9rdvba-moonlander-builtin-shajra-flash
325-
├── build-moonlander-builtin-shajra-hex -> /nix/store/1k4mvaph1g9zbxj040v1f67zgzfhj5hq-moonlander-builtin-shajra.bin
326-
├── build-moonlander-factory-flash -> /nix/store/mhwdv0inx96bf7qhi0w3cziq6i754ddc-moonlander-factory-flash
327-
├── build-moonlander-factory-hex -> /nix/store/c0jmds3ycviyqj9xd5g2018zq6y61bsd-moonlander-factory.bin
328-
├── flash-ergodoxez -> /nix/store/2nfk6ayadixpjabdnjzrv87lzb9fkxf3-flash-ergodoxez
329-
├── flash-model01 -> /nix/store/21khrzwpyjhph22d9f9jz3kx2lspydrz-flash-model01
330-
├── flash-model100 -> /nix/store/64g0lrjq1my2gbgymi4d7g4kkki6vffw-flash-model100
331-
├── flash-moonlander -> /nix/store/m42pwy5fr79w1pdd19yzygr45iqlm6md-flash-moonlander
332-
└── licenses -> /nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
311+
/nix/store/wmfgrlxp4iy61cs8irmmzhi1h4qmgja9-shajra-keyboards-ci
312+
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/fj94x1d59wjjing8q3mcigb9a29kaavy-ergodoxez-builtin-shajra-flash
313+
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/wx45dcml68gjqidvz4c7y5gqpivmfcd6-ergodoxez-builtin-shajra.hex
314+
├── build-ergodoxez-factory-flash -> /nix/store/r4hggnsyvr0nbsgw6b644z6xb0wr3dhg-ergodoxez-factory-flash
315+
├── build-ergodoxez-factory-hex -> /nix/store/z92bgwlkilqx0gqn2ippz0nsvpvq2g64-ergodoxez-factory.hex
316+
├── build-model01-builtin-shajra-flash -> /nix/store/af3lxn5v37plbl8bd19kz2y7v1vpmhmf-model01-builtin-shajra-flash
317+
├── build-model01-builtin-shajra-hex -> /nix/store/vf5y2kf1qc7hw5jjlw2yfxmdzfabpc5m-model01-builtin-shajra-hex
318+
├── build-model01-factory-flash -> /nix/store/mhc2610zh9sqbbx3sa54fgmjrxs65kgd-model01-factory-flash
319+
├── build-model01-factory-hex -> /nix/store/s3a8f8m1qcm97i92djkrpwrgkg0wk0js-model01-factory-hex
320+
├── build-model100-builtin-shajra-flash -> /nix/store/3p1vgy6xlkshqdpjrck0jchbwvkr0wma-model100-builtin-shajra-flash
321+
├── build-model100-builtin-shajra-hex -> /nix/store/4j2b1nkdgcis3h90d0fq2s1nc5lr7h03-model100-builtin-shajra-hex
322+
├── build-model100-factory-flash -> /nix/store/cpb883vv9cdxy3l2n8kzn8d33vnq3nr4-model100-factory-flash
323+
├── build-model100-factory-hex -> /nix/store/77yaiax9p92in5s89fg05p7f2f2pyim9-model100-factory-hex
324+
├── build-moonlander-builtin-shajra-flash -> /nix/store/l5irmqr6injbrnc1awn0yx1gdr1wxq3g-moonlander-builtin-shajra-flash
325+
├── build-moonlander-builtin-shajra-hex -> /nix/store/ihxn8nh5pvgiwsbd3asds5n3zaraq24h-moonlander-builtin-shajra.bin
326+
├── build-moonlander-factory-flash -> /nix/store/423r0y2hdwsxmjq6fy746aifjsygynqn-moonlander-factory-flash
327+
├── build-moonlander-factory-hex -> /nix/store/ayf6yr8nbnfrf9hfgp6sl3gf78x2w0nk-moonlander-factory.bin
328+
├── flash-ergodoxez -> /nix/store/7y7srw0w79q708c2wf8gkkbdad6x9zk5-flash-ergodoxez
329+
├── flash-model01 -> /nix/store/c4z2fs12bmy4c1jcjcb01r6lk25i46wv-flash-model01
330+
├── flash-model100 -> /nix/store/i6zi8wk7k3qdcxjbj3jj7ynzql453sl4-flash-model100
331+
├── flash-moonlander -> /nix/store/13vf8idinc22gfd4kn9qqh7kf0d0zxzx-flash-moonlander
332+
└── licenses -> /nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
333333

334334
18 directories, 4 files
335335
#+end_example

Diff for: doc/nix-installation.md

-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ For each substituter we use, we need to also configure Nix to trust their public
8585

8686
When editing the `/etc/nix/nix.conf` as root, suffix the new substituter(s), space-separated to any values already populating the `substituters` parameter.
8787

88-
Note, the order of the substituters indicates the order in which caches are searched. Leave the <https://cache.nixos.org> substituter first to maximize cache hits.
89-
9088
Next, similarly suffix the key(s) to the `trusted-public-keys` parameter.
9189

9290
Your file will likely look like the following:

Diff for: doc/nix-installation.org

-4
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@ keys:
133133
When editing the =/etc/nix/nix.conf= as root, suffix the new substituter(s),
134134
space-separated to any values already populating the =substituters= parameter.
135135

136-
Note, the order of the substituters indicates the order in which caches are
137-
searched. Leave the https://cache.nixos.org substituter first to maximize cache
138-
hits.
139-
140136
Next, similarly suffix the key(s) to the =trusted-public-keys= parameter.
141137

142138
Your file will likely look like the following:

Diff for: doc/nix-usage-flakes.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,15 @@ nix flake show .
108108
git+file:///home/shajra/src/shajra-keyboards
109109
├───apps
110110
│ └───x86_64-linux
111-
│ ├───default: app
111+
112112
│ ├───flash-ergodoxez: app
113113
│ ├───flash-model01: app
114114
│ ├───flash-model100: app
115115
│ ├───flash-moonlander: app
116116
│ └───licenses-thirdparty: app
117+
├───checks
118+
│ └───x86_64-linux
119+
│ └───ci: derivation 'shajra-keyboards-ci'
117120
├───legacyPackages
118121
│ └───x86_64-linux omitted (use '--legacy' to show)
119122
├───overlays
@@ -262,7 +265,7 @@ After a successful call of `nix build`, you'll see one or more symlinks for each
262265
readlink result*
263266
```
264267

265-
/nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
268+
/nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
266269

267270
Following these symlinks, we can see the files the project provides:
268271

@@ -284,7 +287,7 @@ It's common to configure these “result” symlinks as ignored in source contro
284287
nix path-info .#licenses-thirdparty
285288
```
286289

287-
/nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
290+
/nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
288291

289292
## Running commands in a shell<a id="sec-4-6"></a>
290293

@@ -397,7 +400,7 @@ nix shell --ignore-environment \
397400
--command which shajra-keyboards-licenses
398401
```
399402

400-
/nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
403+
/nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
401404

402405
What we do with local flake references can work just as well with remote flake references.
403406

@@ -425,7 +428,7 @@ nix profile list
425428
Flake attribute: packages.x86_64-linux.licenses-thirdparty
426429
Original flake URL: git+file:///home/shajra/src/shajra-keyboards
427430
Locked flake URL: git+file:///home/shajra/src/shajra-keyboards
428-
Store paths: /nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
431+
Store paths: /nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
429432

430433
If we want to uninstall a program from our profile, we do so by the index from this list:
431434

Diff for: doc/nix-usage-flakes.org

+8-5
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,15 @@ nix flake show . | ansifilter
202202
git+file:///home/shajra/src/shajra-keyboards
203203
├───apps
204204
│ └───x86_64-linux
205-
│ ├───default: app
205+
206206
│ ├───flash-ergodoxez: app
207207
│ ├───flash-model01: app
208208
│ ├───flash-model100: app
209209
│ ├───flash-moonlander: app
210210
│ └───licenses-thirdparty: app
211+
├───checks
212+
│ └───x86_64-linux
213+
│ └───ci: derivation 'shajra-keyboards-ci'
211214
├───legacyPackages
212215
│ └───x86_64-linux omitted (use '--legacy' to show)
213216
├───overlays
@@ -442,7 +445,7 @@ readlink result*
442445
#+end_src
443446

444447
#+RESULTS: nix-build-link
445-
: /nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
448+
: /nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
446449

447450
Following these symlinks, we can see the files the project provides:
448451

@@ -471,7 +474,7 @@ nix path-info .#<<get("package-attr-short")>>
471474
#+end_src
472475

473476
#+results: nix-build-path
474-
: /nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
477+
: /nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
475478

476479
** Running commands in a shell
477480

@@ -633,7 +636,7 @@ nix shell --ignore-environment \
633636
#+end_src
634637

635638
#+RESULTS: nix-shell-remote
636-
: /nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
639+
: /nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
637640

638641
What we do with local flake references can work just as well with remote flake
639642
references.
@@ -684,7 +687,7 @@ nix profile list --profile /tmp/nix-profile | ansifilter
684687
: Flake attribute: packages.x86_64-linux.licenses-thirdparty
685688
: Original flake URL: git+file:///home/shajra/src/shajra-keyboards
686689
: Locked flake URL: git+file:///home/shajra/src/shajra-keyboards
687-
: Store paths: /nix/store/w8qmd8pj3ia7d1w7rw5rybpzz0sc73py-shajra-keyboards-licenses
690+
: Store paths: /nix/store/2m2mxyx1sv3yq82qih3b9fzjc94nsyih-shajra-keyboards-licenses
688691

689692
If we want to uninstall a program from our profile, we do so by the index from
690693
this list:

Diff for: flake.lock

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)