update gitignore

.gitignore

@@ -1,3 +1,7 @@
+outputs
+result
+result-*
+source
 userdata/userdata.json
 hardware-configuration.nix
-networking.nix
+networking.nix

configuration.nix

@@ -6,27 +6,26 @@ in
 {
   imports = [
     ./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
+    ./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
+    ./generic/services/letsencrypt/acme.nix
+    ./generic/services/letsencrypt/resolve.nix
+    ./generic/services/mail/alps.nix
+    ./generic/services/mail/mailserver.nix
+    ./generic/services/passmgr/bitwarden.nix
+    ./generic/services/social/pleroma.nix
+    ./generic/services/videomeet/jitsi.nix
+    ./generic/services/vpn/ocserv.nix
+    ./generic/services/webserver/memcached.nix
+    ./generic/services/webserver/nginx.nix
+    ./generic/system/limits.nix
+    ./generic/system/tmpfiles.nix
+    ./generic/system/userdata.nix
+    ./generic/system/users.nix
   ];
 
   nixpkgs.overlays = [ (nix-overlay) ];

generic/system/userdata.nix

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

variables.nix

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