Squash merge testing into main

This commit is contained in:
Don Harper 2026-01-06 23:27:49 -06:00
parent fa956f5da2
commit 30bb818058
18 changed files with 289 additions and 97 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
system.activationScripts.diff = {
supportsDryActivation = true;
text = ''

View file

@ -183,6 +183,7 @@ in {
podman
poppler-utils
ruby
sshfs
sops
udiskie
];

View file

@ -1,5 +1,5 @@
{ pkgs, ... }: {
system.activationScripts.diff = {
stdenv.hostPlatform.system.activationScripts.diff = {
supportsDryActivation = true;
text = ''
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"

View file

@ -349,6 +349,7 @@ in {
poppler-utils
pulseaudio
ruby
sshfs
sops
termsonic
# toot