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

8 files changed, 25 insertions, 36 deletions

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/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/archetypes/default.nix b/modules/darwin/profiles/default.nix
index 518cc57..518cc57 100644
--- a/modules/darwin/archetypes/default.nix
+++ b/modules/darwin/profiles/default.nix
diff --git a/modules/darwin/archetypes/personal.nix b/modules/darwin/profiles/personal.nix
index a81efdc..62b0cf8 100644
--- a/modules/darwin/archetypes/personal.nix
+++ b/modules/darwin/profiles/personal.nix
@@ -1,14 +1,13 @@
 { config, lib, ... }:
 let
-  cfg = config.archetypes.personal;
+  cfg = config.profiles.personal;
 in
 {
-  options.archetypes.personal = {
-    enable = lib.mkEnableOption "the \"Personal\" archetype";
+  options.profiles.personal = {
+    enable = lib.mkEnableOption "the Personal profile";
   };
 
   config = lib.mkIf cfg.enable {
-    base.enable = true;
     desktop.enable = true;
 
     traits = {