From 7278be9a909b3c92d2aa5aa832d645175b18acc5 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Mon, 8 Sep 2025 08:29:20 -0700
Subject: move common modules together and simplify imports

---
 modules/common/default.nix     |  7 +++++++
 modules/common/home.nix        | 38 ++++++++++++++++++++++++++++++++++++++
 modules/common/host-config.nix | 15 +++++++++++++++
 modules/home.nix               | 38 --------------------------------------
 modules/host-config.nix        | 15 ---------------
 5 files changed, 60 insertions(+), 53 deletions(-)
 create mode 100644 modules/common/default.nix
 create mode 100644 modules/common/home.nix
 create mode 100644 modules/common/host-config.nix
 delete mode 100644 modules/home.nix
 delete mode 100644 modules/host-config.nix

(limited to 'modules')

diff --git a/modules/common/default.nix b/modules/common/default.nix
new file mode 100644
index 0000000..b42a079
--- /dev/null
+++ b/modules/common/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [
+    ./home.nix
+    ./host-config.nix
+  ];
+}
diff --git a/modules/common/home.nix b/modules/common/home.nix
new file mode 100644
index 0000000..6b6b518
--- /dev/null
+++ b/modules/common/home.nix
@@ -0,0 +1,38 @@
+{
+  userProfiles,
+  lib,
+  ...
+}:
+let
+  inherit (lib) mkOption;
+  inherit (lib.types)
+    submodule
+    listOf
+    attrsOf
+    str
+    ;
+in
+{
+  options = {
+    home = mkOption {
+      type = attrsOf (
+        submodule (
+          { name, ... }:
+          {
+            options = {
+              name = mkOption {
+                type = str;
+                default = name;
+              };
+              profiles = mkOption {
+                type = listOf str;
+                apply = map (v: userProfiles.${v});
+              };
+            };
+          }
+        )
+      );
+      default = { };
+    };
+  };
+}
diff --git a/modules/common/host-config.nix b/modules/common/host-config.nix
new file mode 100644
index 0000000..b10d85f
--- /dev/null
+++ b/modules/common/host-config.nix
@@ -0,0 +1,15 @@
+{ lib, ... }:
+let
+  inherit (lib) mkOption;
+  inherit (lib.types)
+    attrs
+    ;
+in
+{
+  options = {
+    adminUser = mkOption {
+      type = attrs;
+      default = { };
+    };
+  };
+}
diff --git a/modules/home.nix b/modules/home.nix
deleted file mode 100644
index 6b6b518..0000000
--- a/modules/home.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  userProfiles,
-  lib,
-  ...
-}:
-let
-  inherit (lib) mkOption;
-  inherit (lib.types)
-    submodule
-    listOf
-    attrsOf
-    str
-    ;
-in
-{
-  options = {
-    home = mkOption {
-      type = attrsOf (
-        submodule (
-          { name, ... }:
-          {
-            options = {
-              name = mkOption {
-                type = str;
-                default = name;
-              };
-              profiles = mkOption {
-                type = listOf str;
-                apply = map (v: userProfiles.${v});
-              };
-            };
-          }
-        )
-      );
-      default = { };
-    };
-  };
-}
diff --git a/modules/host-config.nix b/modules/host-config.nix
deleted file mode 100644
index b10d85f..0000000
--- a/modules/host-config.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) mkOption;
-  inherit (lib.types)
-    attrs
-    ;
-in
-{
-  options = {
-    adminUser = mkOption {
-      type = attrs;
-      default = { };
-    };
-  };
-}
-- 
cgit v1.2.3