.gitignore

@@ -1,3 +1,3 @@
-userdata/userdata.json
+local/profiles/users.json
 hardware-configuration.nix
 networking.nix

README.md

@@ -1,9 +1,9 @@
 # SelfPrivacy NixOS configuration
 
 This is a NixOS config which builds a SelfPrivacy server distribution
-based on data provided in `userdata/userdata.json`.
+based on data provided in `local/profiles/users.json`.
 
-JSON schema is provided in `userdata/schema.json` for reference.
+JSON schema is provided in `generic/profiles/schema.json` for reference.
 
 **hardware-configuration.nix is not included.**
 

configuration.nix

@@ -5,28 +5,28 @@ let
 in
 {
   imports = [
+    ./generic/api/api.nix
+    ./generic/api/api-module.nix
+    ./generic/modules/userdata.nix
+    ./generic/services/userdata.nix
+    ./generic/systems/limits.nix
+    ./generic/systems/tmpfiles.nix
+    ./generic/systems/users.nix
+    ./local/services/backup/restic.nix
+    ./local/services/git/gitea.nix
+    ./local/services/letsencrypt/acme.nix
+    ./local/services/letsencrypt/resolve.nix
+    ./local/services/mailserver/alps.nix
+    ./local/services/mailserver/mailserver.nix
+    ./local/services/nextcloud/nextcloud.nix
+    ./local/services/passmgr/bitwarden.nix
+    ./local/services/passmgr/bitwarden.nix
+    ./local/services/social/pleroma.nix
+    ./local/services/videomeet/jitsi.nix
+    ./local/services/vpn/ocserv.nix
+    ./local/services/webserver/memcached.nix
+    ./local/services/webserver/nginx.nix
     ./hardware-configuration.nix
-
-    ./variables-module.nix
-    ./variables.nix
-    ./files.nix
-    ./users.nix
-    ./mailserver/system/mailserver.nix
-    ./mailserver/system/alps.nix
-    ./vpn/ocserv.nix
-    ./api/api.nix
-    ./api/api-module.nix
-    ./social/pleroma.nix
-    ./letsencrypt/acme.nix
-    ./letsencrypt/resolve.nix
-    ./backup/restic.nix
-    ./passmgr/bitwarden.nix
-    ./webserver/nginx.nix
-    ./webserver/memcached.nix
-    ./nextcloud/nextcloud.nix
-    ./resources/limits.nix
-    ./videomeet/jitsi.nix
-    ./git/gitea.nix
   ];
 
   nixpkgs.overlays = [ (nix-overlay) ];

generic/services/userdata.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  services = {
+    userdata = builtins.fromJSON (builtins.readFile ./../../local/profiles/users.json);
+  };
+}

result

@@ -0,0 +1 @@
+/nix/store/a7kmh1b3y8p4d15539dp1jbqggbs2zfs-nixos-system-ruleit-21.05.4394.2553aee74fe

variables.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  services = {
-    userdata = builtins.fromJSON (builtins.readFile ./userdata/userdata.json);
-  };
-}