From fd4925111408439dc8a8b875a6c3c4aff970ff12 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 13 Feb 2025 21:07:48 -0500
Subject: modules: group services & traits into "custom" modules

---
 modules/darwin/custom/default.nix       |   5 ++
 modules/darwin/custom/determinate.nix   | 119 ++++++++++++++++++++++++++++++++
 modules/darwin/default.nix              |   2 +-
 modules/darwin/services/default.nix     |   5 --
 modules/darwin/services/determinate.nix | 119 --------------------------------
 5 files changed, 125 insertions(+), 125 deletions(-)
 create mode 100644 modules/darwin/custom/default.nix
 create mode 100644 modules/darwin/custom/determinate.nix
 delete mode 100644 modules/darwin/services/default.nix
 delete mode 100644 modules/darwin/services/determinate.nix

(limited to 'modules/darwin')

diff --git a/modules/darwin/custom/default.nix b/modules/darwin/custom/default.nix
new file mode 100644
index 0000000..499a418
--- /dev/null
+++ b/modules/darwin/custom/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./determinate.nix
+  ];
+}
diff --git a/modules/darwin/custom/determinate.nix b/modules/darwin/custom/determinate.nix
new file mode 100644
index 0000000..2e4e968
--- /dev/null
+++ b/modules/darwin/custom/determinate.nix
@@ -0,0 +1,119 @@
+{
+  config,
+  lib,
+  inputs',
+  ...
+}:
+
+let
+  cfg = config.borealis.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 = "";
+          };
+        };
+      })
+    ]
+  );
+}
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 56005e4..bc599c9 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -3,10 +3,10 @@
     default = {
       imports = [
         ../shared
+        ./custom
         ./defaults
         ./mixins
         ./profiles
-        ./services
         ./users
       ];
     };
diff --git a/modules/darwin/services/default.nix b/modules/darwin/services/default.nix
deleted file mode 100644
index 499a418..0000000
--- a/modules/darwin/services/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./determinate.nix
-  ];
-}
diff --git a/modules/darwin/services/determinate.nix b/modules/darwin/services/determinate.nix
deleted file mode 100644
index 2716150..0000000
--- a/modules/darwin/services/determinate.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  config,
-  lib,
-  inputs',
-  ...
-}:
-
-let
-  cfg = config.services.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