From 5f848623dff7cbcd21911032e5fd4c77bcf7d413 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 4 Feb 2024 16:40:38 -0500
Subject: tree-wide: better separate/name some things

---
 flake.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 2670aea..e55ce22 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,20 +6,24 @@
     extra-trusted-public-keys = ["getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="];
   };
 
-  outputs = inputs:
+  outputs = inputs: let
+    inherit ((import ./modules/flake).flake) flakeModules;
+  in
     inputs.parts.lib.mkFlake {inherit inputs;} {
       imports = [
-        ./dev
         ./modules
         ./overlay
         ./systems
         ./users
-        ./terranix
+
+        ./repo # checks, ci, devShells, etc.
+        ./ext # nix expressions for *external*, not so nix-y things
 
         inputs.pre-commit.flakeModule
+
         # dogfooding
-        ./modules/flake/configurations.nix
-        ./modules/flake/terranix.nix
+        flakeModules.configurations
+        flakeModules.terranix
       ];
 
       systems = [
-- 
cgit v1.2.3