Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nix/activation-script: update for nushell 0.95 #890

Merged
merged 1 commit into from
Jun 29, 2024
Merged

nix/activation-script: update for nushell 0.95 #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 18 additions & 21 deletions modules/nix/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,23 @@ Shorthand search (`nix search nixpkgs ...`) with much nicer output.
Shows changed packages after running `nixos-rebuild switch/boot` and change in total size of installed packages. Changes that don't affect the installed size are filtered out. Intended to be added to `configuration.nix` of `NixOS`.

```
╭─────────────────┬─────────────┬─────────────┬───────────╮
│ Package │ Old_Version │ New_Version │ Diff │
├─────────────────┼─────────────┼─────────────┼───────────┤
│ xwayland │ ∅ │ 24.1.0 │ 5.3 MB │
│ lsp-plugins │ 1.2.15 │ 1.2.16 │ 1.1 MB │
│ libei │ ∅ │ 1.2.1 │ 547.6 KB │
│ libXfont2 │ ∅ │ 2.0.6 │ 270.0 KB │
│ xkbcomp │ ∅ │ 1.4.7 │ 235.7 KB │
│ font-util │ ∅ │ 1.4.1 │ 234.1 KB │
│ libxkbfile │ ∅ │ 1.1.3 │ 174.6 KB │
│ xfsprogs │ 6.6.0 │ 6.8.0 │ 61.0 KB │
│ xcb-util-errors │ ∅ │ 1.0.1 │ 48.5 KB │
│ libieee1284 │ 0.2.11 │ ∅ │ -123.1 KB │
│ libgnomekbd │ 3.28.1 │ ∅ │ -702.0 KB │
│ xwayland │ 24.1.0 │ ∅ │ -5.3 MB │
│ libgweather │ 4.4.0 │ ∅ │ -23.8 MB │
╰─────────────────┴─────────────┴─────────────┴───────────╯

╭──────┬──────────╮
│ Diff │ -22.0 MB │
╰──────┴──────────╯
╭────┬──────────────────┬───────────────────────┬────────┬────────────╮
│ # │ Package │ Old │ New │ Diff │
├────┼──────────────────┼───────────────────────┼────────┼────────────┤
│ 0 │ nushell │ 0.94.1 │ 0.95.0 │ 192.1 KiB │
│ 1 │ hyprland │ 0.41.1 │ 0.41.2 │ 52.9 KiB │
│ 2 │ qtdeclarative │ 6.7.1 │ 6.7.2 │ 36.2 KiB │
│ 3 │ linux │ 6.9.6 │ 6.9.7 │ 17.7 KiB │
│ 4 │ qtbase │ 6.7.1 │ 6.7.2 │ 16.1 KiB │
│ 5 │ networkmanager │ 1.48.0 │ 1.48.2 │ 8.3 KiB │
│ 6 │ wireplumber │ 0.5.3 │ 0.5.4 │ -21.4 KiB │
│ 7 │ libbacktrace │ 0-unstable-2024-03-02 │ ∅ │ -110.4 KiB │
│ 8 │ woff2 │ 1.0.2 │ ∅ │ -155.5 KiB │
│ 9 │ libmanette │ 0.2.7 │ ∅ │ -226.0 KiB │
│ 10 │ webkitgtk │ 2.44.2+abi=6.0 │ ∅ │ -147.6 MiB │
│ 11 │ telegram-desktop │ 5.1.8 │ ∅ │ -219.4 MiB │
│ 12 │ │ │ │ │
│ 13 │ │ │ Total: │ -367.2 MiB │
╰────┴──────────────────┴───────────────────────┴────────┴────────────╯
```

3 changes: 1 addition & 2 deletions modules/nix/activation-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ nix.settings.experimental-features = ["nix-command"];

system.activationScripts.diff = ''
if [[ -e /run/current-system ]]; then
echo
${pkgs.nushell}/bin/nu -c "let diff_closure = ${pkgs.nix}/bin/nix store diff-closures /run/current-system '$systemConfig'; if \$diff_closure != \"\" { let table = \$diff_closure | lines | where \$it =~ KiB | where \$it =~ → | parse -r '^(?<Package>\S+): (?<Old_Version>[^,]+)(?:.*) → (?<New_Version>[^,]+)(?:.*, )(?<DiffBin>.*)$' | insert Diff { get DiffBin | ansi strip | str trim -l -c '+' | into filesize } | reject DiffBin | sort-by -r Diff; print \$table; \$table | math sum }"
${pkgs.nushell}/bin/nu -c "let diff_closure = ${pkgs.nix}/bin/nix store diff-closures /run/current-system '$systemConfig'; if (\$diff_closure | is-not-empty) { let table = \$diff_closure | lines | where \$it =~ KiB | where \$it =~ → | parse -r '^(?<Package>\S+): (?<Old>[^,]+)(?:.*) → (?<New>[^,]+)(?:.*), (?<DiffBin>.*)$' | insert Diff { get DiffBin | ansi strip | into filesize } | sort-by -r Diff | reject DiffBin; print \"\"; \$table | append [[Package Old New Diff]; [\"\" \"\" \"\" \"\"]] | append [[Package Old New Diff]; [\"\" \"\" \"Total:\" (\$table | get Diff | math sum)]] | print; print \"\" }"
fi
'';