From c3094c4b76014166b2f7726769ecd1e34486198b Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 6 Mar 2024 18:50:48 +0100 Subject: [PATCH] fix: use unfree nomad, add activation script to show closure diffs --- modules/nix/default.nix | 12 ++++++++++++ users/teutat3s/home.nix | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 09c4d421..124aad98 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -11,11 +11,23 @@ "brscan5" "brscan5-etc-files" "facetimehd-firmware" + "nomad" "slack" "veracrypt" "zoom" ]; + system.activationScripts.diff-closures = { + text ='' + if [[ -e /run/current-system ]]; then + ${config.nix.package}/bin/nix store diff-closures \ + /run/current-system "$systemConfig" \ + --extra-experimental-features nix-command + fi + ''; + supportsDryActivation = true; + }; + nix = { # Use default version alias for nix package package = pkgs.nix; diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index b321e0f3..53a14004 100644 --- a/users/teutat3s/home.nix +++ b/users/teutat3s/home.nix @@ -72,7 +72,7 @@ in { ifmetric ipmitool #keybase-gui - nomad_1_4 + nomad thunderbird vault veracrypt @@ -87,7 +87,7 @@ in { source ${flake.inputs.tritonshell.packages.${pkgs.system}.triton-utils}/bin/ttp.sh complete -C ${pkgs.consul}/bin/consul consul - complete -C ${pkgs.nomad_1_4}/bin/nomad nomad + complete -C ${pkgs.nomad}/bin/nomad nomad complete -C ${pkgs.vault}/bin/vault vault complete -C ${flake.inputs.nixos-22-05.legacyPackages.${pkgs.system}.terraform}/bin/terraform terraform complete -C ${pkgs.waypoint}/bin/waypoint waypoint