From b2659618aaef3bdaa3b2c1fad1ab43165d26eb00 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin.elven.pw>
Date: Tue, 14 Dec 2021 18:57:18 +0200
Subject: [PATCH] move variables to generic subfolder

---
 configuration.nix                                    | 4 ++--
 variables-module.nix => generic/modules/userdata.nix | 0
 generic/system/userdata.nix                          | 6 ++++++
 variables.nix                                        | 6 ------
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename variables-module.nix => generic/modules/userdata.nix (100%)
 create mode 100644 generic/system/userdata.nix
 delete mode 100644 variables.nix

diff --git a/configuration.nix b/configuration.nix
index 42ecd42..d934b7e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,12 +6,11 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ./variables-module.nix
-    ./variables.nix
     ./files.nix
     ./users.nix
     ./generic/api/api.nix
     ./generic/modules/api.nix
+    ./generic/modules/userdata.nix
     ./generic/services/backup/restic.nix
     ./generic/services/cloud/nextcloud.nix
     ./generic/services/git/gitea.nix
@@ -26,6 +25,7 @@ in
     ./generic/services/webserver/memcached.nix
     ./generic/services/webserver/nginx.nix
     ./generic/system/limits.nix
+    ./generic/system/userdata.nix
   ];
 
   nixpkgs.overlays = [ (nix-overlay) ];
diff --git a/variables-module.nix b/generic/modules/userdata.nix
similarity index 100%
rename from variables-module.nix
rename to generic/modules/userdata.nix
diff --git a/generic/system/userdata.nix b/generic/system/userdata.nix
new file mode 100644
index 0000000..d8d2ed7
--- /dev/null
+++ b/generic/system/userdata.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  services = {
+    userdata = builtins.fromJSON (builtins.readFile ./../../userdata/userdata.json);
+  };
+}
diff --git a/variables.nix b/variables.nix
deleted file mode 100644
index 79fb145..0000000
--- a/variables.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  services = {
-    userdata = builtins.fromJSON (builtins.readFile ./userdata/userdata.json);
-  };
-}