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/shared/default.nix              |  1 +
 modules/shared/services/default.nix     |  5 ++++
 modules/shared/services/determinate.nix | 51 +++++++++++++++++++++++++++++++++
 modules/shared/traits/default.nix       |  1 -
 modules/shared/traits/determinate.nix   | 51 ---------------------------------
 5 files changed, 57 insertions(+), 52 deletions(-)
 create mode 100644 modules/shared/services/default.nix
 create mode 100644 modules/shared/services/determinate.nix
 delete mode 100644 modules/shared/traits/determinate.nix

(limited to 'modules/shared')

diff --git a/modules/shared/default.nix b/modules/shared/default.nix
index 3b105df..68faa70 100644
--- a/modules/shared/default.nix
+++ b/modules/shared/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./defaults
     ./mixins
+    ./services
     ./traits
   ];
 }
diff --git a/modules/shared/services/default.nix b/modules/shared/services/default.nix
new file mode 100644
index 0000000..499a418
--- /dev/null
+++ b/modules/shared/services/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./determinate.nix
+  ];
+}
diff --git a/modules/shared/services/determinate.nix b/modules/shared/services/determinate.nix
new file mode 100644
index 0000000..469306e
--- /dev/null
+++ b/modules/shared/services/determinate.nix
@@ -0,0 +1,51 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+
+let
+  cfg = config.services.determinate;
+
+  nixPackage = inputs.determinate.inputs.nix.packages.${pkgs.stdenv.hostPlatform.system}.default;
+in
+
+{
+  options.services.determinate = {
+    enable = lib.mkEnableOption "Determinate with a bit less Determinate";
+
+    determinate-nix.enable = lib.mkEnableOption "Determinate Nix";
+    determinate-nixd.enable = lib.mkEnableOption "determinate-nixd" // {
+      default = true;
+    };
+    flakehub-cache.enable = lib.mkEnableOption "the FlakeHub cache" // {
+      default = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      (lib.mkIf cfg.determinate-nix.enable {
+        nix.package = lib.mkDefault nixPackage;
+      })
+
+      (lib.mkIf cfg.flakehub-cache.enable {
+        nix.settings = {
+          extra-substituters = [ "https://cache.flakehub.com" ];
+          extra-trusted-public-keys = [
+            "cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM="
+            "cache.flakehub.com-4:Asi8qIv291s0aYLyH6IOnr5Kf6+OF14WVjkE6t3xMio="
+            "cache.flakehub.com-5:zB96CRlL7tiPtzA9/WKyPkp3A2vqxqgdgyTVNGShPDU="
+            "cache.flakehub.com-6:W4EGFwAGgBj3he7c5fNh9NkOXw0PUVaxygCVKeuvaqU="
+            "cache.flakehub.com-7:mvxJ2DZVHn/kRxlIaxYNMuDG1OvMckZu32um1TadOR8="
+            "cache.flakehub.com-8:moO+OVS0mnTjBTcOUh2kYLQEd59ExzyoW1QgQ8XAARQ="
+            "cache.flakehub.com-9:wChaSeTI6TeCuV/Sg2513ZIM9i0qJaYsF+lZCXg0J6o="
+            "cache.flakehub.com-10:2GqeNlIp6AKp4EF2MVbE1kBOp9iBSyo0UPR9KoR0o1Y="
+          ];
+        };
+      })
+    ]
+  );
+}
diff --git a/modules/shared/traits/default.nix b/modules/shared/traits/default.nix
index de3ca6c..8fdce85 100644
--- a/modules/shared/traits/default.nix
+++ b/modules/shared/traits/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./determinate.nix
     ./locale.nix
     ./users
   ];
diff --git a/modules/shared/traits/determinate.nix b/modules/shared/traits/determinate.nix
deleted file mode 100644
index 8e56db1..0000000
--- a/modules/shared/traits/determinate.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-
-let
-  cfg = config.traits.determinate;
-
-  nixPackage = inputs.determinate.inputs.nix.packages.${pkgs.stdenv.hostPlatform.system}.default;
-in
-
-{
-  options.traits.determinate = {
-    enable = lib.mkEnableOption "Determinate with a bit less Determinate";
-
-    determinate-nix.enable = lib.mkEnableOption "Determinate Nix";
-    determinate-nixd.enable = lib.mkEnableOption "determinate-nixd" // {
-      default = true;
-    };
-    flakehub-cache.enable = lib.mkEnableOption "the FlakeHub cache" // {
-      default = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      (lib.mkIf cfg.determinate-nix.enable {
-        nix.package = lib.mkDefault nixPackage;
-      })
-
-      (lib.mkIf cfg.flakehub-cache.enable {
-        nix.settings = {
-          extra-substituters = [ "https://cache.flakehub.com" ];
-          extra-trusted-public-keys = [
-            "cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM="
-            "cache.flakehub.com-4:Asi8qIv291s0aYLyH6IOnr5Kf6+OF14WVjkE6t3xMio="
-            "cache.flakehub.com-5:zB96CRlL7tiPtzA9/WKyPkp3A2vqxqgdgyTVNGShPDU="
-            "cache.flakehub.com-6:W4EGFwAGgBj3he7c5fNh9NkOXw0PUVaxygCVKeuvaqU="
-            "cache.flakehub.com-7:mvxJ2DZVHn/kRxlIaxYNMuDG1OvMckZu32um1TadOR8="
-            "cache.flakehub.com-8:moO+OVS0mnTjBTcOUh2kYLQEd59ExzyoW1QgQ8XAARQ="
-            "cache.flakehub.com-9:wChaSeTI6TeCuV/Sg2513ZIM9i0qJaYsF+lZCXg0J6o="
-            "cache.flakehub.com-10:2GqeNlIp6AKp4EF2MVbE1kBOp9iBSyo0UPR9KoR0o1Y="
-          ];
-        };
-      })
-    ]
-  );
-}
-- 
cgit v1.2.3