Skip to content

Commit

Permalink
Update dependencies and documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Sukant Hajra committed Feb 3, 2025
1 parent bef1ba8 commit 7accb74
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 114 deletions.
48 changes: 24 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/6qxkvc6j96syxn3wm6pgxbz1856b543d-qmk-builtin-shajra-src
FLASH BINARY: /nix/store/vjmjznb6gsyphab4www0jhxpzrfs4snd-ergodoxez-builtin-shajra.hex
FLASH SOURCE: /nix/store/aa826crvdxi7rad5hmdyba6vbh9zrngz-qmk-builtin-shajra-src
FLASH BINARY: /nix/store/cs9ziwzchrcwzwz7nvwv25ik50v44n48-ergodoxez-builtin-shajra.hex

⠋ Press the reset button of your keyboard

Expand Down Expand Up @@ -242,28 +242,28 @@ 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/7hncj20iwf8fgdy57wlady46sqfbjhxn-shajra-keyboards-ci
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/8x9i0m1l7z07c6678q8rvm19nw8bbxwf-ergodoxez-builtin-shajra-flash
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/vjmjznb6gsyphab4www0jhxpzrfs4snd-ergodoxez-builtin-shajra.hex
├── build-ergodoxez-factory-flash -> /nix/store/ys1cp0g3d62h8vxn8w8dkz9lq4y363n7-ergodoxez-factory-flash
├── build-ergodoxez-factory-hex -> /nix/store/lxqa4q47drnfb6hv7wc5n0pidljw56yv-ergodoxez-factory.hex
├── build-model01-builtin-shajra-flash -> /nix/store/9kwliyxg4jjn29x3k1llapxc1kr1nrgj-model01-builtin-shajra-flash
├── build-model01-builtin-shajra-hex -> /nix/store/ww15f5sr617bl00snqninwdqaz7wya6y-model01-builtin-shajra-hex
├── build-model01-factory-flash -> /nix/store/325cwh9hisxidlvr923c9b8qfl3f1afq-model01-factory-flash
├── build-model01-factory-hex -> /nix/store/b2zl36f1a8xm2g5cq2p6kfmzinqay5wm-model01-factory-hex
├── build-model100-builtin-shajra-flash -> /nix/store/ikc4mzmmlsy1zg8sp4g5788xmxrmxaa0-model100-builtin-shajra-flash
├── build-model100-builtin-shajra-hex -> /nix/store/gzmzgagfl0mbgxap9llpykc8bs43n7m4-model100-builtin-shajra-hex
├── build-model100-factory-flash -> /nix/store/gzrlaqsrld7lparn9w8rvxi23w5zcm9z-model100-factory-flash
├── build-model100-factory-hex -> /nix/store/w1m420ijk5lznmb346ay08w86qxjryq5-model100-factory-hex
├── build-moonlander-builtin-shajra-flash -> /nix/store/prdp5wlccv4bqwpxk8yrv57yl4zbk0nf-moonlander-builtin-shajra-flash
├── build-moonlander-builtin-shajra-hex -> /nix/store/qfmhip746bq93p6maf1iwlxmickk6hbh-moonlander-builtin-shajra.bin
├── build-moonlander-factory-flash -> /nix/store/zp73y9j1hq95l5681idcaqzpgj3hdbm9-moonlander-factory-flash
├── build-moonlander-factory-hex -> /nix/store/kd751b9rasy879rdkf4dhrbgw4y5q55s-moonlander-factory.bin
├── flash-ergodoxez -> /nix/store/q1wzl1rylqphni6p30vpwl86j5bahqvf-flash-ergodoxez
├── flash-model01 -> /nix/store/qiva80nvhliqvqid2shnmf0vrw0qyqv3-flash-model01
├── flash-model100 -> /nix/store/98kggkny08an32lxgzzrk9mxyzihbaph-flash-model100
├── flash-moonlander -> /nix/store/k5nqj1i1v5lgxv9sv01k3z105mmbc1bl-flash-moonlander
└── licenses -> /nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
/nix/store/is6p492w9jx5g3vnfnav5r4l7cbixs87-shajra-keyboards-ci
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/ivnp3f1qbx5zv8qr23a24w99wjddmsk3-ergodoxez-builtin-shajra-flash
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/cs9ziwzchrcwzwz7nvwv25ik50v44n48-ergodoxez-builtin-shajra.hex
├── build-ergodoxez-factory-flash -> /nix/store/pbkiw24jhldwa2rizlww5scl906m623a-ergodoxez-factory-flash
├── build-ergodoxez-factory-hex -> /nix/store/z4zlkqkfq7hz3niwhgsiybach6bhm9rb-ergodoxez-factory.hex
├── build-model01-builtin-shajra-flash -> /nix/store/v6b91bf95jhysspnrm89gdvpf6isk6d4-model01-builtin-shajra-flash
├── build-model01-builtin-shajra-hex -> /nix/store/qjd6cghvmdimipgr4gmbsacz4cxqmxjz-model01-builtin-shajra-hex
├── build-model01-factory-flash -> /nix/store/23n9afkin81xwzqa37pqikwhi0m5ym4w-model01-factory-flash
├── build-model01-factory-hex -> /nix/store/vzk5gidmf7b5rdz10ykpswdf3a95ppad-model01-factory-hex
├── build-model100-builtin-shajra-flash -> /nix/store/vkd1ypjywfsnf8b5947xncawjac9q18k-model100-builtin-shajra-flash
├── build-model100-builtin-shajra-hex -> /nix/store/9gn9hb4q3ydi6v6jrckwm39qs9ks7w3w-model100-builtin-shajra-hex
├── build-model100-factory-flash -> /nix/store/dc5i79976j7wz68p5s7ymqdjyxv0d8vb-model100-factory-flash
├── build-model100-factory-hex -> /nix/store/73flvjp1yf05aklbm6sq5m2qy7ks62a4-model100-factory-hex
├── build-moonlander-builtin-shajra-flash -> /nix/store/zyp5lxp5xd366879xnalsagc15x5y2lp-moonlander-builtin-shajra-flash
├── build-moonlander-builtin-shajra-hex -> /nix/store/m5cl2x0y4i8vgh55iy2wffvgy0rrzl4v-moonlander-builtin-shajra.bin
├── build-moonlander-factory-flash -> /nix/store/xymnz7f3m2chsbc17n54dn3v0bdyfq41-moonlander-factory-flash
├── build-moonlander-factory-hex -> /nix/store/wm254ik49bbxja43258qlfggljcnrlwg-moonlander-factory.bin
├── flash-ergodoxez -> /nix/store/394hws5m30rvkgm3l7ss6kghsfhffhlx-flash-ergodoxez
├── flash-model01 -> /nix/store/wdfb6hbkmdkrqqj4qglcpcsn45licip1-flash-model01
├── flash-model100 -> /nix/store/vmp5k8z6wh6dp4q4x8p4j61w9bsh9dmh-flash-model100
├── flash-moonlander -> /nix/store/9yv58my1w1d36cq01dw55jinslhdd8ry-flash-moonlander
└── licenses -> /nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

