From f4a75a6bf45f99c2d52672d6dbe449131cdb0ee9 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 7 Aug 2026 23:11:39 +0200 Subject: [PATCH 1/2] Add upgrade and diff diff script Add simple shell script for updating a flake and then dumping a diff of what's changing between current system and upgrade. The diff is computed by the nvd tool. --- .gitignore | 1 + nix-update-and-diff.sh | 7 +++++++ system/programs/default.nix | 1 + system/programs/nix/default.nix | 6 ++++++ 4 files changed, 15 insertions(+) create mode 100644 .gitignore create mode 100755 nix-update-and-diff.sh create mode 100644 system/programs/nix/default.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c4a847d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/result diff --git a/nix-update-and-diff.sh b/nix-update-and-diff.sh new file mode 100755 index 0000000..e566443 --- /dev/null +++ b/nix-update-and-diff.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -e + +nix flake update +nixos-rebuild build --flake . +nvd diff /run/current-system ./result diff --git a/system/programs/default.nix b/system/programs/default.nix index 8b24c55..c5a99c3 100644 --- a/system/programs/default.nix +++ b/system/programs/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./nix ./database ./hyprland ]; diff --git a/system/programs/nix/default.nix b/system/programs/nix/default.nix new file mode 100644 index 0000000..8c3f59f --- /dev/null +++ b/system/programs/nix/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + environment.systemPackages = [ + pkgs.nvd + ]; +} From 41e3ecf1692cf0b4c9debce97211491314c8d338 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 7 Aug 2026 23:19:13 +0200 Subject: [PATCH 2/2] Install nvd via home manager --- home/tools/dev.nix | 1 + system/programs/default.nix | 1 - system/programs/nix/default.nix | 6 ------ 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 system/programs/nix/default.nix diff --git a/home/tools/dev.nix b/home/tools/dev.nix index 956c432..82ad1c3 100644 --- a/home/tools/dev.nix +++ b/home/tools/dev.nix @@ -11,6 +11,7 @@ # Nix pkgs.nix-diff + pkgs.nvd pkgs.nixfmt-tree ]; } diff --git a/system/programs/default.nix b/system/programs/default.nix index c5a99c3..8b24c55 100644 --- a/system/programs/default.nix +++ b/system/programs/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./nix ./database ./hyprland ]; diff --git a/system/programs/nix/default.nix b/system/programs/nix/default.nix deleted file mode 100644 index 8c3f59f..0000000 --- a/system/programs/nix/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = [ - pkgs.nvd - ]; -}