modules/determinate: make dedicated module

13 files changed, 22 insertions, 10 deletions

diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 6145e27..4ee4b7e 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -7,6 +7,7 @@
         ./desktop
         ./mixins
         ./profiles
+        ./services
         ./traits
       ];
     };
diff --git a/modules/darwin/services/default.nix b/modules/darwin/services/default.nix
new file mode 100644
index 0000000..499a418
--- /dev/null
+++ b/modules/darwin/services/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./determinate.nix
+  ];
+}
diff --git a/modules/darwin/traits/determinate.nix b/modules/darwin/services/determinate.nix
index 9d6367a..2716150 100644
--- a/modules/darwin/traits/determinate.nix
+++ b/modules/darwin/services/determinate.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  cfg = config.traits.determinate;
+  cfg = config.services.determinate;
 
   package = inputs'.determinate.packages.default;
 in
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/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/traits/determinate.nix b/modules/nixos/services/determinate.nix
index 11e637e..6aa599e 100644
--- a/modules/nixos/traits/determinate.nix
+++ b/modules/nixos/services/determinate.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  cfg = config.traits.determinate;
+  cfg = config.services.determinate;
 
   package = inputs'.determinate.packages.default;
 in
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/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/traits/determinate.nix b/modules/shared/services/determinate.nix
index 8e56db1..469306e 100644
--- a/modules/shared/traits/determinate.nix
+++ b/modules/shared/services/determinate.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  cfg = config.traits.determinate;
+  cfg = config.services.determinate;
 
   nixPackage = inputs.determinate.inputs.nix.packages.${pkgs.stdenv.hostPlatform.system}.default;
 in
 
 {
-  options.traits.determinate = {
+  options.services.determinate = {
     enable = lib.mkEnableOption "Determinate with a bit less Determinate";
 
     determinate-nix.enable = lib.mkEnableOption "Determinate Nix";
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/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index b30451c..8b5fd6e 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -24,6 +24,7 @@
   security.apparmor.enable = false;
 
   services = {
+    determinate.enable = true;
     resolved.enable = false;
   };
 
@@ -31,7 +32,6 @@
 
   traits = {
     arm-builder.enable = true;
-    determinate.enable = true;
     mac-builder.enable = true;
   };
 
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index 4911a87..93d1def 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -55,6 +55,7 @@
   };
 
   services = {
+    determinate.enable = true;
     flatpak.enable = true;
     fstrim.enable = true;
     fwupd.enable = true;
@@ -81,7 +82,6 @@
 
   traits = {
     arm-builder.enable = true;
-    determinate.enable = true;
     mac-builder.enable = true;
   };