From 3a2a22f50343b887a85cf18fca4720f751eeafb8 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 13 Feb 2025 18:48:58 -0500
Subject: modules/determinate: make dedicated module

---
 modules/nixos/services/default.nix     |  5 ++-
 modules/nixos/services/determinate.nix | 68 ++++++++++++++++++++++++++++++++++
 modules/nixos/traits/default.nix       |  1 -
 modules/nixos/traits/determinate.nix   | 68 ----------------------------------
 4 files changed, 72 insertions(+), 70 deletions(-)
 create mode 100644 modules/nixos/services/determinate.nix
 delete mode 100644 modules/nixos/traits/determinate.nix

(limited to 'modules/nixos')

diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index 038c3a6..a6a10ea 100644
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -1,3 +1,6 @@
 {
-  imports = [ ./github-mirror ];
+  imports = [
+    ./determinate.nix
+    ./github-mirror
+  ];
 }
diff --git a/modules/nixos/services/determinate.nix b/modules/nixos/services/determinate.nix
new file mode 100644
index 0000000..6aa599e
--- /dev/null
+++ b/modules/nixos/services/determinate.nix
@@ -0,0 +1,68 @@
+{
+  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 {
+        environment = {
+          # `determinate-nixd` overrides /etc/nix/nix.conf with it's own
+          etc."nix/nix.custom.conf" = { inherit (config.environment.etc."nix/nix.conf") source; };
+
+          systemPackages = [
+            package
+          ];
+        };
+
+        systemd = {
+          services.nix-daemon.serviceConfig = {
+            ExecStart = [
+              ""
+              "@${lib.getExe' package "determinate-nixd"} determinate-nixd --nix-bin ${config.nix.package}/bin daemon"
+            ];
+            KillMode = lib.mkDefault "process";
+            LimitNOFILE = lib.mkDefault 1048576;
+            LimitSTACK = lib.mkDefault "64M";
+            TasksMax = lib.mkDefault 1048576;
+          };
+
+          sockets = {
+            determinate-nixd = {
+              description = "Determinate Nixd Daemon Socket";
+              wantedBy = [ "sockets.target" ];
+              before = [ "multi-user.target" ];
+
+              unitConfig = {
+                RequiresMountsFor = [
+                  "/nix/store"
+                  "/nix/var/determinate"
+                ];
+              };
+
+              socketConfig = {
+                Service = "nix-daemon.service";
+                FileDescriptorName = "determinate-nixd.socket";
+                ListenStream = "/nix/var/determinate/determinate-nixd.socket";
+                DirectoryMode = "0755";
+              };
+            };
+
+            nix-daemon.socketConfig = {
+              FileDescriptorName = "nix-daemon.socket";
+            };
+          };
+        };
+      })
+    ]
+  );
+}
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
index 7301952..abea86a 100644
--- a/modules/nixos/traits/default.nix
+++ b/modules/nixos/traits/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./arm-builder.nix
-    ./determinate.nix
     ./locale.nix
     ./mac-builder.nix
     ./nvd-diff.nix
diff --git a/modules/nixos/traits/determinate.nix b/modules/nixos/traits/determinate.nix
deleted file mode 100644
index 11e637e..0000000
--- a/modules/nixos/traits/determinate.nix
+++ /dev/null
@@ -1,68 +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 {
-        environment = {
-          # `determinate-nixd` overrides /etc/nix/nix.conf with it's own
-          etc."nix/nix.custom.conf" = { inherit (config.environment.etc."nix/nix.conf") source; };
-
-          systemPackages = [
-            package
-          ];
-        };
-
-        systemd = {
-          services.nix-daemon.serviceConfig = {
-            ExecStart = [
-              ""
-              "@${lib.getExe' package "determinate-nixd"} determinate-nixd --nix-bin ${config.nix.package}/bin daemon"
-            ];
-            KillMode = lib.mkDefault "process";
-            LimitNOFILE = lib.mkDefault 1048576;
-            LimitSTACK = lib.mkDefault "64M";
-            TasksMax = lib.mkDefault 1048576;
-          };
-
-          sockets = {
-            determinate-nixd = {
-              description = "Determinate Nixd Daemon Socket";
-              wantedBy = [ "sockets.target" ];
-              before = [ "multi-user.target" ];
-
-              unitConfig = {
-                RequiresMountsFor = [
-                  "/nix/store"
-                  "/nix/var/determinate"
-                ];
-              };
-
-              socketConfig = {
-                Service = "nix-daemon.service";
-                FileDescriptorName = "determinate-nixd.socket";
-                ListenStream = "/nix/var/determinate/determinate-nixd.socket";
-                DirectoryMode = "0755";
-              };
-            };
-
-            nix-daemon.socketConfig = {
-              FileDescriptorName = "nix-daemon.socket";
-            };
-          };
-        };
-      })
-    ]
-  );
-}
-- 
cgit v1.2.3