18 directories, 4 files

Expand Down
48 changes: 24 additions & 24 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ head -c350 < <(./flash-ergodoxez) | ansifilter
: Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap)
: =================================================================
:
: FLASH SOURCE: /nix/store/6qxkvc6j96syxn3wm6pgxbz1856b543d-qmk-builtin-shajra-src
: FLASH BINARY: /nix/store/vjmjznb6gsyphab4www0jhxpzrfs4snd-ergodoxez-builtin-shajra.hex
: FLASH SOURCE: /nix/store/aa826crvdxi7rad5hmdyba6vbh9zrngz-qmk-builtin-shajra-src
: FLASH BINARY: /nix/store/cs9ziwzchrcwzwz7nvwv25ik50v44n48-ergodoxez-builtin-shajra.hex
:
: ⠋ Press the reset button of your keyboard

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

#+results: nix-build
#+begin_example
/nix/store/7hncj20iwf8fgdy57wlady46sqfbjhxn-shajra-keyboards-ci
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/8x9i0m1l7z07c6678q8rvm19nw8bbxwf-ergodoxez-builtin-shajra-flash
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/vjmjznb6gsyphab4www0jhxpzrfs4snd-ergodoxez-builtin-shajra.hex
├── build-ergodoxez-factory-flash -> /nix/store/ys1cp0g3d62h8vxn8w8dkz9lq4y363n7-ergodoxez-factory-flash
├── build-ergodoxez-factory-hex -> /nix/store/lxqa4q47drnfb6hv7wc5n0pidljw56yv-ergodoxez-factory.hex
├── build-model01-builtin-shajra-flash -> /nix/store/9kwliyxg4jjn29x3k1llapxc1kr1nrgj-model01-builtin-shajra-flash
├── build-model01-builtin-shajra-hex -> /nix/store/ww15f5sr617bl00snqninwdqaz7wya6y-model01-builtin-shajra-hex
├── build-model01-factory-flash -> /nix/store/325cwh9hisxidlvr923c9b8qfl3f1afq-model01-factory-flash
├── build-model01-factory-hex -> /nix/store/b2zl36f1a8xm2g5cq2p6kfmzinqay5wm-model01-factory-hex
├── build-model100-builtin-shajra-flash -> /nix/store/ikc4mzmmlsy1zg8sp4g5788xmxrmxaa0-model100-builtin-shajra-flash
├── build-model100-builtin-shajra-hex -> /nix/store/gzmzgagfl0mbgxap9llpykc8bs43n7m4-model100-builtin-shajra-hex
├── build-model100-factory-flash -> /nix/store/gzrlaqsrld7lparn9w8rvxi23w5zcm9z-model100-factory-flash
├── build-model100-factory-hex -> /nix/store/w1m420ijk5lznmb346ay08w86qxjryq5-model100-factory-hex
├── build-moonlander-builtin-shajra-flash -> /nix/store/prdp5wlccv4bqwpxk8yrv57yl4zbk0nf-moonlander-builtin-shajra-flash
├── build-moonlander-builtin-shajra-hex -> /nix/store/qfmhip746bq93p6maf1iwlxmickk6hbh-moonlander-builtin-shajra.bin
├── build-moonlander-factory-flash -> /nix/store/zp73y9j1hq95l5681idcaqzpgj3hdbm9-moonlander-factory-flash
├── build-moonlander-factory-hex -> /nix/store/kd751b9rasy879rdkf4dhrbgw4y5q55s-moonlander-factory.bin
├── flash-ergodoxez -> /nix/store/q1wzl1rylqphni6p30vpwl86j5bahqvf-flash-ergodoxez
├── flash-model01 -> /nix/store/qiva80nvhliqvqid2shnmf0vrw0qyqv3-flash-model01
├── flash-model100 -> /nix/store/98kggkny08an32lxgzzrk9mxyzihbaph-flash-model100
├── flash-moonlander -> /nix/store/k5nqj1i1v5lgxv9sv01k3z105mmbc1bl-flash-moonlander
└── licenses -> /nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
/nix/store/is6p492w9jx5g3vnfnav5r4l7cbixs87-shajra-keyboards-ci
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/ivnp3f1qbx5zv8qr23a24w99wjddmsk3-ergodoxez-builtin-shajra-flash
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/cs9ziwzchrcwzwz7nvwv25ik50v44n48-ergodoxez-builtin-shajra.hex
├── build-ergodoxez-factory-flash -> /nix/store/pbkiw24jhldwa2rizlww5scl906m623a-ergodoxez-factory-flash
├── build-ergodoxez-factory-hex -> /nix/store/z4zlkqkfq7hz3niwhgsiybach6bhm9rb-ergodoxez-factory.hex
├── build-model01-builtin-shajra-flash -> /nix/store/v6b91bf95jhysspnrm89gdvpf6isk6d4-model01-builtin-shajra-flash
├── build-model01-builtin-shajra-hex -> /nix/store/qjd6cghvmdimipgr4gmbsacz4cxqmxjz-model01-builtin-shajra-hex
├── build-model01-factory-flash -> /nix/store/23n9afkin81xwzqa37pqikwhi0m5ym4w-model01-factory-flash
├── build-model01-factory-hex -> /nix/store/vzk5gidmf7b5rdz10ykpswdf3a95ppad-model01-factory-hex
├── build-model100-builtin-shajra-flash -> /nix/store/vkd1ypjywfsnf8b5947xncawjac9q18k-model100-builtin-shajra-flash
├── build-model100-builtin-shajra-hex -> /nix/store/9gn9hb4q3ydi6v6jrckwm39qs9ks7w3w-model100-builtin-shajra-hex
├── build-model100-factory-flash -> /nix/store/dc5i79976j7wz68p5s7ymqdjyxv0d8vb-model100-factory-flash
├── build-model100-factory-hex -> /nix/store/73flvjp1yf05aklbm6sq5m2qy7ks62a4-model100-factory-hex
├── build-moonlander-builtin-shajra-flash -> /nix/store/zyp5lxp5xd366879xnalsagc15x5y2lp-moonlander-builtin-shajra-flash
├── build-moonlander-builtin-shajra-hex -> /nix/store/m5cl2x0y4i8vgh55iy2wffvgy0rrzl4v-moonlander-builtin-shajra.bin
├── build-moonlander-factory-flash -> /nix/store/xymnz7f3m2chsbc17n54dn3v0bdyfq41-moonlander-factory-flash
├── build-moonlander-factory-hex -> /nix/store/wm254ik49bbxja43258qlfggljcnrlwg-moonlander-factory.bin
├── flash-ergodoxez -> /nix/store/394hws5m30rvkgm3l7ss6kghsfhffhlx-flash-ergodoxez
├── flash-model01 -> /nix/store/wdfb6hbkmdkrqqj4qglcpcsn45licip1-flash-model01
├── flash-model100 -> /nix/store/vmp5k8z6wh6dp4q4x8p4j61w9bsh9dmh-flash-model100
├── flash-moonlander -> /nix/store/9yv58my1w1d36cq01dw55jinslhdd8ry-flash-moonlander
└── licenses -> /nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

