diff --git a/COPYRIGHT b/COPYRIGHT index 04023b1..c2c9f35 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,9 @@ -Copyright (C) 2020-2023 luca0N! Some rights reserved. +Copyright (C) 2020-2024 luca0N! Some rights reserved. All content on the luca0N!.com website - including the luca0N! logo - is licensed under the Attribution-ShareAlike 4.0 International license unless otherwise stated. See LICENSE for more information. +Updates sources for this website are available at +. + diff --git a/Makefile b/Makefile index f15f19b..538137b 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,20 @@ # luca0N.com website sources Makefile # 2022-09-12 -# https://git.luca0n.com/luca0N-website.git +# https://git.luca0n.com/luca0N/luca0N-website SWG=swg -all: output/ +all: output/en/ output/pt/ + +en: output/en/ + +pt: output/pt/ + +output/en/: output/ src/en/ $(SWG) src/en/ mv src/en/output output/en + +output/pt/: output/ src/pt/ $(SWG) src/pt/ mv src/pt/output output/pt diff --git a/README.md b/README.md index 9560db1..7ff9e40 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repository contains all sources for the third revision of the luca0N.com we ## License and copyright notice -Copyright © 2020—2023 luca0N! Some rights reserved. +Copyright © 2020—2024 luca0N! Some rights reserved. The contents of the luca0N!.com website are licensed under the Attribution-ShareAlike 4.0 International license unless otherwise stated. See [COPYRIGHT](COPYRIGHT) and [LICENSE](LICENSE) for more information. @@ -14,7 +14,7 @@ Here are the instructions to build this website. It should work on any system, ### Requirements -- [swg](https://git.luca0n.com/swg.git) +- [swg](https://git.luca0n.com/luca0N/swg) ### Building @@ -27,3 +27,8 @@ To delete previously built pages, run the following command: ```sh $ make clean ``` + +You can also build the English version only with: +```sh +$ make en # or use `pt' to build Portuguese sources +``` diff --git a/src/en/__swg_template.html b/src/en/__swg_template.html index bb48bc5..deadada 100644 --- a/src/en/__swg_template.html +++ b/src/en/__swg_template.html @@ -62,8 +62,8 @@
diff --git a/src/en/assets/luca0n.css b/src/en/assets/luca0n.css index a7bf6a8..73630d4 100644 --- a/src/en/assets/luca0n.css +++ b/src/en/assets/luca0n.css @@ -9,7 +9,7 @@ body { margin: 0; font-family: sans-serif; - background-color: #ddd; + background-color: #eee; color: #333; } diff --git a/src/en/contact.md b/src/en/contact.md index 8d66825..438c5de 100644 --- a/src/en/contact.md +++ b/src/en/contact.md @@ -5,5 +5,12 @@ Want to get in touch with me? Here's my contact details (feel free to use any o - E-mail Address: `luca0n at luca0n dot com` ([PGP encryption](pgp/) is encouraged) - XMPP (Jabber) Address: (same as e-mail address) - Matrix Address: `@luca0n:luca0n.com` -- IRC: `luca0N` on Libera.Chat (though 99% of the time I'm just lurking in various channels) +- IRC: `luca0N` on Libera.Chat (I'm a bit more active there these days) - Pleroma (ActivityPub, Fediverse): `at luca0n at luca0n dot com` + +## Extras + +These are accounts that I have, but don't consider my main ones: + +- GitHub: [@luca0N](https://github.com/luca0N) (I am actually on GitHub solely to contribute to FOSS projects hosted on there, but my software stays in [my Git server](https://git.luca0n.com/luca0N). + diff --git a/src/en/services.md b/src/en/services.md index b998007..50b5661 100644 --- a/src/en/services.md +++ b/src/en/services.md @@ -12,13 +12,13 @@ By using these services, you agree to the [luca0N.com Terms of Service](tos). These services are either private, have limited access or are invite-only. -- [luca0N.com Git](https://git.luca0n.com/): this is where I host the source code for my software. +- [luca0N.com Git](https://git.luca0n.com/)\[Tor\]: this is where I host the source code for my software. - [luca0N! Social](https://social.luca0n.com/): this is my self\-hosted Pleroma instance (although I rarely use it). - [Matrix](https://matrix.luca0n.com/): my self-hosted Matrix instance. # Apps -- [Element](https://element.luca0n.com/): an Element web client instance. +- [Element](https://element.luca0n.com/)\[Tor\]: an Element web client instance. # APIs diff --git a/src/en/swg.cfg b/src/en/swg.cfg index aad5948..19bbb72 100644 --- a/src/en/swg.cfg +++ b/src/en/swg.cfg @@ -1,5 +1,5 @@ # SWG Context Configuration File -# Copyright (C) 2023 luca0N! +# Copyright (C) 2022-2024 luca0N! # This is a very minimal .ini-like configuration file. # @@ -24,7 +24,7 @@ WebsitePublisher="luca0N!" # published on the website. Multiple copyright holders can be specified here. WebsiteCopyrightHolder="luca0N!" # This defines the copyright year or copyright years of the published content. -WebsiteCopyrightYears="2020-2023" +WebsiteCopyrightYears="2020—2024" # This defines the license of the published content. WebsiteContentLicense="CC-BY-SA-4.0" diff --git a/src/pt/__swg_template.html b/src/pt/__swg_template.html index 4e43452..61f11f7 100644 --- a/src/pt/__swg_template.html +++ b/src/pt/__swg_template.html @@ -62,8 +62,8 @@

Este sítio está hospedado em Nautilus. Declaração de Privacidade | Termos de Serviço

-

Todo o conteúdo neste sítio — incluindo o ícone luca0N! — está sob a licença Atribuição-CompartilhaIgual 4.0 Internacional a não ser que outra licença tenha sido especificada.

-

Copyright © 2020—2023 luca0N! Alguns direitos reservados.

+

Todo o conteúdo neste sítio — incluindo o ícone luca0N! — está sob a licença Atribuição-CompartilhaIgual 4.0 Internacional a não ser que outra licença tenha sido especificada. [Ver fontes deste sítio]

+

Copyright © 2020—2024 luca0N! Alguns direitos reservados.

diff --git a/src/pt/contact.md b/src/pt/contact.md index 1e4b5d9..abe7db7 100644 --- a/src/pt/contact.md +++ b/src/pt/contact.md @@ -5,5 +5,12 @@ Deseja entrar em contato comigo? Aqui estão os meus detalhes de contato (sinta- - Endereço de correio eletrônico: `luca0n arroba luca0n ponto com` ([criptografia PGP](pgp/) é recomendado) - Endereço XMPP (Jabber): (o mesmo que o endereço de correio eletrônico) - Endereço Matrix: `@luca0n:luca0n.com` -- IRC: `luca0N` no Libera.Chat (apesar de eu estar inativo 99% das vezes na maioria dos canais) +- IRC: `luca0N` no Libera.Chat (eu estive mais ativo recentemente) - Pleroma (ActivityPub, Fediverse): `arroba luca0n arroba luca0n ponto com` + +## Extras + +Estas são contas que eu tenho, mas não considero minhas principais: + +- GitHub: [@luca0N](https://github.com/luca0N) (Eu estou no GitHub somente para contribuir para projetos FOSS que estão lá, mas meu software continua no [meu servidor Git](https://git.luca0n.com/luca0N). + diff --git a/src/pt/services.md b/src/pt/services.md index 2d9b3b1..081ab65 100644 --- a/src/pt/services.md +++ b/src/pt/services.md @@ -13,13 +13,13 @@ Ao utilizar estes serviços, você concorda com os [Termos de Serviço luca0N.co Estes serviços são privados, de acesso limitado ou apenas para convidados. -- [Git luca0N.com](https://git.luca0n.com/): o código-fonte dos meus programas ficam aqui. +- [Git luca0N.com](https://git.luca0n.com/)\[Tor\]: o código-fonte dos meus programas ficam aqui. - [luca0N! Social](https://social.luca0n.com/): é a minha instância do Pleroma (apesar de eu não utilizar ela muito). - [Matrix](https://matrix.luca0n.com/): é meu servidor Matrix. # Aplicativos -- [Element](https://element.luca0n.com/): é uma instância do cliente *web* Element. +- [Element](https://element.luca0n.com/)\[Tor\]: é uma instância do cliente *web* Element. # APIs diff --git a/src/pt/swg.cfg b/src/pt/swg.cfg index 403a664..35127ba 100644 --- a/src/pt/swg.cfg +++ b/src/pt/swg.cfg @@ -1,5 +1,5 @@ # SWG Context Configuration File -# Copyright (C) 2023 luca0N! +# Copyright (C) 2022-2024 luca0N! # This is a very minimal .ini-like configuration file. # @@ -24,7 +24,7 @@ WebsitePublisher="luca0N!" # published on the website. Multiple copyright holders can be specified here. WebsiteCopyrightHolder="luca0N!" # This defines the copyright year or copyright years of the published content. -WebsiteCopyrightYears="2020-2023" +WebsiteCopyrightYears="2020—2024" # This defines the license of the published content. WebsiteContentLicense="CC-BY-SA-4.0"