From cb715fb99da03a64a656248f55a0d1f524e82f0a Mon Sep 17 00:00:00 2001 From: valentin gagarin Date: Wed, 13 Nov 2024 15:24:41 +0100 Subject: [PATCH] move more content --- website/content/default.nix | 12 +++++++++++- website/content/developers.nix | 19 +++++++++++++++++++ website/content/european-commission.nix | 15 +++++++++++++++ website/content/individuals.nix | 20 ++++++++++++++++++++ website/content/navigation.nix | 14 ++++++++++---- website/content/partners/nordunet.nix | 4 ++-- website/content/partners/oid.nix | 4 ++-- website/content/partners/tweag.nix | 4 ++-- website/content_/pages/Developers.md | 17 ----------------- website/content_/pages/EC.md | 13 ------------- website/content_/pages/Individuals.md | 18 ------------------ website/content_/pages/OID.md | 8 -------- 12 files changed, 81 insertions(+), 67 deletions(-) create mode 100644 website/content/developers.nix create mode 100644 website/content/european-commission.nix create mode 100644 website/content/individuals.nix delete mode 100755 website/content_/pages/Developers.md delete mode 100755 website/content_/pages/EC.md delete mode 100755 website/content_/pages/Individuals.md delete mode 100644 website/content_/pages/OID.md diff --git a/website/content/default.nix b/website/content/default.nix index 5253b957..0dc61ccd 100644 --- a/website/content/default.nix +++ b/website/content/default.nix @@ -33,11 +33,21 @@ in ${toString (map (partner: '' ## ${partner.title} - ${partner.description} + ${partner.summary} [Read more about ${partner.title}](${link partner}) '') (with pages; [ nlnet oid tweag nordunet ]))} + # Fediverse explained + + ${toString (map (role: '' + ## ${role.title} + + ${role.summary} + + [Read more about ${role.title}](${link role}) + '') (with pages; [ individuals developers european-commission ]))} + # News ${ diff --git a/website/content/developers.nix b/website/content/developers.nix new file mode 100644 index 00000000..5416d95a --- /dev/null +++ b/website/content/developers.nix @@ -0,0 +1,19 @@ +{ ... }: +{ + pages.developers = { + title = "Developers"; + description = "Information for developers about the Fediversity project"; + summary = '' + As a developer building the next generation of social platforms, you are looking to make it easier to facilitate your customers to use your product. Fediversity can help. + ''; + body = '' + The Fediversity Project enables easy hosting for a wide variety of fediverse platforms, all based on NixOS. At the start, the project will support Mastodon, PixelFed,PeerTube, Matrix and Nexcloud, and the project is actively working to expand this offering. Other services that are offered are email (based on Stalwart) and domain registry. + + As part of the NGI Funding, the Fediversity Project also offers grants to developers to expand the ecosystem. The NLNet website has more information on how you as a developer can apply to grants, ranging from 5.000 to 50.000 euro's. + + If you are a developer of fediverse software, and would like to get your platform also offered for easy hosting as part of the Fediversity Project, please reach out to us. You can contact us HERE. + + As the project is based upon NixOS, we are actively supporting making fediverse projects available as nix packages. If your project is on the fence about this, please reach out. Nix packages make updating and maintaining fediverse projects a breeze! + ''; + }; +} diff --git a/website/content/european-commission.nix b/website/content/european-commission.nix new file mode 100644 index 00000000..79a0438f --- /dev/null +++ b/website/content/european-commission.nix @@ -0,0 +1,15 @@ +{ ... }: +{ + pages.european-commission = { + title = "European Commission"; + description = "Information about the Fediversity project for the grant providers"; + summary = '' + The Fediversity Project operates on a grant gratiously provided by the HORIZON fund by the EC. Learn more about the accountability of the project. + ''; + body = '' + The Fediversity project implements the visions outlined by the Next Generation Internet (NGI) initiative for an open internet in several ways. Most importantly, it helps with decentralisation of the internet, a core principle of the NGI, by making it easier for people to participate in the Open Social Web on their own terms. NGI's goal of empowering individuals in the digital sphere is helped by making it easy for them to set up their own servers and platforms. While a variety of Fediverse software exist, there are still barriers of entry for people. In order for people to be truly empowered, joining the fediverse needs to be as weasy as possible. Additionally, the Fediverse emphasises interoperability and openness, which are key concerns addressed by the NGI. + + Part of the values of openness and transparency of is that the Fediversity project is that all the deliverables of the projects are have a 'Public' Dissemination level. On this page an overview of all deliverables of the Fediversity project can be found. + ''; + }; +} diff --git a/website/content/individuals.nix b/website/content/individuals.nix new file mode 100644 index 00000000..bf041d30 --- /dev/null +++ b/website/content/individuals.nix @@ -0,0 +1,20 @@ +{ ... }: +{ + pages.individuals = { + title = "Individuals"; + description = "Information about the project for regular people"; + summary = '' + Always be in control with your own data on social networks, whether that’s with Mastodon, PeerTube or Pixelfed: Fediversity makes it possible. + ''; + body = '' + The fediverse shows great potential in fundamentally rethinking how we approach the internet. It is a new way of thinking about how the internet can be a social web, and solves for the problems that the current Big Tech platforms have, while at the same time enabling a new wave of innovation and new ideas on the social web. + + - Giving people control of their data and social connections, allowing them to choose whatever platform and product they want. + - Giving people control of their privacy and their feeds, without black-box algorithms that decide for them what they get to see. + + The Fediversity project is working on making it easier for people to join the fediverse, and taking full control on their own online social presence. We make it easier for you to join the fediverse, giving you an easy way to select what you need. With one click, you can select whether you need photo sharing, microblogging, video sharing, blogging or simply email. You can get a domain name as well, so you can be up and running with a professional social presence on the new internet in without any effort. + + Fediversity is currently in development, and you can follow us on Mastodon for all the latest information. + ''; + }; +} diff --git a/website/content/navigation.nix b/website/content/navigation.nix index 20ca4d91..30303993 100644 --- a/website/content/navigation.nix +++ b/website/content/navigation.nix @@ -7,9 +7,17 @@ in label = "Main"; items = [ { - menu.label = "Consortium"; - menu.items = map (page: { inherit page; }) (with pages; [ nlnet oid tweag nordunet ]); + menu.label = "For you"; + menu.items = map (page: { inherit page; }) + (with pages; [ individuals developers european-commission ]); } + { + menu.label = "Consortium"; + menu.items = map (page: { inherit page; }) + (with pages; [ nlnet oid tweag nordunet ]); + } + { page = pages.fediversity; } + { page = pages.grants; } { menu.label = "News"; menu.items = @@ -22,8 +30,6 @@ in }) (lib.take 3 sorted); } - { page = pages.fediversity; } - { page = pages.grants; } ]; }; } diff --git a/website/content/partners/nordunet.nix b/website/content/partners/nordunet.nix index 6c660ae4..38647115 100644 --- a/website/content/partners/nordunet.nix +++ b/website/content/partners/nordunet.nix @@ -2,8 +2,8 @@ { pages.nordunet = { title = "NORDUnet"; - summary = "Details about NORDUnet"; - description = '' + description = "Details about NORDUnet"; + summary = '' NORDUnet is a collaboration of the National Research and Education Networks (NREN) of the Nordic countries. ''; body = '' diff --git a/website/content/partners/oid.nix b/website/content/partners/oid.nix index d1a0e320..54c4cfb0 100644 --- a/website/content/partners/oid.nix +++ b/website/content/partners/oid.nix @@ -3,8 +3,8 @@ pages.oid = { title = "Open Internet Discourse Foundation"; - summary = "Details about the Open Internet Discourse Foundation"; - description = '' + description = "Details about the Open Internet Discourse Foundation"; + summary = '' The Open Internet Discourse Foundation (OID) is founded on the belief that everyone deserves the freedom to express themselves and use the internet without constraints, and is committed to help build a better internet where individuals can truly be who they are. ''; body = '' diff --git a/website/content/partners/tweag.nix b/website/content/partners/tweag.nix index 7013bed9..5d72c64a 100644 --- a/website/content/partners/tweag.nix +++ b/website/content/partners/tweag.nix @@ -2,8 +2,8 @@ { pages.tweag = { title = "Tweag"; - summary = "Details about Tweag"; - description = '' + description = "Details about Tweag"; + summary = '' Tweag is the open source program office (OSPO) of Modus Create, and has extensive experience working with Nix, and many people at the forefront of the Nix community are Tweagers ''; body = '' diff --git a/website/content_/pages/Developers.md b/website/content_/pages/Developers.md deleted file mode 100755 index fa5a0161..00000000 --- a/website/content_/pages/Developers.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: "Developers" -# meta title -meta_title: "Developers" -# meta description -description: "Information for developers about the Fediversity Project." -# save as draft -draft: false ---- - -The Fediversity Project enables easy hosting for a wide variety of fediverse platforms, all based on NixOS. At the start, the project will support Mastodon, PixelFed,PeerTube, Matrix and Nexcloud, and the project is actively working to expand this offering. Other services that are offered are email (based on Stalwart) and domain registry. - -As part of the NGI Funding, the Fediversity Project also offers grants to developers to expand the ecosystem. The NLNet website has more information on how you as a developer can apply to grants, ranging from 5.000 to 50.000 euro's. - -If you are a developer of fediverse software, and would like to get your platform also offered for easy hosting as part of the Fediversity Project, please reach out to us. You can contact us HERE. - -As the project is based upon NixOS, we are actively supporting making fediverse projects available as nix packages. If your project is on the fence about this, please reach out. Nix packages make updating and maintaining fediverse projects a breeze! diff --git a/website/content_/pages/EC.md b/website/content_/pages/EC.md deleted file mode 100755 index e106a81f..00000000 --- a/website/content_/pages/EC.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: "European Commission" -# meta title -meta_title: "European Commission" -# meta description -description: "Information about the Fediversity Project for the grant providers." -# save as draft -draft: false ---- - -The Fediversity project implements the visions outlined by the Next Generation Internet (NGI) initiative for an open internet in several ways. Most importantly, it helps with decentralisation of the internet, a core principle of the NGI, by making it easier for people to participate in the Open Social Web on their own terms. NGI's goal of empowering individuals in the digital sphere is helped by making it easy for them to set up their own servers and platforms. While a variety of Fediverse software exist, there are still barriers of entry for people. In order for people to be truly empowered, joining the fediverse needs to be as weasy as possible. Additionally, the Fediverse emphasises interoperability and openness, which are key concerns addressed by the NGI. - -Part of the values of openness and transparency of is that the Fediversity project is that all the deliverables of the projects are have a 'Public' Dissemination level. On this page an overview of all deliverables of the Fediversity project can be found. diff --git a/website/content_/pages/Individuals.md b/website/content_/pages/Individuals.md deleted file mode 100755 index 36a44e5c..00000000 --- a/website/content_/pages/Individuals.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "Individuals" -# meta title -meta_title: "Individuals" -# meta description -description: "Information about the project for regular people." -# save as draft -draft: false ---- - -The fediverse shows great potential in fundamentally rethinking how we approach the internet. It is a new way of thinking about how the internet can be a social web, and solves for the problems that the current Big Tech platforms have, while at the same time enabling a new wave of innovation and new ideas on the social web. - -- Giving people control of their data and social connections, allowing them to choose whatever platform and product they want. -- Giving people control of their privacy and their feeds, without black-box algorithms that decide for them what they get to see. - -The Fediversity project is working on making it easier for people to join the fediverse, and taking full control on their own online social presence. We make it easier for you to join the fediverse, giving you an easy way to select what you need. With one click, you can select whether you need photo sharing, microblogging, video sharing, blogging or simply email. You can get a domain name as well, so you can be up and running with a professional social presence on the new internet in without any effort. - -Fediversity is currently in development, and you can follow us on Mastodon for all the latest information. diff --git a/website/content_/pages/OID.md b/website/content_/pages/OID.md deleted file mode 100644 index fcdf4b99..00000000 --- a/website/content_/pages/OID.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# meta title -meta_title: "Open Internet Discourse Foundation" -# meta description -# save as draft -draft: false ---- -