18 directories, 4 files
#+end_example
Expand Down
14 changes: 7 additions & 7 deletions doc/nix-language.md
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,13 @@ nix eval --impure --expr '
```

{
lastModified = 1731930289;
lastModifiedDate = "20241118114449";
narHash = "sha256-eOHQ7pD8OfSLIIFfF6daCnntzHKqpraAGFfFqSlPtbY=";
outPath = "/nix/store/n4yc76agwgn6racs698s5wnyn89mp5hl-source";
rev = "769337c227799aa60911562b6940530f4a86eb3c";
revCount = 870;
shortRev = "769337c";
lastModified = 1736355571;
lastModifiedDate = "20250108165931";
narHash = "sha256-DVi0PxB9bVYpU/3n+4WnryJcVTirOrUf/fXlhV6u4Gc=";
outPath = "/nix/store/r10vigfpqcnchrlyj3bimq6padcx4335-source";
rev = "739a486eced6c09e4c705f92fd6353e8f7f833c0";
revCount = 873;
shortRev = "739a486";
submodules = false;
}

Expand Down
14 changes: 7 additions & 7 deletions doc/nix-language.org
Original file line number Diff line number Diff line change
Expand Up @@ -527,13 +527,13 @@ nix eval --impure --expr '
#+RESULTS:
#+begin_example
{
lastModified = 1731930289;
lastModifiedDate = "20241118114449";
narHash = "sha256-eOHQ7pD8OfSLIIFfF6daCnntzHKqpraAGFfFqSlPtbY=";
outPath = "/nix/store/n4yc76agwgn6racs698s5wnyn89mp5hl-source";
rev = "769337c227799aa60911562b6940530f4a86eb3c";
revCount = 870;
shortRev = "769337c";
lastModified = 1736355571;
lastModifiedDate = "20250108165931";
narHash = "sha256-DVi0PxB9bVYpU/3n+4WnryJcVTirOrUf/fXlhV6u4Gc=";
outPath = "/nix/store/r10vigfpqcnchrlyj3bimq6padcx4335-source";
rev = "739a486eced6c09e4c705f92fd6353e8f7f833c0";
revCount = 873;
shortRev = "739a486";
submodules = false;
}
#+end_example
Expand Down
10 changes: 5 additions & 5 deletions doc/nix-usage-flakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ If we're curious about what version of WezTerm is available in NixOS's latest re
nix search nixpkgs/nixos-24.11#wezterm ^
```

