modules/nixos+darwin: remove getchoo prefix

30 files changed, 72 insertions, 74 deletions

diff --git a/modules/darwin/base/default.nix b/modules/darwin/base/default.nix
index 7ab0ce2..94dcf19 100644
--- a/modules/darwin/base/default.nix
+++ b/modules/darwin/base/default.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base;
+  cfg = config.base;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.base.enable = mkEnableOption "base darwin module";
+  options.base.enable = mkEnableOption "base darwin module";
 
   imports = [
     ./documentation.nix
@@ -16,7 +16,7 @@ in {
   ];
 
   config = mkIf cfg.enable {
-    getchoo.base = {
+    base = {
       defaultPackages.enable = mkDefault true;
       defaultLocale.enable = mkDefault true;
       documentation.enable = mkDefault true;
diff --git a/modules/darwin/base/documentation.nix b/modules/darwin/base/documentation.nix
index 0e3ce85..ecc5813 100644
--- a/modules/darwin/base/documentation.nix
+++ b/modules/darwin/base/documentation.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base.documentation;
+  cfg = config.base.documentation;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.base.documentation.enable = mkEnableOption "base module documentation";
+  options.base.documentation.enable = mkEnableOption "base module documentation";
 
   config = mkIf cfg.enable {
     documentation.man.enable = true;
diff --git a/modules/darwin/base/locale.nix b/modules/darwin/base/locale.nix
index c65c046..af7a6ca 100644
--- a/modules/darwin/base/locale.nix
+++ b/modules/darwin/base/locale.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base.defaultLocale;
+  cfg = config.base.defaultLocale;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.base.defaultLocale.enable = mkEnableOption "enable default locale";
+  options.base.defaultLocale.enable = mkEnableOption "enable default locale";
 
   config = mkIf cfg.enable {
     time.timeZone = "America/New_York";
diff --git a/modules/darwin/base/nix.nix b/modules/darwin/base/nix.nix
index cac2290..39d8ffa 100644
--- a/modules/darwin/base/nix.nix
+++ b/modules/darwin/base/nix.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base.nix-settings;
+  cfg = config.base.nix-settings;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.base.nix-settings.enable = mkEnableOption "base nix settings";
+  options.base.nix-settings.enable = mkEnableOption "base nix settings";
 
   config = mkIf cfg.enable {
     nix = {
diff --git a/modules/darwin/base/packages.nix b/modules/darwin/base/packages.nix
index 81e2920..14a07e6 100644
--- a/modules/darwin/base/packages.nix
+++ b/modules/darwin/base/packages.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base.defaultPackages;
+  cfg = config.base.defaultPackages;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.base.defaultPackages.enable = mkEnableOption "base module default packages";
+  options.base.defaultPackages.enable = mkEnableOption "base module default packages";
 
   config = mkIf cfg.enable {
     programs = {
diff --git a/modules/darwin/desktop/default.nix b/modules/darwin/desktop/default.nix
index 923d3e4..1f71642 100644
--- a/modules/darwin/desktop/default.nix
+++ b/modules/darwin/desktop/default.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.desktop;
+  cfg = config.desktop;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.desktop = {
+  options.desktop = {
     enable = mkEnableOption "enable desktop darwin support";
     gpg.enable = mkEnableOption "enable gpg";
   };
diff --git a/modules/darwin/desktop/homebrew.nix b/modules/darwin/desktop/homebrew.nix
index 8c5aded..4a58ae9 100644
--- a/modules/darwin/desktop/homebrew.nix
+++ b/modules/darwin/desktop/homebrew.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.homebrew;
+  cfg = config.desktop.homebrew;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.homebrew.enable = mkEnableOption "enable homebrew support";
+  options.desktop.homebrew.enable = mkEnableOption "enable homebrew support";
 
   config = mkIf cfg.enable {
     homebrew = {
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
index 8c93d09..c488cdf 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base;
+  cfg = config.base;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.base.enable = mkEnableOption "base nixos module";
+  options.base.enable = mkEnableOption "base nixos module";
 
   imports = [
     ./documentation.nix
@@ -21,7 +21,7 @@ in {
   ];
 
   config = mkIf cfg.enable {
-    getchoo.base = {
+    base = {
       defaultPackages.enable = mkDefault true;
       defaultLocale.enable = mkDefault true;
       defaultRoot.enable = mkDefault true;
diff --git a/modules/nixos/base/documentation.nix b/modules/nixos/base/documentation.nix
index b495c14..6f254cd 100644
--- a/modules/nixos/base/documentation.nix
+++ b/modules/nixos/base/documentation.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.base.documentation;
+  cfg = config.base.documentation;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.base.documentation.enable = mkEnableOption "base module documentation";
+  options.base.documentation.enable = mkEnableOption "base module documentation";
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [man-pages man-pages-posix];
diff --git a/modules/nixos/base/locale.nix b/modules/nixos/base/locale.nix
index c4f8497..b2d9fbd 100644
--- a/modules/nixos/base/locale.nix
+++ b/modules/nixos/base/locale.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base.defaultLocale;
+  cfg = config.base.defaultLocale;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.base.defaultLocale.enable = mkEnableOption "enable default locale";
+  options.base.defaultLocale.enable = mkEnableOption "enable default locale";
 
   config = mkIf cfg.enable {
     i18n = {
diff --git a/modules/nixos/base/network.nix b/modules/nixos/base/network.nix
index dbcabac..5bc90d1 100644
--- a/modules/nixos/base/network.nix
+++ b/modules/nixos/base/network.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base.networking;
+  cfg = config.base.networking;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.base.networking.enable = mkEnableOption "enable networking";
+  options.base.networking.enable = mkEnableOption "networking";
 
   config = mkIf cfg.enable {
     networking.networkmanager = {
diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix
index 947f086..d266333 100644
--- a/modules/nixos/base/nix.nix
+++ b/modules/nixos/base/nix.nix
@@ -4,10 +4,10 @@
   inputs,
   ...
 }: let
-  cfg = config.getchoo.base.nix-settings;
+  cfg = config.base.nix-settings;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.base.nix-settings.enable = mkEnableOption "base nix settings";
+  options.base.nix-settings.enable = mkEnableOption "base nix settings";
 
   imports = [
     ./documentation.nix
diff --git a/modules/nixos/base/packages.nix b/modules/nixos/base/packages.nix
index c9758d4..40be7e6 100644
--- a/modules/nixos/base/packages.nix
+++ b/modules/nixos/base/packages.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.base.defaultPackages;
+  cfg = config.base.defaultPackages;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.base.defaultPackages.enable = mkEnableOption "base module default packages";
+  options.base.defaultPackages.enable = mkEnableOption "base module default packages";
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
diff --git a/modules/nixos/base/root.nix b/modules/nixos/base/root.nix
index 5f8d7d4..cedd147 100644
--- a/modules/nixos/base/root.nix
+++ b/modules/nixos/base/root.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.base.defaultRoot;
+  cfg = config.base.defaultRoot;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
-  options.getchoo.base.defaultRoot.enable = mkEnableOption "enable default root user";
+  options.base.defaultRoot.enable = mkEnableOption "default root user";
 
   config = mkIf cfg.enable {
     users.users.root = {
diff --git a/modules/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix
index d04316b..c601563 100644
--- a/modules/nixos/desktop/audio.nix
+++ b/modules/nixos/desktop/audio.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.audio;
+  cfg = config.desktop.audio;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.audio.enable = mkEnableOption "enable audio support";
+  options.desktop.audio.enable = mkEnableOption "audio support";
 
   config = mkIf cfg.enable {
     services = {
diff --git a/modules/nixos/desktop/budgie/default.nix b/modules/nixos/desktop/budgie/default.nix
index 440bbc6..4605eb1 100644
--- a/modules/nixos/desktop/budgie/default.nix
+++ b/modules/nixos/desktop/budgie/default.nix
@@ -4,13 +4,13 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.budgie;
+  cfg = config.desktop.budgie;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.budgie.enable = mkEnableOption "enable budgie";
+  options.desktop.budgie.enable = mkEnableOption "enable budgie";
 
   config = mkIf cfg.enable {
-    getchoo.desktop.enable = true;
+    desktop.enable = true;
 
     services.xserver = {
       displayManager.lightdm.greeters.slick = {
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index a0277cc..f0ab74c 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.desktop;
+  cfg = config.desktop;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
   imports = [
@@ -15,15 +15,13 @@ in {
     ./plasma
   ];
 
-  options.getchoo.desktop.enable = mkEnableOption "desktop module";
+  options.desktop.enable = mkEnableOption "desktop module";
 
   config = mkIf cfg.enable {
-    getchoo = {
-      base.enable = true;
-      desktop = {
-        audio.enable = mkDefault true;
-        fonts.enable = mkDefault true;
-      };
+    base.enable = true;
+    desktop = {
+      audio.enable = mkDefault true;
+      fonts.enable = mkDefault true;
     };
 
     environment = {
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index a610152..feedf07 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -4,10 +4,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.fonts;
+  cfg = config.desktop.fonts;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.fonts.enable = mkEnableOption "enable default fonts";
+  options.desktop.fonts.enable = mkEnableOption "enable default fonts";
 
   config = mkIf cfg.enable {
     fonts = {
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index de83bc1..889a563 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -4,13 +4,13 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.gnome;
+  cfg = config.desktop.gnome;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.gnome.enable = mkEnableOption "enable gnome";
+  options.desktop.gnome.enable = mkEnableOption "enable gnome";
 
   config = mkIf cfg.enable {
-    getchoo.desktop.enable = true;
+    desktop.enable = true;
 
     environment = {
       gnome.excludePackages = with pkgs; [
diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
index 500317d..2034802 100644
--- a/modules/nixos/desktop/plasma/default.nix
+++ b/modules/nixos/desktop/plasma/default.nix
@@ -4,13 +4,13 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.desktop.plasma;
+  cfg = config.desktop.plasma;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.plasma.enable = mkEnableOption "enable plasma";
+  options.desktop.plasma.enable = mkEnableOption "enable plasma";
 
   config = mkIf cfg.enable {
-    getchoo.desktop.enable = true;
+    desktop.enable = true;
 
     environment = {
       plasma5.excludePackages = with pkgs.libsForQt5; [
diff --git a/modules/nixos/features/tailscale.nix b/modules/nixos/features/tailscale.nix
index 0a41a73..dc688f6 100644
--- a/modules/nixos/features/tailscale.nix
+++ b/modules/nixos/features/tailscale.nix
@@ -5,10 +5,10 @@
   self,
   ...
 }: let
-  cfg = config.getchoo.features.tailscale;
+  cfg = config.features.tailscale;
   inherit (lib) mkDefault mkEnableOption mkIf optionalAttrs;
 in {
-  options.getchoo.features.tailscale = {
+  options.features.tailscale = {
     enable = mkEnableOption "enable support for tailscale";
     ssh.enable = mkEnableOption "enable support for tailscale ssh";
   };
diff --git a/modules/nixos/features/virtualisation.nix b/modules/nixos/features/virtualisation.nix
index db17c8b..206a98e 100644
--- a/modules/nixos/features/virtualisation.nix
+++ b/modules/nixos/features/virtualisation.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.features.virtualisation;
+  cfg = config.features.virtualisation;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.features.virtualisation.enable = mkEnableOption "enable podman";
+  options.features.virtualisation.enable = mkEnableOption "enable podman";
 
   config.virtualisation = mkIf cfg.enable {
     podman = {
diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix
index cefa15c..624ccc1 100644
--- a/modules/nixos/hardware/default.nix
+++ b/modules/nixos/hardware/default.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.hardware;
+  cfg = config.hardware;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.hardware.enable = mkEnableOption "hardware module";
+  options.hardware.enable = mkEnableOption "hardware module";
 
   imports = [
     ./nvidia.nix
diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix
index 14c8e38..1a0b5f2 100644
--- a/modules/nixos/hardware/nvidia.nix
+++ b/modules/nixos/hardware/nvidia.nix
@@ -3,13 +3,13 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.hardware.nvidia;
+  cfg = config.hardware.nvidia;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.hardware.nvidia.enable = mkEnableOption "enable nvidia support";
+  options.hardware.nvidia.enable = mkEnableOption "enable nvidia support";
 
   config = mkIf cfg.enable {
-    getchoo.hardware.enable = true;
+    hardware.enable = true;
 
     hardware = {
       nvidia = {
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 {