diff --git a/.tangled/workflows/publish-cachix-aarch64.yml b/.tangled/workflows/publish-cachix-aarch64.yml
index 6c306a7..cc991a9 100644
--- a/.tangled/workflows/publish-cachix-aarch64.yml
+++ b/.tangled/workflows/publish-cachix-aarch64.yml
@@ -17,4 +17,5 @@ steps:
 
   - name: Build and push aarch64
     command: |
-      nix-store -qR --include-outputs $(nix-store -qd $(nix build .#packages.x86_64-linux.tranquil-pds-aarch64 --accept-flake-config --print-out-paths --no-link)) | grep -v '\.drv$' | cachix push "$CACHIX_CACHE_NAME"
+      SUBS="--option extra-substituters https://tranquil.cachix.org --option extra-trusted-public-keys tranquil.cachix.org-1:PoO+mGL6a6LcJiPakMDHN4E218/ei/7v2sxeDtNkSRg="
+      nix-store -qR --include-outputs $(nix-store -qd $(nix build .#packages.x86_64-linux.tranquil-pds-aarch64 $SUBS --print-out-paths --no-link)) | grep -v '\.drv$' | cachix push "$CACHIX_CACHE_NAME"
diff --git a/.tangled/workflows/publish-cachix-x86_64.yml b/.tangled/workflows/publish-cachix-x86_64.yml
index 7c13b88..a7219a6 100644
--- a/.tangled/workflows/publish-cachix-x86_64.yml
+++ b/.tangled/workflows/publish-cachix-x86_64.yml
@@ -17,10 +17,12 @@ steps:
 
   - name: Build and push x86_64
     command: |
-      nix-store -qR --include-outputs $(nix-store -qd $(nix build .#packages.x86_64-linux.tranquil-pds --accept-flake-config --print-out-paths --no-link)) | grep -v '\.drv$' | cachix push "$CACHIX_CACHE_NAME"
-      nix-store -qR --include-outputs $(nix-store -qd $(nix build .#packages.x86_64-linux.tranquil-frontend --accept-flake-config --print-out-paths --no-link)) | grep -v '\.drv$' | cachix push "$CACHIX_CACHE_NAME"
+      SUBS="--option extra-substituters https://tranquil.cachix.org --option extra-trusted-public-keys tranquil.cachix.org-1:PoO+mGL6a6LcJiPakMDHN4E218/ei/7v2sxeDtNkSRg="
+      nix-store -qR --include-outputs $(nix-store -qd $(nix build .#packages.x86_64-linux.tranquil-pds $SUBS --print-out-paths --no-link)) | grep -v '\.drv$' | cachix push "$CACHIX_CACHE_NAME"
+      nix-store -qR --include-outputs $(nix-store -qd $(nix build .#packages.x86_64-linux.tranquil-frontend $SUBS --print-out-paths --no-link)) | grep -v '\.drv$' | cachix push "$CACHIX_CACHE_NAME"
 
   - name: Build and push devShell
     command: |
-      nix develop --accept-flake-config --profile dev-profile -c true
+      SUBS="--option extra-substituters https://tranquil.cachix.org --option extra-trusted-public-keys tranquil.cachix.org-1:PoO+mGL6a6LcJiPakMDHN4E218/ei/7v2sxeDtNkSRg="
+      nix develop $SUBS --profile dev-profile -c true
       cachix push "$CACHIX_CACHE_NAME" dev-profile
diff --git a/flake.nix b/flake.nix
index 4dd180c..efa006f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,21 +3,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
 
-  nixConfig = {
-    extra-substituters = [
-      "https://tranquil.cachix.org"
-      "https://nix-community.cachix.org"
-      "https://cache.garnix.io"
-      "https://devenv.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "tranquil.cachix.org-1:PoO+mGL6a6LcJiPakMDHN4E218/ei/7v2sxeDtNkSRg="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
-    ];
-  };
-
   outputs =
     {
       self,