rebuild sops hack by default since the same bug in sops-nix is causing issues on other clients now as well with wg etc

2 files changed, 14 insertions, 13 deletions

diff --git a/nixos/secrets.nix b/nixos/secrets.nix
index 0691255..3d21e62 100644
--- a/nixos/secrets.nix
+++ b/nixos/secrets.nix
@@ -5,4 +5,18 @@
 		defaultSopsFormat = "yaml";
 		age.sshKeyPaths = [ "/root/.ssh/id_ed25519" ];
 	};
+
+
+	# This service is a workaround to ensure that secrets are available on
+	# reboot when the secret keys are on a separate subvolume
+	systemd.services.npcnix-force-rebuild-sops-hack = {
+		wantedBy = [ "multi-user.target" ];
+		before = [ "wpa_supplicant.service" ];
+		serviceConfig = {
+			ExecStart = "/run/current-system/activate";
+			Type = "oneshot";
+			Restart = "on-failure"; # because oneshot
+			RestartSec = "10s";
+		};
+	};
 }
diff --git a/users/timmy/wifi.nix b/users/timmy/wifi.nix
index 9afcbc7..8c762b0 100644
--- a/users/timmy/wifi.nix
+++ b/users/timmy/wifi.nix
@@ -21,18 +21,5 @@ in {
 		environment.etc."wpa_supplicant.conf" = {
 			source = config.sops.secrets.wpa_supplicant-conf.path;
 		};
-
-		# This service is a workaround to ensure that secrets are available on
-		# reboot when the secret keys are on a separate subvolume
-		systemd.services.npcnix-force-rebuild-sops-hack = {
-			wantedBy = [ "multi-user.target" ];
-			before = [ "wpa_supplicant.service" ];
-			serviceConfig = {
-				ExecStart = "/run/current-system/activate";
-				Type = "oneshot";
-				Restart = "on-failure"; # because oneshot
-				RestartSec = "10s";
-			};
-		};
 	};
 }