From 3a2a22f50343b887a85cf18fca4720f751eeafb8 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 13 Feb 2025 18:48:58 -0500 Subject: modules/determinate: make dedicated module --- modules/darwin/traits/default.nix | 1 - modules/darwin/traits/determinate.nix | 119 ---------------------------------- 2 files changed, 120 deletions(-) delete mode 100644 modules/darwin/traits/determinate.nix (limited to 'modules/darwin/traits') diff --git a/modules/darwin/traits/default.nix b/modules/darwin/traits/default.nix index 2ed5427..14812ea 100644 --- a/modules/darwin/traits/default.nix +++ b/modules/darwin/traits/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./determinate.nix ./users ]; } diff --git a/modules/darwin/traits/determinate.nix b/modules/darwin/traits/determinate.nix deleted file mode 100644 index 9d6367a..0000000 --- a/modules/darwin/traits/determinate.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - config, - lib, - inputs', - ... -}: - -let - cfg = config.traits.determinate; - - package = inputs'.determinate.packages.default; -in - -{ - config = lib.mkIf cfg.enable ( - lib.mkMerge [ - (lib.mkIf cfg.determinate-nixd.enable { - assertions = [ - { - assertion = config.nix.daemon; - message = "`nix.daemon` must be `true` when using `traits.determinate`"; - } - - { - assertion = !config.services.nix-daemon.enable; - message = "`services.nix-daemon` and `traits.determinate` conflict"; - } - ]; - - launchd.daemons = { - determinate-nixd-store.serviceConfig = { - Label = "systems.determinate.nix-store"; - RunAtLoad = true; - - StandardErrorPath = lib.mkForce "/var/log/determinate-nix-init.log"; - StandardOutPath = lib.mkForce "/var/log/determinate-nix-init.log"; - - ProgramArguments = lib.mkForce [ - "/usr/local/bin/determinate-nixd" - "--nix-bin" - "${config.nix.package}/bin" - "init" - ]; - }; - - determinate-nixd.serviceConfig = { - Label = "systems.determinate.nix-daemon"; - - StandardErrorPath = lib.mkForce "/var/log/determinate-nix-daemon.log"; - StandardOutPath = lib.mkForce "/var/log/determinate-nix-daemon.log"; - - ProgramArguments = lib.mkForce [ - "/usr/local/bin/determinate-nixd" - "--nix-bin" - "${config.nix.package}/bin" - "daemon" - ]; - - Sockets = { - "determinate-nixd.socket" = { - # We'd set `SockFamily = "Unix";`, but nix-darwin automatically sets it with SockPathName - SockPassive = true; - SockPathName = "/var/run/determinate-nixd.socket"; - }; - - "nix-daemon.socket" = { - # We'd set `SockFamily = "Unix";`, but nix-darwin automatically sets it with SockPathName - SockPassive = true; - SockPathName = "/var/run/nix-daemon.socket"; - }; - }; - - SoftResourceLimits = { - NumberOfFiles = lib.mkDefault 1048576; - NumberOfProcesses = lib.mkDefault 1048576; - Stack = lib.mkDefault 67108864; - }; - - HardResourceLimits = { - NumberOfFiles = lib.mkDefault 1048576; - NumberOfProcesses = lib.mkDefault 1048576; - Stack = lib.mkDefault 67108864; - }; - }; - }; - - nix.useDaemon = true; - - services.nix-daemon.enable = false; - - system.activationScripts = { - launchd.text = lib.mkBefore '' - if test -e /Library/LaunchDaemons/org.nixos.nix-daemon.plist; then - echo "Unloading org.nixos.nix-daemon" - launchctl bootout system /Library/LaunchDaemons/org.nixos.nix-daemon.plist || true - mv /Library/LaunchDaemons/org.nixos.nix-daemon.plist /Library/LaunchDaemons/.before-determinate-nixd.org.nixos.nix-daemon.plist.skip - fi - - if test -e /Library/LaunchDaemons/org.nixos.darwin-store.plist; then - echo "Unloading org.nixos.darwin-store" - launchctl bootout system /Library/LaunchDaemons/org.nixos.darwin-store.plist || true - mv /Library/LaunchDaemons/org.nixos.darwin-store.plist /Library/LaunchDaemons/.before-determinate-nixd.org.nixos.darwin-store.plist.skip - fi - - install -d -m 755 -o root -g wheel /usr/local/bin - cp ${lib.getExe package "determinate-nixd"} /usr/local/bin/.determinate-nixd.next - chmod +x /usr/local/bin/.determinate-nixd.next - mv /usr/local/bin/.determinate-nixd.next /usr/local/bin/determinate-nixd - ''; - - nix-daemon = lib.mkForce { - enable = false; - text = ""; - }; - }; - }) - ] - ); -} -- cgit v1.2.3