From 1402f885ffcf78e6b605403180a0daa65969c1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Gon=C3=A7alves?= Date: Fri, 19 May 2023 02:27:57 -0300 Subject: [PATCH 1/4] shuffled stuff, made copywriting (somewhat) --- en/index.html | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/en/index.html b/en/index.html index 5ec9c40..b437d79 100644 --- a/en/index.html +++ b/en/index.html @@ -11,18 +11,14 @@

Welcome to ~vern!

-

~vern is a non-commercial tilde focused on free software and services!

+

~vern is a non-commercial tilde focused on free software and services! This means we are a community open for sharing, engaging, participating and creating free and open source software for everyone, without exceptions.

+

While we host a lot of services like privacy front-ends, ~vern is well known for it's cozy and participative community, that has been built that way since the beginning. We are here not to just get software to your hands, but to walk you through it.

+

~vern also has a pubnix, that is, a public machine that runs NixOS on top of the Linux-Libre kernel for improved freedom. The nonfree repositories are not enabled by default, too.

+

Finally, ~vern's purpose is to provide to you the best experience you could have in this hopeless Internet, and to get you to get stuff done as soon as you can!

All our servers run free GNU/Linux distributions.

Announcements

A list of announcements can be found at /announcements -

Services

-

We host many services that are available for public use.

-

You can get access to the "Reg Needed" services by signing up via the registration form.

-

With the exception of clearnet Minetest & services hosted on Iceberg, none of the services we host have the capability to log IP addresses due to our use of WireGuard. IP logging on Iceberg is disabled.

-

We also host Tor and I2P versions of most of these services.

-

Services marked with "AD:" have alternate (sub)domains you can use for them.

-

Community

You can join our community on most major free software chat programs:

We make use of bridging so you can chat with us regardless of what chat program you use

