From ec1d28726f33ff8b9264169f34a6bf2415eef8f1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:00:12 +0200 Subject: [PATCH 1/7] move all services to subfolder --- configuration.nix | 28 +++++++++---------- {backup => local/services/backup}/restic.nix | 0 {git => local/services/git}/gitea.nix | 0 .../services/letsencrypt}/acme.nix | 0 .../services/letsencrypt}/resolve.nix | 0 .../services/mailserver}/alps-package.nix | 0 .../services/mailserver}/alps.nix | 0 .../services/mailserver}/mailserver.nix | 0 .../services/nextcloud}/nextcloud.nix | 0 .../services/passmgr}/bitwarden.nix | 0 {social => local/services/social}/config.exs | 0 .../services/social}/pleroma-module.nix | 0 .../services/social}/pleroma-package.nix | 0 {social => local/services/social}/pleroma.nix | 0 .../services/videomeet}/jitsi.nix | 0 {vpn => local/services/vpn}/ocserv.nix | 0 .../services/webserver}/memcached.nix | 0 .../services/webserver}/nginx.nix | 0 18 files changed, 14 insertions(+), 14 deletions(-) rename {backup => local/services/backup}/restic.nix (100%) rename {git => local/services/git}/gitea.nix (100%) rename {letsencrypt => local/services/letsencrypt}/acme.nix (100%) rename {letsencrypt => local/services/letsencrypt}/resolve.nix (100%) rename {mailserver/system => local/services/mailserver}/alps-package.nix (100%) rename {mailserver/system => local/services/mailserver}/alps.nix (100%) rename {mailserver/system => local/services/mailserver}/mailserver.nix (100%) rename {nextcloud => local/services/nextcloud}/nextcloud.nix (100%) rename {passmgr => local/services/passmgr}/bitwarden.nix (100%) rename {social => local/services/social}/config.exs (100%) rename {social => local/services/social}/pleroma-module.nix (100%) rename {social => local/services/social}/pleroma-package.nix (100%) rename {social => local/services/social}/pleroma.nix (100%) rename {videomeet => local/services/videomeet}/jitsi.nix (100%) rename {vpn => local/services/vpn}/ocserv.nix (100%) rename {webserver => local/services/webserver}/memcached.nix (100%) rename {webserver => local/services/webserver}/nginx.nix (100%) diff --git a/configuration.nix b/configuration.nix index e33f4e8..63fcddb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,27 +6,27 @@ 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 + ./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 ]; nixpkgs.overlays = [ (nix-overlay) ]; diff --git a/backup/restic.nix b/local/services/backup/restic.nix similarity index 100% rename from backup/restic.nix rename to local/services/backup/restic.nix diff --git a/git/gitea.nix b/local/services/git/gitea.nix similarity index 100% rename from git/gitea.nix rename to local/services/git/gitea.nix diff --git a/letsencrypt/acme.nix b/local/services/letsencrypt/acme.nix similarity index 100% rename from letsencrypt/acme.nix rename to local/services/letsencrypt/acme.nix diff --git a/letsencrypt/resolve.nix b/local/services/letsencrypt/resolve.nix similarity index 100% rename from letsencrypt/resolve.nix rename to local/services/letsencrypt/resolve.nix diff --git a/mailserver/system/alps-package.nix b/local/services/mailserver/alps-package.nix similarity index 100% rename from mailserver/system/alps-package.nix rename to local/services/mailserver/alps-package.nix diff --git a/mailserver/system/alps.nix b/local/services/mailserver/alps.nix similarity index 100% rename from mailserver/system/alps.nix rename to local/services/mailserver/alps.nix diff --git a/mailserver/system/mailserver.nix b/local/services/mailserver/mailserver.nix similarity index 100% rename from mailserver/system/mailserver.nix rename to local/services/mailserver/mailserver.nix diff --git a/nextcloud/nextcloud.nix b/local/services/nextcloud/nextcloud.nix similarity index 100% rename from nextcloud/nextcloud.nix rename to local/services/nextcloud/nextcloud.nix diff --git a/passmgr/bitwarden.nix b/local/services/passmgr/bitwarden.nix similarity index 100% rename from passmgr/bitwarden.nix rename to local/services/passmgr/bitwarden.nix diff --git a/social/config.exs b/local/services/social/config.exs similarity index 100% rename from social/config.exs rename to local/services/social/config.exs diff --git a/social/pleroma-module.nix b/local/services/social/pleroma-module.nix similarity index 100% rename from social/pleroma-module.nix rename to local/services/social/pleroma-module.nix diff --git a/social/pleroma-package.nix b/local/services/social/pleroma-package.nix similarity index 100% rename from social/pleroma-package.nix rename to local/services/social/pleroma-package.nix diff --git a/social/pleroma.nix b/local/services/social/pleroma.nix similarity index 100% rename from social/pleroma.nix rename to local/services/social/pleroma.nix diff --git a/videomeet/jitsi.nix b/local/services/videomeet/jitsi.nix similarity index 100% rename from videomeet/jitsi.nix rename to local/services/videomeet/jitsi.nix diff --git a/vpn/ocserv.nix b/local/services/vpn/ocserv.nix similarity index 100% rename from vpn/ocserv.nix rename to local/services/vpn/ocserv.nix diff --git a/webserver/memcached.nix b/local/services/webserver/memcached.nix similarity index 100% rename from webserver/memcached.nix rename to local/services/webserver/memcached.nix diff --git a/webserver/nginx.nix b/local/services/webserver/nginx.nix similarity index 100% rename from webserver/nginx.nix rename to local/services/webserver/nginx.nix -- 2.42.0 From fa6492b0c5bef378ea12334e2ad0f4a1f36bcc9f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:14:29 +0200 Subject: [PATCH 2/7] move all json files to local subfolder --- .gitignore | 2 +- README.md | 4 ++-- {userdata => generic/profiles}/schema.json | 0 result | 1 + variables.nix | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename {userdata => generic/profiles}/schema.json (100%) create mode 120000 result diff --git a/.gitignore b/.gitignore index d128ad9..b986568 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -userdata/userdata.json +local/profiles/users.json hardware-configuration.nix networking.nix \ No newline at end of file diff --git a/README.md b/README.md index 32a4b44..7385edb 100644 --- a/README.md +++ b/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.** diff --git a/userdata/schema.json b/generic/profiles/schema.json similarity index 100% rename from userdata/schema.json rename to generic/profiles/schema.json diff --git a/result b/result new file mode 120000 index 0000000..c5c6c59 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/a7kmh1b3y8p4d15539dp1jbqggbs2zfs-nixos-system-ruleit-21.05.4394.2553aee74fe \ No newline at end of file diff --git a/variables.nix b/variables.nix index 79fb145..e8be7c6 100644 --- a/variables.nix +++ b/variables.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { services = { - userdata = builtins.fromJSON (builtins.readFile ./userdata/userdata.json); + userdata = builtins.fromJSON (builtins.readFile ./local/profiles/users.json); }; } -- 2.42.0 From 4344e3062af95fcc753a8fde546b96f1462b5309 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:17:10 +0200 Subject: [PATCH 3/7] move limits to generic subfolder --- configuration.nix | 2 +- {resources => generic/systems}/limits.nix | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {resources => generic/systems}/limits.nix (100%) diff --git a/configuration.nix b/configuration.nix index 63fcddb..5520030 100644 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,7 @@ in ./users.nix ./api/api.nix ./api/api-module.nix - ./resources/limits.nix + ./generic/systems/limits.nix ./local/services/backup/restic.nix ./local/services/git/gitea.nix ./local/services/letsencrypt/acme.nix diff --git a/resources/limits.nix b/generic/systems/limits.nix similarity index 100% rename from resources/limits.nix rename to generic/systems/limits.nix -- 2.42.0 From 9832ea9281c10b86a6e9a088e746540d4fbf365f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:19:32 +0200 Subject: [PATCH 4/7] move api to generic subfolder --- configuration.nix | 4 ++-- {api => generic/api}/api-module.nix | 0 {api => generic/api}/api.nix | 0 result | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) rename {api => generic/api}/api-module.nix (100%) rename {api => generic/api}/api.nix (100%) delete mode 120000 result diff --git a/configuration.nix b/configuration.nix index 5520030..659397a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,8 +10,8 @@ in ./variables.nix ./files.nix ./users.nix - ./api/api.nix - ./api/api-module.nix + ./generic/api/api.nix + ./generic/api/api-module.nix ./generic/systems/limits.nix ./local/services/backup/restic.nix ./local/services/git/gitea.nix diff --git a/api/api-module.nix b/generic/api/api-module.nix similarity index 100% rename from api/api-module.nix rename to generic/api/api-module.nix diff --git a/api/api.nix b/generic/api/api.nix similarity index 100% rename from api/api.nix rename to generic/api/api.nix diff --git a/result b/result deleted file mode 120000 index c5c6c59..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/a7kmh1b3y8p4d15539dp1jbqggbs2zfs-nixos-system-ruleit-21.05.4394.2553aee74fe \ No newline at end of file -- 2.42.0 From e525926c5afca6b2981e6fd0bb4b537a549e5264 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:27:42 +0200 Subject: [PATCH 5/7] move files to generic subfolder --- configuration.nix | 2 +- files.nix => generic/systems/tmpfiles.nix | 0 result | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename files.nix => generic/systems/tmpfiles.nix (100%) create mode 120000 result diff --git a/configuration.nix b/configuration.nix index 659397a..013844a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,11 +8,11 @@ in ./hardware-configuration.nix ./variables-module.nix ./variables.nix - ./files.nix ./users.nix ./generic/api/api.nix ./generic/api/api-module.nix ./generic/systems/limits.nix + ./generic/systems/tmpfiles.nix ./local/services/backup/restic.nix ./local/services/git/gitea.nix ./local/services/letsencrypt/acme.nix diff --git a/files.nix b/generic/systems/tmpfiles.nix similarity index 100% rename from files.nix rename to generic/systems/tmpfiles.nix diff --git a/result b/result new file mode 120000 index 0000000..c5c6c59 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/a7kmh1b3y8p4d15539dp1jbqggbs2zfs-nixos-system-ruleit-21.05.4394.2553aee74fe \ No newline at end of file -- 2.42.0 From 6fc808cd5dadf321ab37e613feefdd2359f82328 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:36:22 +0200 Subject: [PATCH 6/7] move variables to generic subfolder --- configuration.nix | 4 ++-- variables-module.nix => generic/modules/userdata.nix | 0 generic/services/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/services/userdata.nix delete mode 100644 variables.nix diff --git a/configuration.nix b/configuration.nix index 013844a..07e258e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,11 +6,11 @@ in { imports = [ ./hardware-configuration.nix - ./variables-module.nix - ./variables.nix ./users.nix ./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 ./local/services/backup/restic.nix 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/services/userdata.nix b/generic/services/userdata.nix new file mode 100644 index 0000000..e20b6dc --- /dev/null +++ b/generic/services/userdata.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + services = { + userdata = builtins.fromJSON (builtins.readFile ./../../local/profiles/users.json); + }; +} diff --git a/variables.nix b/variables.nix deleted file mode 100644 index e8be7c6..0000000 --- a/variables.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: -{ - services = { - userdata = builtins.fromJSON (builtins.readFile ./local/profiles/users.json); - }; -} -- 2.42.0 From 53eba0c5bd0874c150fdbbdbcee4519b0fd95b59 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:38:51 +0200 Subject: [PATCH 7/7] move users to generic subfolder --- configuration.nix | 4 ++-- users.nix => generic/systems/users.nix | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename users.nix => generic/systems/users.nix (100%) diff --git a/configuration.nix b/configuration.nix index 07e258e..26cfec6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,14 +5,13 @@ let in { imports = [ - ./hardware-configuration.nix - ./users.nix ./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 @@ -27,6 +26,7 @@ in ./local/services/vpn/ocserv.nix ./local/services/webserver/memcached.nix ./local/services/webserver/nginx.nix + ./hardware-configuration.nix ]; nixpkgs.overlays = [ (nix-overlay) ]; diff --git a/users.nix b/generic/systems/users.nix similarity index 100% rename from users.nix rename to generic/systems/users.nix -- 2.42.0