From 26c02d82788536dc863196ef8756df07f478c813 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 11 Jan 2025 15:44:41 +0000
Subject: [PATCH] etc: merge `etcChecks` into `checks`

The `activate-system` daemon will now run all the checks, which seems
like probably a good idea anyway?
---
 modules/nix/default.nix                      | 2 +-
 modules/services/activate-system/default.nix | 2 +-
 modules/system/activation-scripts.nix        | 1 -
 modules/system/etc.nix                       | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 6f32651a..540fbc56 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -876,7 +876,7 @@ in
     #
     # TODO: Maybe this could use a more general file placement mechanism
     # to express that we want it deleted and know only one hash?
-    system.activationScripts.etcChecks.text = mkAfter ''
+    system.activationScripts.checks.text = mkAfter ''
       nixCustomConfKnownSha256Hashes=(
         # v0.33.0
         6787fade1cf934f82db554e78e1fc788705c2c5257fddf9b59bdd963ca6fec63
diff --git a/modules/services/activate-system/default.nix b/modules/services/activate-system/default.nix
index f935ee1b..cb0fd12f 100644
--- a/modules/services/activate-system/default.nix
+++ b/modules/services/activate-system/default.nix
@@ -65,7 +65,7 @@ in
           ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
         fi
 
-        ${config.system.activationScripts.etcChecks.text}
+        ${config.system.activationScripts.checks.text}
         ${config.system.activationScripts.etc.text}
         ${config.system.activationScripts.keyboard.text}
       '';
diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
index 646929da..023dc3f8 100644
--- a/modules/system/activation-scripts.nix
+++ b/modules/system/activation-scripts.nix
@@ -113,7 +113,6 @@ in
 
       ${cfg.activationScripts.preActivation.text}
 
-      ${cfg.activationScripts.etcChecks.text}
       ${cfg.activationScripts.createRun.text}
       ${cfg.activationScripts.checks.text}
       ${cfg.activationScripts.extraActivation.text}
diff --git a/modules/system/etc.nix b/modules/system/etc.nix
index bc60bef9..c9cae7c6 100644
--- a/modules/system/etc.nix
+++ b/modules/system/etc.nix
@@ -39,7 +39,7 @@ in
         '') etc}
       '';
 
-    system.activationScripts.etcChecks.text = ''
+    system.activationScripts.checks.text = mkAfter ''
       declare -A etcSha256Hashes=(
         ${concatMapStringsSep "\n  "
           (attr: