From 5ec7ee21e036f7bc1cbdec714271c619cb3fdb3d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 27 Oct 2024 20:12:19 -0400
Subject: modules: restructure (#487)

* seth: remove unused pkgs

* modules: restructure

from archetypes back to profiles
make less actual modules for everything
use lib.mkDefault like it's supposed to
move mixins out of server

* nixos/resolved: use modern options
---
 modules/darwin/README.md               | 12 ++++++------
 modules/darwin/archetypes/default.nix  |  1 -
 modules/darwin/archetypes/personal.nix | 21 ---------------------
 modules/darwin/base/default.nix        | 11 -----------
 modules/darwin/base/programs.nix       | 13 -------------
 modules/darwin/default.nix             |  4 ++--
 modules/darwin/defaults/default.nix    |  7 +++++++
 modules/darwin/defaults/programs.nix   |  7 +++++++
 modules/darwin/profiles/default.nix    |  1 +
 modules/darwin/profiles/personal.nix   | 20 ++++++++++++++++++++
 10 files changed, 43 insertions(+), 54 deletions(-)
 delete mode 100644 modules/darwin/archetypes/default.nix
 delete mode 100644 modules/darwin/archetypes/personal.nix
 delete mode 100644 modules/darwin/base/default.nix
 delete mode 100644 modules/darwin/base/programs.nix
 create mode 100644 modules/darwin/defaults/default.nix
 create mode 100644 modules/darwin/defaults/programs.nix
 create mode 100644 modules/darwin/profiles/default.nix
 create mode 100644 modules/darwin/profiles/personal.nix

(limited to 'modules/darwin')

diff --git a/modules/darwin/README.md b/modules/darwin/README.md
index 249286c..50f07ac 100644
--- a/modules/darwin/README.md
+++ b/modules/darwin/README.md
@@ -1,17 +1,17 @@
 # ./modules/darwin/
 
-## archetypes
+## defaults
 
-The high-level "type" of a machine (i.e., `personal` or `server`)
-
-## base
-
-Low level options shared for (almost) any kind of system
+Defaults (mostly) shared across all configurations
 
 ## desktop
 
 Installs cool GUI stuff for desktops...or laptops too I guess
 
+## profiles
+
+The high-level "type" of a machine (i.e., `personal` or `server`)
+
 ## traits
 
 Small, reusable aspects of a machine - like users
diff --git a/modules/darwin/archetypes/default.nix b/modules/darwin/archetypes/default.nix
deleted file mode 100644
index 518cc57..0000000
--- a/modules/darwin/archetypes/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ imports = [ ./personal.nix ]; }
diff --git a/modules/darwin/archetypes/personal.nix b/modules/darwin/archetypes/personal.nix
deleted file mode 100644
index a81efdc..0000000
--- a/modules/darwin/archetypes/personal.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.archetypes.personal;
-in
-{
-  options.archetypes.personal = {
-    enable = lib.mkEnableOption "the \"Personal\" archetype";
-  };
-
-  config = lib.mkIf cfg.enable {
-    base.enable = true;
-    desktop.enable = true;
-
-    traits = {
-      home-manager.enable = true;
-      users = {
-        seth.enable = true;
-      };
-    };
-  };
-}
diff --git a/modules/darwin/base/default.nix b/modules/darwin/base/default.nix
deleted file mode 100644
index 7e6f3bd..0000000
--- a/modules/darwin/base/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.base;
-in
-{
-  imports = [
-    ./programs.nix
-  ];
-
-  config = lib.mkIf cfg.enable { services.nix-daemon.enable = true; };
-}
diff --git a/modules/darwin/base/programs.nix b/modules/darwin/base/programs.nix
deleted file mode 100644
index 74c059e..0000000
--- a/modules/darwin/base/programs.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.base.defaultPrograms;
-in
-{
-  config = lib.mkIf cfg.enable {
-    programs = {
-      bash.enable = true;
-      vim.enable = true;
-      zsh.enable = true;
-    };
-  };
-}
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index e19f29a..26ea30f 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,9 +1,9 @@
 {
   imports = [
     ../shared
-    ./archetypes
-    ./base
+    ./defaults
     ./desktop
+    ./profiles
     ./traits
   ];
 }
diff --git a/modules/darwin/defaults/default.nix b/modules/darwin/defaults/default.nix
new file mode 100644
index 0000000..8068e2d
--- /dev/null
+++ b/modules/darwin/defaults/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./programs.nix
+  ];
+
+  services.nix-daemon.enable = true;
+}
diff --git a/modules/darwin/defaults/programs.nix b/modules/darwin/defaults/programs.nix
new file mode 100644
index 0000000..3f25ad8
--- /dev/null
+++ b/modules/darwin/defaults/programs.nix
@@ -0,0 +1,7 @@
+{
+  programs = {
+    bash.enable = true;
+    vim.enable = true;
+    zsh.enable = true;
+  };
+}
diff --git a/modules/darwin/profiles/default.nix b/modules/darwin/profiles/default.nix
new file mode 100644
index 0000000..518cc57
--- /dev/null
+++ b/modules/darwin/profiles/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./personal.nix ]; }
diff --git a/modules/darwin/profiles/personal.nix b/modules/darwin/profiles/personal.nix
new file mode 100644
index 0000000..62b0cf8
--- /dev/null
+++ b/modules/darwin/profiles/personal.nix
@@ -0,0 +1,20 @@
+{ config, lib, ... }:
+let
+  cfg = config.profiles.personal;
+in
+{
+  options.profiles.personal = {
+    enable = lib.mkEnableOption "the Personal profile";
+  };
+
+  config = lib.mkIf cfg.enable {
+    desktop.enable = true;
+
+    traits = {
+      home-manager.enable = true;
+      users = {
+        seth.enable = true;
+      };
+    };
+  };
+}
-- 
cgit v1.2.3