From fe7422b43d151a2fda4cd386916fd3f03a84d3c8 Mon Sep 17 00:00:00 2001
From: baduhai <baduhai@pm.me>
Date: Sun, 4 Dec 2022 18:35:06 -0300
Subject: [PATCH] The same with folders for users

---
 users/common/default.nix          | 8 ++++++++
 users/desktops/common/default.nix | 9 +++++++++
 users/desktops/user.nix           | 7 ++-----
 users/servers/user.nix            | 3 +--
 4 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 users/common/default.nix
 create mode 100644 users/desktops/common/default.nix

diff --git a/users/common/default.nix b/users/common/default.nix
new file mode 100644
index 0000000..a6eeaf4
--- /dev/null
+++ b/users/common/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./home.nix
+    ./programs.nix
+  ];
+}
diff --git a/users/desktops/common/default.nix b/users/desktops/common/default.nix
new file mode 100644
index 0000000..35e3fc5
--- /dev/null
+++ b/users/desktops/common/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./home.nix
+    ./programs.nix
+    ./services.nix
+  ];
+}
diff --git a/users/desktops/user.nix b/users/desktops/user.nix
index 4f50b45..e79e317 100644
--- a/users/desktops/user.nix
+++ b/users/desktops/user.nix
@@ -3,11 +3,8 @@
 {
   imports = [
     # Host-common imports
-    ../common/programs.nix
-    ../common/home.nix
+    ../common
     # Desktop-common imports
-    ./common/programs.nix
-    ./common/services.nix
-    ./common/home.nix
+    ./common
   ];
 }
diff --git a/users/servers/user.nix b/users/servers/user.nix
index 8b8c81b..0b27563 100644
--- a/users/servers/user.nix
+++ b/users/servers/user.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     # Host-common imports
-    ../common/programs.nix
-    ../common/home.nix
+    ../common
   ];
 }