Fixes reporting package changes

justfile

@@ -28,9 +28,9 @@ _switch: _build
     ./result/sw/bin/darwin-rebuild -v switch --flake "{{ root_dir }}"
 
 # switch to latest home-manager generation
-switch: (_run "_switch")
+switch: (_run "_switch") && _report-changes
 
-_update: && _switch _brew-update
+_update: && _switch _brew-update _report-changes
     nix flake update --commit-lock-file "{{ root_dir }}"
     $NIXPKGS_PATH/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > \
         {{ root_dir }}/programs/vscode/extensions.nix
@@ -40,11 +40,19 @@ _brew-update:
     brew upgrade
     mas upgrade
 
+_report-changes:
+  #!/bin/bash
+  if [ $(ls -d1v /nix/var/nix/profiles/system-*-link 2>/dev/null | wc -l) -lt 2 ]; then
+    echo "Skipping changes report..."
+  else
+    nvd diff $(/bin/ls -d1v /nix/var/nix/profiles/system-*-link | tail -2)
+  fi
+
 # update packages and switch
 update: (_run "_update")
 
 # clean up nix garbage
-clean:
-    home-manager expire-generations "-7 days"
-    sudo nix-collect-garbage -d --delete-older-than 7d
-    brew cleanup  --prune 7
+clean days="7":
+    home-manager expire-generations "-{{days}} days"
+    sudo nix-collect-garbage -d --delete-older-than {{days}}d
+    brew cleanup  --prune {{days}}

programs/default.nix

@@ -8,6 +8,7 @@ let
     nix-diff
     nix-tree
     nixfmt
+    nvd
     rnix-lsp
     statix
     cachix

scripts/default.nix

@@ -1,4 +1,3 @@
 { config, lib, pkgs, ... }:
 
-let rc = pkgs.callPackage ./report-hm-changes.nix { inherit config pkgs; };
-in { home.packages = [ rc ]; }
+{ home.packages = []; }

scripts/report-hm-changes.nix

@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-
-let profiles = "/nix/var/nix/profiles/per-user/${config.home.username}/profile-*-link";
-in pkgs.writeShellScriptBin "report-hm-changes" ''
-  # Disable nvd if there are less than 2 hm profiles.
-  if [ $(/bin/ls -d1v ${profiles} 2>/dev/null | wc -l) -lt 2 ]; then
-    echo "Skipping changes report..."
-  else
-    ${pkgs.nvd}/bin/nvd diff $(/bin/ls -d1v ${profiles} | tail -2)
-  fi
-''