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/nixos/traits/arm-builder.nix | 42 -----------------------
 modules/nixos/traits/default.nix     |  7 ----
 modules/nixos/traits/mac-builder.nix | 65 ------------------------------------
 modules/nixos/traits/nvd-diff.nix    | 27 ---------------
 4 files changed, 141 deletions(-)
 delete mode 100644 modules/nixos/traits/arm-builder.nix
 delete mode 100644 modules/nixos/traits/default.nix
 delete mode 100644 modules/nixos/traits/mac-builder.nix
 delete mode 100644 modules/nixos/traits/nvd-diff.nix

(limited to 'modules/nixos/traits')

diff --git a/modules/nixos/traits/arm-builder.nix b/modules/nixos/traits/arm-builder.nix
deleted file mode 100644
index 3f655b8..0000000
--- a/modules/nixos/traits/arm-builder.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.traits.arm-builder;
-in
-{
-  options.traits.arm-builder = {
-    enable = lib.mkEnableOption "ARM remote builders";
-  };
-
-  config = lib.mkIf cfg.enable {
-    nix = {
-      buildMachines = [
-        {
-          hostName = "atlas";
-          maxJobs = 4;
-          publicHostKey = "IyBhdGxhczoyMiBTU0gtMi4wLVRhaWxzY2FsZQphdGxhcyBzc2gtZWQyNTUxOSBBQUFBQzNOemFDMWxaREkxTlRFNUFBQUFJQzdZaVNZWXgvK3ptVk9QU0NFUkh6U3NNZVVRdEErVnQxVzBzTFV3NFloSwo=";
-          sshUser = "atlas";
-          supportedFeatures = [
-            "benchmark"
-            "big-parallel"
-            "gccarch-armv8-a"
-            "kvm"
-            "nixos-test"
-          ];
-          systems = [
-            "aarch64-linux"
-          ];
-        }
-      ];
-
-      distributedBuilds = true;
-
-      settings = {
-        builders-use-substitutes = true;
-      };
-    };
-  };
-}
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
deleted file mode 100644
index d4b00dc..0000000
--- a/modules/nixos/traits/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./arm-builder.nix
-    ./mac-builder.nix
-    ./nvd-diff.nix
-  ];
-}
diff --git a/modules/nixos/traits/mac-builder.nix b/modules/nixos/traits/mac-builder.nix
deleted file mode 100644
index cfafaf3..0000000
--- a/modules/nixos/traits/mac-builder.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  config,
-  lib,
-  secretsDir,
-  ...
-}:
-let
-  cfg = config.traits.mac-builder;
-in
-{
-  options.traits.mac-builder = {
-    enable = lib.mkEnableOption "macOS remote builders";
-    manageSecrets = lib.mkEnableOption "managing SSH keys for builders" // {
-      default = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
-        nix = {
-          buildMachines = [
-            (lib.mkMerge [
-              {
-                hostName = "mini.scrumplex.net";
-                maxJobs = 8;
-                publicHostKey = "IyBtaW5pLnNjcnVtcGxleC5uZXQ6MjIgU1NILTIuMC1PcGVuU1NIXzkuOAptaW5pLnNjcnVtcGxleC5uZXQgc3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSU9DV1lXL29TbW5GYU1sOGQ0eHNjaGhxNkNKZkdjQ1M4djhLYkErb0dmQ3IK";
-                sshUser = "bob-the-builder";
-                supportedFeatures = [
-                  "nixos-test"
-                  "benchmark"
-                  "big-parallel"
-                  "apple-virt"
-                ];
-                systems = [
-                  "aarch64-darwin"
-                  "x86_64-darwin"
-                ];
-              }
-
-              (lib.mkIf cfg.manageSecrets {
-                sshKey = config.age.secrets.macstadium.path;
-              })
-            ])
-          ];
-
-          distributedBuilds = true;
-
-          settings = {
-            builders-use-substitutes = true;
-          };
-        };
-      }
-
-      (lib.mkIf cfg.manageSecrets {
-        age.secrets = {
-          macstadium = {
-            file = secretsDir + "/macstadium.age";
-            mode = "600";
-          };
-        };
-      })
-    ]
-  );
-}
diff --git a/modules/nixos/traits/nvd-diff.nix b/modules/nixos/traits/nvd-diff.nix
deleted file mode 100644
index 4c59287..0000000
--- a/modules/nixos/traits/nvd-diff.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.traits.nvd-diff;
-in
-{
-  options.traits.nvd-diff = {
-    enable = lib.mkEnableOption "showing configuration diffs with NVD on upgrade" // {
-      default = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    system.activationScripts."upgrade-diff" = {
-      supportsDryActivation = true;
-      text = ''
-        ${lib.getExe pkgs.nvd} \
-          --nix-bin-dir=${config.nix.package}/bin \
-          diff /run/current-system "$systemConfig"
-      '';
-    };
-  };
-}
-- 
cgit v1.2.3