From e6f79b30e620cf7bd5b06e2579e979ff090e925a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 18 Oct 2024 03:10:35 -0400
Subject: more refactors & outsource some things (#477)

* tree-wide: drop flake-parts

* drop nixinate

* justfile: cleanup

* drop treefmt-nix

* doc: update READMEs

* flake: cleanup

* seth: don't use `./.`

* modules/nixos,darwin: bundle all modules

They all depend on each other anyways so

* systems: manually import internal modules

* seth: use riff module from nix-exprs

* flake: back to flake-parts

* Revert "flake: back to flake-parts"

This reverts commit 35334882f7c0c23991a4efd65ea08b216006b2b0.

Saving the last commit so I can go back if I want

* flake: use lib.const

this looks better...right?

* flake: declare systems like a normal person
---
 modules/nixos/archetypes/personal.nix |  7 +------
 modules/nixos/archetypes/server.nix   |  7 +------
 modules/nixos/base/default.nix        |  1 -
 modules/nixos/default.nix             | 15 ++++++++-------
 modules/nixos/traits/locale.nix       |  4 +++-
 5 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'modules/nixos')

diff --git a/modules/nixos/archetypes/personal.nix b/modules/nixos/archetypes/personal.nix
index 1fa2f98..4200269 100644
--- a/modules/nixos/archetypes/personal.nix
+++ b/modules/nixos/archetypes/personal.nix
@@ -4,7 +4,7 @@ let
 in
 {
   options.archetypes = {
-    personal.enable = lib.mkEnableOption "the \"Personal\" archetype";
+    personal.enable = lib.mkEnableOption "the Personal archetype";
   };
 
   config = lib.mkIf cfg.enable {
@@ -13,11 +13,6 @@ in
     traits = {
       home-manager.enable = true;
 
-      locale = {
-        en_US.enable = true;
-        US-east.enable = true;
-      };
-
       secrets.enable = true;
       tailscale.enable = true;
 
diff --git a/modules/nixos/archetypes/server.nix b/modules/nixos/archetypes/server.nix
index 3a057d1..4dfbf9e 100644
--- a/modules/nixos/archetypes/server.nix
+++ b/modules/nixos/archetypes/server.nix
@@ -4,7 +4,7 @@ let
 in
 {
   options.archetypes = {
-    server.enable = lib.mkEnableOption "the \"Server\" archetype";
+    server.enable = lib.mkEnableOption "the Server archetype";
   };
 
   config = lib.mkIf cfg.enable {
@@ -25,11 +25,6 @@ in
     traits = {
       autoUpgrade.enable = true;
 
-      locale = {
-        en_US.enable = true;
-        US-east.enable = true;
-      };
-
       secrets.enable = true;
 
       tailscale = {
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
index 30e75d9..3a6412e 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -9,7 +9,6 @@ let
 in
 {
   imports = [
-    ../../shared
     ./networking.nix
     ./nix.nix
     ./programs.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index b0e3664..acc9d59 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,9 +1,10 @@
 {
-  flake.nixosModules = {
-    archetypes = ./archetypes;
-    base = ./base;
-    desktop = ./desktop;
-    server = ./server;
-    traits = ./traits;
-  };
+  imports = [
+    ../shared
+    ./archetypes
+    ./base
+    ./desktop
+    ./server
+    ./traits
+  ];
 }
diff --git a/modules/nixos/traits/locale.nix b/modules/nixos/traits/locale.nix
index bd30819..aa103e2 100644
--- a/modules/nixos/traits/locale.nix
+++ b/modules/nixos/traits/locale.nix
@@ -5,7 +5,9 @@ in
 {
   options.traits.locale = {
     en_US = {
-      enable = lib.mkEnableOption "en_US locale";
+      enable = lib.mkEnableOption "en_US locale" // {
+        default = true;
+      };
     };
   };
 
-- 
cgit v1.2.3