From c1e4cdb929faf75af7cbfb20b8f040f1ed9b4f49 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Mon, 11 Sep 2023 19:21:31 +0200
Subject: [PATCH] move out common stuff again

---
 modules/_common/default.nix              | 6 ++++++
 modules/{desktop => _common}/i18n.nix    | 0
 modules/{desktop => _common}/nixpkgs.nix | 0
 modules/desktop/default.nix              | 3 +--
 modules/server/default.nix               | 5 +++--
 5 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 modules/_common/default.nix
 rename modules/{desktop => _common}/i18n.nix (100%)
 rename modules/{desktop => _common}/nixpkgs.nix (100%)

diff --git a/modules/_common/default.nix b/modules/_common/default.nix
new file mode 100644
index 0000000..6432356
--- /dev/null
+++ b/modules/_common/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./i18n.nix
+    ./nixpkgs.nix
+  ];
+}
diff --git a/modules/desktop/i18n.nix b/modules/_common/i18n.nix
similarity index 100%
rename from modules/desktop/i18n.nix
rename to modules/_common/i18n.nix
diff --git a/modules/desktop/nixpkgs.nix b/modules/_common/nixpkgs.nix
similarity index 100%
rename from modules/desktop/nixpkgs.nix
rename to modules/_common/nixpkgs.nix
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index aa50881..f9553c6 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -8,10 +8,9 @@
 in {
   imports = [
     <home-manager/nixos>
+    ../_common
     ./gnome.nix
     ./kde.nix
-    ./i18n.nix
-    ./nixpkgs.nix
     ./vinzenz.nix
     ./ronja.nix
   ];
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 06918bc..39940cd 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -6,7 +6,9 @@
 }: let
   cfg = config.my.server;
 in {
-  imports = [];
+  imports = [
+    ../_common
+  ];
 
   options.my.server = {
     enable = lib.mkEnableOption "server role";
@@ -23,7 +25,6 @@ in {
           KbdInteractiveAuthentication = false;
         };
       };
-
     };
 
     programs = {