Merge pull request #1169 from Enzime/push-uktzylymvtyk

activate-system: remove `enable` option

2 files changed, 4 insertions, 17 deletions

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index d99aae8..3751e8c 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -774,7 +774,6 @@ in
 
     # Not in NixOS module
     warnings = [
-      (mkIf (!config.services.activate-system.enable && cfg.distributedBuilds) "services.activate-system is not enabled, a reboot could cause distributed builds to stop working.")
       (mkIf (!cfg.distributedBuilds && cfg.buildMachines != []) "nix.distributedBuilds is not enabled, build machines won't be configured.")
     ];
 
diff --git a/modules/services/activate-system/default.nix b/modules/services/activate-system/default.nix
index c41d963..6a982fe 100644
--- a/modules/services/activate-system/default.nix
+++ b/modules/services/activate-system/default.nix
@@ -1,22 +1,11 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
-let
-  cfg = config.services.activate-system;
-in
-
 {
-  options = {
-    services.activate-system.enable = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Whether to activate system at boot time.";
-    };
-  };
-
-  config = mkIf cfg.enable {
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "activate-system" "enable" ] "The `activate-system` service is now always enabled as it is necessary for a working `nix-darwin` setup.")
+  ];
 
+  config = {
     launchd.daemons.activate-system = {
       script = ''
         set -e
@@ -41,6 +30,5 @@ in
       serviceConfig.RunAtLoad = true;
       serviceConfig.KeepAlive.SuccessfulExit = false;
     };
-
   };
 }