* legacyPackages.x86_64-linux.wezterm (20240203-110809-5046fc22)
* legacyPackages.x86_64-linux.wezterm (0-unstable-2025-01-03)
GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust

Here `/nixos-24.11` overrides the default `nixpkgs-unstable` branch of the registry entry, and the `#wezterm` suffix searches not just the flake, but a specific package named `wezterm`, which will either be found or not (there's no need for regexes to filter further).
Expand Down Expand Up @@ -265,7 +265,7 @@ After a successful call of `nix build`, you'll see one or more symlinks for each
readlink result*
```

/nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
/nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

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

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

/nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
/nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

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

Expand Down Expand Up @@ -400,7 +400,7 @@ nix shell --ignore-environment \
--command which shajra-keyboards-licenses
```

/nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
/nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses/bin/shajra-keyboards-licenses

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

Expand Down Expand Up @@ -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/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
Store paths: /nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

If we want to uninstall a program from our profile, we can reference it by name:

Expand Down
10 changes: 5 additions & 5 deletions doc/nix-usage-flakes.org
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ nix search nixpkgs/nixos-<<get("nixos-latest")>>#wezterm ^ | ansifilter
#+end_src

#+RESULTS: nix-search-remote-wezterm
: * legacyPackages.x86_64-linux.wezterm (20240203-110809-5046fc22)
: * legacyPackages.x86_64-linux.wezterm (0-unstable-2025-01-03)
: GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust

Here {{{get(nixos-latest,~/nixos-,~)}}} overrides the default =nixpkgs-unstable=
Expand Down Expand Up @@ -445,7 +445,7 @@ readlink result*
#+end_src

#+RESULTS: nix-build-link
: /nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
: /nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

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

Expand Down Expand Up @@ -474,7 +474,7 @@ nix path-info .#<<get("package-attr-short")>>
#+end_src

#+results: nix-build-path
: /nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
: /nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

** Running commands in a shell

Expand Down Expand Up @@ -636,7 +636,7 @@ nix shell --ignore-environment \
#+end_src

#+RESULTS: nix-shell-remote
: /nix/store/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
: /nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses/bin/shajra-keyboards-licenses

What we do with local flake references can work just as well with remote flake
references.
Expand Down Expand Up @@ -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/0j21pcb18j263lp16n2rabi6yxpix56x-shajra-keyboards-licenses
: Store paths: /nix/store/byrsn78pcm86a8xaz57fvly91xp1nsnx-shajra-keyboards-licenses

If we want to uninstall a program from our profile, we can reference it by name:

Expand Down
Loading

0 comments on commit 7accb74

Please sign in to comment.