modules/nixos+darwin: remove getchoo prefix

6 files changed, 14 insertions, 14 deletions

diff --git a/modules/nixos/server/acme.nix b/modules/nixos/server/acme.nix
index 8646fa2..e45d2aa 100644
--- a/modules/nixos/server/acme.nix
+++ b/modules/nixos/server/acme.nix
@@ -4,10 +4,10 @@
   self,
   ...
 }: let
-  cfg = config.getchoo.server.acme;
+  cfg = config.server.acme;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.server.acme = {
+  options.server.acme = {
     enable = mkEnableOption "acme";
   };
 
@@ -17,7 +17,7 @@ in {
     security.acme = {
       acceptTerms = true;
       defaults = {
-        email = "[email protected]";
+        email = "tuta.io";
         dnsProvider = "cloudflare";
         credentialsFile = config.age.secrets.cloudflareApiKey.path;
       };
diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix
index f53fade..9048c4f 100644
--- a/modules/nixos/server/default.nix
+++ b/modules/nixos/server/default.nix
@@ -4,10 +4,10 @@
   nixpkgs,
   ...
 }: let
-  cfg = config.getchoo.server;
+  cfg = config.server;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.server.enable = mkEnableOption "enable server configuration";
+  options.server.enable = mkEnableOption "enable server configuration";
 
   imports = [
     ./acme.nix
@@ -16,7 +16,7 @@ in {
   ];
 
   config = mkIf cfg.enable {
-    getchoo.base = {
+    base = {
       enable = true;
       documentation.enable = false;
       defaultPackages.enable = false;
diff --git a/modules/nixos/server/secrets.nix b/modules/nixos/server/secrets.nix
index c0290cd..62654f3 100644
--- a/modules/nixos/server/secrets.nix
+++ b/modules/nixos/server/secrets.nix
@@ -4,10 +4,10 @@
   self,
   ...
 }: let
-  cfg = config.getchoo.server.secrets;
+  cfg = config.server.secrets;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.server.secrets = {
+  options.server.secrets = {
     enable = mkEnableOption "enable secret management";
   };
 
diff --git a/modules/nixos/server/services/cloudflared.nix b/modules/nixos/server/services/cloudflared.nix
index 5081a0a..803e7da 100644
--- a/modules/nixos/server/services/cloudflared.nix
+++ b/modules/nixos/server/services/cloudflared.nix
@@ -4,10 +4,10 @@
   self,
   ...
 }: let
-  cfg = config.getchoo.server.services.cloudflared;
+  cfg = config.server.services.cloudflared;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.server.services.cloudflared = {
+  options.server.services.cloudflared = {
     enable = mkEnableOption "cloudflared";
   };
 
diff --git a/modules/nixos/server/services/hercules.nix b/modules/nixos/server/services/hercules.nix
index ca16efb..eff2b51 100644
--- a/modules/nixos/server/services/hercules.nix
+++ b/modules/nixos/server/services/hercules.nix
@@ -5,10 +5,10 @@
   self,
   ...
 }: let
-  cfg = config.getchoo.server.services.hercules-ci;
+  cfg = config.server.services.hercules-ci;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.server.services.hercules-ci = {
+  options.server.services.hercules-ci = {
     enable = mkEnableOption "enable hercules-ci";
     secrets.enable = mkEnableOption "manage secrets for hercules-ci";
   };
diff --git a/modules/nixos/server/services/promtail.nix b/modules/nixos/server/services/promtail.nix
index 95592f0..63faf15 100644
--- a/modules/nixos/server/services/promtail.nix
+++ b/modules/nixos/server/services/promtail.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.server.services.promtail;
+  cfg = config.server.services.promtail;
   inherit (lib) mkEnableOption mkIf mkOption types;
 in {
-  options.getchoo.server.services.promtail = {
+  options.server.services.promtail = {
     enable = mkEnableOption "enable promtail";
 
     clients = mkOption {