From 016b1608eec6c54cfaece96b63ec9d1a6cd4672b Mon Sep 17 00:00:00 2001
From: gnammix <71704832+gnammix@users.noreply.github.com>
Date: Fri, 27 Dec 2024 21:36:31 +0100
Subject: power: restartAfterPowerFailure option is carried out in activation
 script only if supported

Minor documentation change
---
 modules/power/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/power/default.nix b/modules/power/default.nix
index a99905f..e36a027 100644
--- a/modules/power/default.nix
+++ b/modules/power/default.nix
@@ -15,6 +15,8 @@ in
       default = null;
       description = ''
         Whether to restart the computer after a power failure.
+
+        Option is not supported on all devices.
       '';
     };
 
@@ -33,8 +35,10 @@ in
       echo "configuring power..." >&2
 
       ${lib.optionalString (cfg.restartAfterPowerFailure != null) ''
-        systemsetup -setRestartPowerFailure \
-          '${onOff cfg.restartAfterPowerFailure}' &> /dev/null
+        if ! systemsetup -getRestartPowerFailure | grep -q "Not supported"; then
+          systemsetup -setRestartPowerFailure \
+            '${onOff cfg.restartAfterPowerFailure}' &> /dev/null
+        fi
       ''}
 
       ${lib.optionalString (cfg.restartAfterFreeze != null) ''
-- 
cgit v1.2.3


From 62d8f5f289341497ea0fa21814e734cbea69a0a1 Mon Sep 17 00:00:00 2001
From: gnammix <71704832+gnammix@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:13:54 +0100
Subject: power: move the check for restartPowerfailure support to checks.nix

---
 modules/power/default.nix |  6 ++----
 modules/system/checks.nix | 10 ++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/power/default.nix b/modules/power/default.nix
index e36a027..c3e4974 100644
--- a/modules/power/default.nix
+++ b/modules/power/default.nix
@@ -35,10 +35,8 @@ in
       echo "configuring power..." >&2
 
       ${lib.optionalString (cfg.restartAfterPowerFailure != null) ''
-        if ! systemsetup -getRestartPowerFailure | grep -q "Not supported"; then
-          systemsetup -setRestartPowerFailure \
-            '${onOff cfg.restartAfterPowerFailure}' &> /dev/null
-        fi
+        systemsetup -setRestartPowerFailure \
+          '${onOff cfg.restartAfterPowerFailure}' &> /dev/null
       ''}
 
       ${lib.optionalString (cfg.restartAfterFreeze != null) ''
diff --git a/modules/system/checks.nix b/modules/system/checks.nix
index 796e7e4..e6ee1b3 100644
--- a/modules/system/checks.nix
+++ b/modules/system/checks.nix
@@ -308,6 +308,15 @@ let
         exit 2
     fi
   '';
+
+  # some mac devices, notably notebook do not support restartAfterPowerFailure option
+  restartAfterPowerFailureIsSupported = ''
+    if sudo /usr/sbin/systemsetup -getRestartPowerFailure | grep -q "Not supported"; then
+       echo "error: Your system do not support the restartAfterPowerFailure feature" >&2
+       echo "Please ensure that power.restartAfterPowerFailure is not set." >&2
+       exit 2
+    fi
+  '';
 in
 
 {
@@ -357,6 +366,7 @@ in
       (mkIf cfg.verifyNixPath nixPath)
       oldSshAuthorizedKeysDirectory
       (mkIf config.homebrew.enable homebrewInstalled)
+      (mkIf (config.power.restartAfterPowerFailure != null) restartAfterPowerFailureIsSupported)
     ];
 
     system.activationScripts.checks.text = ''
-- 
cgit v1.2.3


From 492a72007ae2e7bd5895458fcd72ac2c8c9a0dc4 Mon Sep 17 00:00:00 2001
From: gnammix <71704832+gnammix@users.noreply.github.com>
Date: Tue, 31 Dec 2024 14:38:42 +0100
Subject: power: echo to print in error messages

Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
---
 modules/system/checks.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/checks.nix b/modules/system/checks.nix
index e6ee1b3..91622e5 100644
--- a/modules/system/checks.nix
+++ b/modules/system/checks.nix
@@ -312,8 +312,8 @@ let
   # some mac devices, notably notebook do not support restartAfterPowerFailure option
   restartAfterPowerFailureIsSupported = ''
     if sudo /usr/sbin/systemsetup -getRestartPowerFailure | grep -q "Not supported"; then
-       echo "error: Your system do not support the restartAfterPowerFailure feature" >&2
-       echo "Please ensure that power.restartAfterPowerFailure is not set." >&2
+       printf >&2 "�[1;31merror: restarting after power failure is not supported on your machine�[0m\n" >&2
+       printf >&2 "Please ensure that `power.restartAfterPowerFailure` is not set.\n" >&2
        exit 2
     fi
   '';
-- 
cgit v1.2.3