@@ -43,6 +39,12 @@
  • Matrix
  • XMPP
    • +

    Services

    +

    You can get access to the "Reg Needed" services by signing up via the registration form.

    +

    With the exception of clearnet Minetest & services hosted on Iceberg, none of the services we host have the capability to log IP addresses due to our use of WireGuard. IP logging on Iceberg is disabled.

    +

    We also host Tor and I2P versions of most of these services.

    +

    Services marked with "AD:" have alternate (sub)domains you can use for them.

    +

    What computers do ~vern servers run on?

    ~vern has many servers running in different ways. You can find a list of them and their uses at /sysinfo.

    From 69283a763096be4185342208ef512760bd39eff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Gon=C3=A7alves?= Date: Fri, 19 May 2023 15:37:34 -0300 Subject: [PATCH 2/4] revert (im git dumb) --- en/index.html | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/en/index.html b/en/index.html index ac5cc92..7e11cd8 100644 --- a/en/index.html +++ b/en/index.html @@ -11,14 +11,18 @@

    Welcome to ~vern!

    -

    ~vern is a non-commercial tilde focused on free software and services! This means we are a community open for sharing, engaging, participating and creating free and open source software for everyone, without exceptions.

    -

    While we host a lot of services like privacy front-ends, ~vern is well known for it's cozy and participative community, that has been built that way since the beginning. We are here not to just get software to your hands, but to walk you through it.

    -

    ~vern also has a pubnix, that is, a public machine that runs NixOS on top of the Linux-Libre kernel for improved freedom. The nonfree repositories are not enabled by default, too.

    -

    Finally, ~vern's purpose is to provide to you the best experience you could have in this hopeless Internet, and to get you to get stuff done as soon as you can!

    +

    ~vern is a non-commercial tilde focused on free software and services!

    All our servers run free GNU/Linux distributions.

    Announcements

    A list of announcements can be found at /announcements +

    Services

    +

    We host many services that are available for public use.

    +

    You can get access to the "Reg Needed" services by signing up via the registration form.

    +

    With the exception of clearnet Minetest & services hosted on Iceberg, none of the services we host have the capability to log IP addresses due to our use of WireGuard. IP logging on Iceberg is disabled.

    +

    We also host Tor and I2P versions of most of these services.

    +

    Services marked with "AD:" have alternate (sub)domains you can use for them.

    +

    Community

    You can join our community on most major free software chat programs:

    We make use of bridging so you can chat with us regardless of what chat program you use

    @@ -39,6 +43,7 @@
  • Matrix
  • XMPP
    • +<<<<<<< HEAD <<<<<<< HEAD

    Services

    You can get access to the "Reg Needed" services by signing up via the registration form.

    @@ -46,6 +51,8 @@

    We also host Tor and I2P versions of most of these services.

    Services marked with "AD:" have alternate (sub)domains you can use for them.

    +======= +>>>>>>> parent of 1402f88 (shuffled stuff, made copywriting (somewhat))

    What computers do ~vern servers run on?

    ~vern has many servers running in different ways. You can find a list of them and their uses at /sysinfo.

    ======= From f9d26ffe5004e9da27490d27eb2b89593789b0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Gon=C3=A7alves?= Date: Fri, 19 May 2023 15:55:03 -0300 Subject: [PATCH 3/4] revert "revert (im git dumb)" This reverts commit 69283a763096be4185342208ef512760bd39eff3. --- en/index.html | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/en/index.html b/en/index.html index 7e11cd8..ac5cc92 100644 --- a/en/index.html +++ b/en/index.html @@ -11,18 +11,14 @@

    Welcome to ~vern!

    -

    ~vern is a non-commercial tilde focused on free software and services!

    +

    ~vern is a non-commercial tilde focused on free software and services! This means we are a community open for sharing, engaging, participating and creating free and open source software for everyone, without exceptions.

    +

    While we host a lot of services like privacy front-ends, ~vern is well known for it's cozy and participative community, that has been built that way since the beginning. We are here not to just get software to your hands, but to walk you through it.

    +

    ~vern also has a pubnix, that is, a public machine that runs NixOS on top of the Linux-Libre kernel for improved freedom. The nonfree repositories are not enabled by default, too.

    +

    Finally, ~vern's purpose is to provide to you the best experience you could have in this hopeless Internet, and to get you to get stuff done as soon as you can!

    All our servers run free GNU/Linux distributions.

    Announcements

    A list of announcements can be found at /announcements -

    Services

    -

    We host many services that are available for public use.

    -

    You can get access to the "Reg Needed" services by signing up via the registration form.

    -

    With the exception of clearnet Minetest & services hosted on Iceberg, none of the services we host have the capability to log IP addresses due to our use of WireGuard. IP logging on Iceberg is disabled.

    -

    We also host Tor and I2P versions of most of these services.

    -

    Services marked with "AD:" have alternate (sub)domains you can use for them.

    -

    Community

    You can join our community on most major free software chat programs:

    We make use of bridging so you can chat with us regardless of what chat program you use

    @@ -43,7 +39,6 @@
  • Matrix
  • XMPP
    • -<<<<<<< HEAD <<<<<<< HEAD

    Services

    You can get access to the "Reg Needed" services by signing up via the registration form.

    @@ -51,8 +46,6 @@

    We also host Tor and I2P versions of most of these services.

    Services marked with "AD:" have alternate (sub)domains you can use for them.

    -======= ->>>>>>> parent of 1402f88 (shuffled stuff, made copywriting (somewhat))

    What computers do ~vern servers run on?

    ~vern has many servers running in different ways. You can find a list of them and their uses at /sysinfo.

    ======= From f123dae8d7863d63170a0a26d8cfbd498dcbd38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Gon=C3=A7alves?= Date: Fri, 19 May 2023 15:59:25 -0300 Subject: [PATCH 4/4] remove line 42 and 51 (idk what fucking happened there) --- en/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/en/index.html b/en/index.html index ac5cc92..b437d79 100644 --- a/en/index.html +++ b/en/index.html @@ -39,7 +39,6 @@
  • Matrix
  • XMPP
    • -<<<<<<< HEAD

    Services

    You can get access to the "Reg Needed" services by signing up via the registration form.

    With the exception of clearnet Minetest & services hosted on Iceberg, none of the services we host have the capability to log IP addresses due to our use of WireGuard. IP logging on Iceberg is disabled.

    @@ -48,8 +47,6 @@

    What computers do ~vern servers run on?

    ~vern has many servers running in different ways. You can find a list of them and their uses at /sysinfo.

    -======= ->>>>>>> df9be37828498af9c9e23f59f8891ffcf0d97bcf