Styx: Do not cache to CF anymore

home/hosts/Styx.nix

@@ -1,8 +1,5 @@
 args@{ pkgs, config, lib, ... }:
 
-let
-  secret = import ../../secret/hosts/Styx.nix;
-in
 {
   imports = [
     ../programs/fish.nix
@@ -19,8 +16,6 @@ in
 
     ../programs/btop.nix
 
-    (import ../programs/custom-nix-cache.nix (args // { inherit secret; }))
-
     ../programs/fzf.nix
 
     ../programs/gpg.nix

home/programs/scripts/nixpkgs-switch

@@ -26,17 +26,15 @@ switch $os
         sudo nixos-rebuild switch --flake .
 end
 
+rm -f result
+
 if test $status -eq 0
-    set system_new (readlink /run/current-system)
-
-    rm -f result
-
-    if test -e "$HOME/.bin/upload-nifoc-nix-cache"
-        echo "Updating nifoc-nix-cache ..."
-        upload-nifoc-nix-cache
-    end
-
-    nvd diff "$system_old" "$system_new"
+    and test -e "$HOME/.bin/upload-nifoc-nix-cache"
+    echo "Updating nifoc-nix-cache ..."
+    upload-nifoc-nix-cache
 end
 
+set system_new (readlink /run/current-system)
+nvd diff "$system_old" "$system_new"
+
 popd

system/hosts/Styx.nix

@@ -1,10 +1,3 @@
-{ lib, ... }:
-
-let
-  inherit (lib) optionals;
-
-  secret = import ../../secret/hosts/Styx.nix;
-in
 {
   imports = [
     ../darwin/defaults.nix
@@ -26,16 +19,12 @@ in
         "https://nix-community.cachix.org"
         "https://wurzelpfropf.cachix.org"
         "https://nifoc.cachix.org"
-      ] ++ optionals secret.nix-cache.nifoc.enabled [
-        secret.nix-cache.nifoc.s3Url
       ];
 
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
         "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
-      ] ++ optionals secret.nix-cache.nifoc.enabled [
-        secret.nix-cache.nifoc.publicKeyValue
       ];
 
       trusted-users = [ "@admin" ];