From 1562b2d179a00f4e4dc1f8ef464de6bfac98dd98 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Sun, 25 May 2025 14:14:44 -0700
Subject: [PATCH] feat: profiles module

---
 hosts/mairley/default.nix                     | 16 +++++++-------
 hosts/marleycentre/default.nix                |  2 +-
 hosts/marleynet/default.nix                   |  4 ++--
 hosts/nyx/default.nix                         | 21 +++++++++++--------
 modules/base/default.nix                      |  5 +++++
 modules/darwin/default.nix                    |  5 +++++
 modules/nixos/default.nix                     |  5 +++++
 modules/options/default.nix                   |  5 +++++
 modules/options/profiles.nix                  | 10 +++++++++
 .../nixos/options/hasNvidia/default.nix       |  7 -------
 .../nixos/options/isDesktop/default.nix       |  7 -------
 .../nixos/options/isServer/default.nix        |  7 -------
 12 files changed, 54 insertions(+), 40 deletions(-)
 create mode 100644 modules/base/default.nix
 create mode 100644 modules/darwin/default.nix
 create mode 100644 modules/nixos/default.nix
 create mode 100644 modules/options/default.nix
 create mode 100644 modules/options/profiles.nix
 delete mode 100644 snowflake/modules/nixos/options/hasNvidia/default.nix
 delete mode 100644 snowflake/modules/nixos/options/isDesktop/default.nix
 delete mode 100644 snowflake/modules/nixos/options/isServer/default.nix

diff --git a/hosts/mairley/default.nix b/hosts/mairley/default.nix
index dea874b..d93a911 100644
--- a/hosts/mairley/default.nix
+++ b/hosts/mairley/default.nix
@@ -12,13 +12,15 @@ in {
   };
 
   marleyos = {
-    appearance = {
-      base = enabled;
-    };
-    programs = {
-      fish = enabled;
-      wezterm = enabled;
-    };
+    profiles.desktop = enabled;
+
+    # appearance = {
+    #   base = enabled;
+    # };
+    # programs = {
+    #   fish = enabled;
+    #   wezterm = enabled;
+    # };
   };
 
   users = {
diff --git a/hosts/marleycentre/default.nix b/hosts/marleycentre/default.nix
index 5cf08d3..7bf8d59 100644
--- a/hosts/marleycentre/default.nix
+++ b/hosts/marleycentre/default.nix
@@ -6,7 +6,7 @@ in {
   networking.hostName = "marleycentre";
 
   marleyos = {
-    bundles.server = enabled;
+    profiles.server = enabled;
   };
 
   users.users = {
diff --git a/hosts/marleynet/default.nix b/hosts/marleynet/default.nix
index 8211ffc..bb9edba 100644
--- a/hosts/marleynet/default.nix
+++ b/hosts/marleynet/default.nix
@@ -6,8 +6,8 @@ in {
   networking.hostName = "marleynet";
 
   marleyos = {
-    bundles.server = enabled;
-    services.ddclient = enabled;
+    profiles.server = enabled;
+    # services.ddclient = enabled;
   };
 
   users.users = {
diff --git a/hosts/nyx/default.nix b/hosts/nyx/default.nix
index 413f24c..20fc939 100644
--- a/hosts/nyx/default.nix
+++ b/hosts/nyx/default.nix
@@ -9,16 +9,19 @@ in {
   networking.firewall.allowedTCPPorts = [8080];
 
   marleyos = {
-    hasNvidia = true;
-
-    mounts.babeshare = enabled;
-
-    bundles.desktop = enabled;
-
-    wayland.niri = enabled;
-    services = {
-      ly = enabled;
+    profiles = {
+      desktop = enabled;
+      hardware.nvidia = enabled;
     };
+
+    # mounts.babeshare = enabled;
+
+    # bundles.desktop = enabled;
+
+    # wayland.niri = enabled;
+    # services = {
+    #   ly = enabled;
+    # };
   };
 
   system.stateVersion = "24.05";
diff --git a/modules/base/default.nix b/modules/base/default.nix
new file mode 100644
index 0000000..88f5e01
--- /dev/null
+++ b/modules/base/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../options
+  ];
+}
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
new file mode 100644
index 0000000..3536ae5
--- /dev/null
+++ b/modules/darwin/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../base
+  ];
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
new file mode 100644
index 0000000..3536ae5
--- /dev/null
+++ b/modules/nixos/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../base
+  ];
+}
diff --git a/modules/options/default.nix b/modules/options/default.nix
new file mode 100644
index 0000000..bc1987e
--- /dev/null
+++ b/modules/options/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./profiles.nix
+  ];
+}
diff --git a/modules/options/profiles.nix b/modules/options/profiles.nix
new file mode 100644
index 0000000..f835b71
--- /dev/null
+++ b/modules/options/profiles.nix
@@ -0,0 +1,10 @@
+{lib, ...}: {
+  options.marleyos.profiles = {
+    desktop.enable = lib.mkEnableOption "graphical desktop profile";
+    server.enable = lib.mkEnableOption "server profile";
+
+    hardware = {
+      nvidia.enable = lib.mkEnableOption "Nvidia profile";
+    };
+  };
+}
diff --git a/snowflake/modules/nixos/options/hasNvidia/default.nix b/snowflake/modules/nixos/options/hasNvidia/default.nix
deleted file mode 100644
index c5865da..0000000
--- a/snowflake/modules/nixos/options/hasNvidia/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{lib, ...}: {
-  options.marleyos.hasNvidia = lib.mkOption {
-    type = with lib.types; bool;
-    default = false;
-    description = "Whether this machine has an NVIDIA GPU.";
-  };
-}
diff --git a/snowflake/modules/nixos/options/isDesktop/default.nix b/snowflake/modules/nixos/options/isDesktop/default.nix
deleted file mode 100644
index ea556f0..0000000
--- a/snowflake/modules/nixos/options/isDesktop/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{lib, ...}: {
-  options.marleyos.isDesktop = lib.mkOption {
-    type = with lib.types; bool;
-    default = false;
-    description = "Whether this machine is used as a graphical desktop.";
-  };
-}
diff --git a/snowflake/modules/nixos/options/isServer/default.nix b/snowflake/modules/nixos/options/isServer/default.nix
deleted file mode 100644
index f0d0259..0000000
--- a/snowflake/modules/nixos/options/isServer/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{lib, ...}: {
-  options.marleyos.isServer = lib.mkOption {
-    type = with lib.types; bool;
-    default = false;
-    description = "Whether this machine is a server.";
-  };
-}