diff options
| -rw-r--r-- | modules/alias.nix | 5 | ||||
| -rw-r--r-- | modules/system/activation-scripts.nix | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/modules/alias.nix b/modules/alias.nix index bd372fe..d495d2f 100644 --- a/modules/alias.nix +++ b/modules/alias.nix @@ -21,6 +21,8 @@ in assertions = [ { assertion = config.nix.profile == null; message = "nix.profile was renamed to nix.package"; } { assertion = config.security.enableAccessibilityAccess == null; message = "security.enableAccessibilityAccess was removed, it's broken since 10.12 because of SIP"; } + { assertion = config.system.activationScripts.extraPostActivation.text == ""; message = "system.activationScripts.extraPostActivation was renamed to system.activationScripts.postActivation"; } + { assertion = config.system.activationScripts.extraUserPostActivation.text == ""; message = "system.activationScripts.extraUserPostActivation was renamed to system.activationScripts.postUserActivation"; } ]; warnings = mkIf (config.networking.networkservices != null) [ @@ -31,5 +33,8 @@ in nix.package = mkIf (config.nix.profile != null) config.nix.profile; + system.activationScripts.extraPostActivation.text = mkDefault ""; + system.activationScripts.extraUserPostActivation.text = mkDefault ""; + }; } diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix index 43f085c..8b873e7 100644 --- a/modules/system/activation-scripts.nix +++ b/modules/system/activation-scripts.nix @@ -50,8 +50,9 @@ in # Ensure a consistent umask. umask 0022 - ${cfg.activationScripts.extraActivation.text} + ${cfg.activationScripts.preActivation.text} + ${cfg.activationScripts.extraActivation.text} ${cfg.activationScripts.groups.text} ${cfg.activationScripts.users.text} ${cfg.activationScripts.nix.text} @@ -63,7 +64,7 @@ in ${cfg.activationScripts.networking.text} ${cfg.activationScripts.keyboard.text} - ${cfg.activationScripts.extraPostActivation.text} + ${cfg.activationScripts.postActivation.text} # Make this configuration the current configuration. # The readlink is there to ensure that when $systemConfig = /system @@ -91,14 +92,14 @@ in # Ensure a consistent umask. umask 0022 - ${cfg.activationScripts.checks.text} + ${cfg.activationScripts.preUserActivation.text} + ${cfg.activationScripts.checks.text} ${cfg.activationScripts.extraUserActivation.text} - ${cfg.activationScripts.defaults.text} ${cfg.activationScripts.userLaunchd.text} - ${cfg.activationScripts.extraUserPostActivation.text} + ${cfg.activationScripts.postUserActivation.text} exit $_status ''; @@ -106,9 +107,11 @@ in # Extra activation scripts, that can be customized by users # don't use this unless you know what you are doing. system.activationScripts.extraActivation.text = mkDefault ""; - system.activationScripts.extraPostActivation.text = mkDefault ""; + system.activationScripts.preActivation.text = mkDefault ""; + system.activationScripts.postActivation.text = mkDefault ""; system.activationScripts.extraUserActivation.text = mkDefault ""; - system.activationScripts.extraUserPostActivation.text = mkDefault ""; + system.activationScripts.preUserActivation.text = mkDefault ""; + system.activationScripts.postUserActivation.text = mkDefault ""; }; } |