hosts+users: adopt new module names

10 files changed, 37 insertions, 43 deletions

diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index 212d44a..27a199f 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -16,7 +16,7 @@
     tmp.cleanOnBoot = true;
   };
 
-  getchoo.server.secrets.enable = true;
+  server.secrets.enable = true;
 
   networking = {
     domain = "mydadleft.me";
diff --git a/hosts/atlas/nginx.nix b/hosts/atlas/nginx.nix
index 05cf3db..fa06dc3 100644
--- a/hosts/atlas/nginx.nix
+++ b/hosts/atlas/nginx.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (config.networking) domain;
 in {
-  getchoo.server = {
+  server = {
     acme.enable = true;
     services.cloudflared.enable = true;
   };
diff --git a/hosts/caroline/default.nix b/hosts/caroline/default.nix
index 98c9f4f..7af0b5f 100644
--- a/hosts/caroline/default.nix
+++ b/hosts/caroline/default.nix
@@ -1,5 +1,5 @@
 _: {
-  getchoo.desktop = {
+  desktop = {
     homebrew.enable = true;
     gpg.enable = true;
   };
diff --git a/hosts/default.nix b/hosts/default.nix
index e5743e1..1a650bc 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -43,8 +43,8 @@
       };
     };
 
-    nixosModules.getchoo = import ../modules/nixos;
-    darwinModules.getchoo = import ../modules/darwin;
+    nixosModules.default = import ../modules/nixos;
+    darwinModules.default = import ../modules/darwin;
 
     openwrt.turret = withSystem "x86_64-linux" ({pkgs, ...}:
       pkgs.callPackage ./turret {
diff --git a/hosts/glados-wsl/default.nix b/hosts/glados-wsl/default.nix
index 0a6f583..98b57ed 100644
--- a/hosts/glados-wsl/default.nix
+++ b/hosts/glados-wsl/default.nix
@@ -12,10 +12,8 @@
     wslu
   ];
 
-  getchoo = {
-    base.networking.enable = false;
-    features.tailscale.enable = true;
-  };
+  base.networking.enable = false;
+  features.tailscale.enable = true;
 
   wsl = {
     enable = true;
diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix
index a15ff96..5d22a7f 100644
--- a/hosts/glados/default.nix
+++ b/hosts/glados/default.nix
@@ -6,16 +6,14 @@ _: {
     ../../modules/nixos/features/virtualisation.nix
   ];
 
-  getchoo = {
-    desktop.gnome.enable = true;
-    features = {
-      tailscale.enable = true;
-      virtualisation.enable = true;
-    };
-    hardware = {
-      enable = true;
-      nvidia.enable = true;
-    };
+  desktop.gnome.enable = true;
+  features = {
+    tailscale.enable = true;
+    virtualisation.enable = true;
+  };
+  hardware = {
+    enable = true;
+    nvidia.enable = true;
   };
 
   environment.etc."environment".text = ''
diff --git a/hosts/p-body/default.nix b/hosts/p-body/default.nix
index 16341e7..5709ba4 100644
--- a/hosts/p-body/default.nix
+++ b/hosts/p-body/default.nix
@@ -14,7 +14,7 @@
     ./victoriametrics.nix
   ];
 
-  getchoo.server.secrets.enable = true;
+  server.secrets.enable = true;
 
   networking = {
     domain = "mydadleft.me";
diff --git a/hosts/p-body/nginx.nix b/hosts/p-body/nginx.nix
index 3278870..d413b5d 100644
--- a/hosts/p-body/nginx.nix
+++ b/hosts/p-body/nginx.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (config.networking) domain;
 in {
-  getchoo.server = {
+  server = {
     acme.enable = true;
     services.cloudflared.enable = true;
   };
diff --git a/hosts/profiles.nix b/hosts/profiles.nix
index ec8cb04..eb69fc6 100644
--- a/hosts/profiles.nix
+++ b/hosts/profiles.nix
@@ -45,7 +45,7 @@ in {
       home-manager.nixosModules.home-manager
       nur.nixosModules.nur
 
-      self.nixosModules.getchoo
+      self.nixosModules.default
       ../users/seth
 
       {
@@ -59,7 +59,7 @@ in {
           };
         };
 
-        getchoo.base.enable = true;
+        base.enable = true;
         system.stateVersion = "23.11";
       }
     ];
@@ -74,13 +74,11 @@ in {
 
       ../users/seth
       ../users/seth/darwin.nix
-      self.darwinModules.getchoo
+      self.darwinModules.default
 
       {
-        getchoo = {
-          base.enable = true;
-          desktop.enable = true;
-        };
+        base.enable = true;
+        desktop.enable = true;
         system.stateVersion = 4;
       }
     ];
@@ -97,22 +95,20 @@ in {
       ../modules/nixos/features/tailscale.nix
 
       {
-        getchoo = {
-          features.tailscale = {
-            enable = true;
-            ssh.enable = true;
-          };
+        features.tailscale = {
+          enable = true;
+          ssh.enable = true;
+        };
 
-          server = {
+        server = {
+          enable = true;
+          services.promtail = {
             enable = true;
-            services.promtail = {
-              enable = true;
-              clients = [
-                {
-                  url = "http://p-body:3030/loki/api/v1/push";
-                }
-              ];
-            };
+            clients = [
+              {
+                url = "http://p-body:3030/loki/api/v1/push";
+              }
+            ];
           };
         };
 
diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix
index 61af5ef..8960d88 100644
--- a/users/seth/desktop/default.nix
+++ b/users/seth/desktop/default.nix
@@ -18,9 +18,11 @@ in {
     ../programs/firefox.nix
   ];
 
-  options.desktop.enable = mkEnableOption "desktop configuration" // {default = osConfig.getchoo.desktop.enable or false;};
+  options.desktop.enable = mkEnableOption "desktop configuration" // {default = osConfig.desktop.enable or false;};
 
   config = mkIf cfg.enable {
+    desktop = lib.genAttrs desktops (desktop: {enable = osConfig.desktop.${desktop}.enable or false;});
+
     home.packages = with pkgs; [
       discord
       element-desktop