From 24a5f89b39c34eda1f14db818f9d4d02e5330678 Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Thu, 22 Jan 2026 03:05:34 +0900 Subject: [PATCH 1/5] feat: Discord to Matrix, part 1 --- theme/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/main.html b/theme/main.html index 7261f5dd..1ba5d21b 100644 --- a/theme/main.html +++ b/theme/main.html @@ -6,5 +6,5 @@ color: var(--md-typeset-color); } - Join our Discord Server + Join our Matrix Space {% endblock %} From 3da2e61ab0957c7f39570f00f12eb8138a1ac056 Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Thu, 22 Jan 2026 03:12:35 +0900 Subject: [PATCH 2/5] feat: Discord to Matrix, part 2 --- mkdocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 71850009..9449bc93 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -128,7 +128,7 @@ extra_css: extra: social: - - icon: fontawesome/brands/discord - link: https://discord.com/invite/68MRhQu + - icon: simple/matrix + link: https://matrix.to/#/#space:t2linux.org - icon: fontawesome/brands/github link: https://github.com/t2linux From 047009e934b2cd2a30eeea5cc36e828d526e0627 Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Thu, 22 Jan 2026 03:30:07 +0900 Subject: [PATCH 3/5] feat: add Discord back, part 1 --- mkdocs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkdocs.yml b/mkdocs.yml index 9449bc93..d8e7c584 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -130,5 +130,7 @@ extra: social: - icon: simple/matrix link: https://matrix.to/#/#space:t2linux.org + - icon: fontawesome/brands/discord + link: https://discord.com/invite/68MRhQu - icon: fontawesome/brands/github link: https://github.com/t2linux From 5bfb37203b904f35556e3d0eeed3f08a21b6eb63 Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Thu, 22 Jan 2026 03:45:47 +0900 Subject: [PATCH 4/5] feat: more matrix migration (#679) * feat: more matrix migration stuffs * feat: update year to 2026 --- docs/contribute.md | 4 ++-- docs/distributions/fedora/home.md | 2 +- docs/distributions/ubuntu/home.md | 2 +- docs/distributions/ubuntu/installation.md | 2 +- docs/index.md | 5 ++++- docs/notable-contributors.md | 2 +- mkdocs.yml | 2 +- theme/main.html | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/contribute.md b/docs/contribute.md index 2919c37b..03ef35d2 100644 --- a/docs/contribute.md +++ b/docs/contribute.md @@ -2,7 +2,7 @@ The T2 project itself currently does not accept financial donations. However, some of the contributors and maintainers of the project do accept donations on their own. You may refer to the [Support our maintainers](https://wiki.t2linux.org/contribute/#support-our-maintainers) section of this page to get the links of the same. -The best way to donate, we believe, is in the form of skill. If you think you have the potential to help us in pushing the project further, like fixing bugs, adding new features, etc., you are free to do so. For this, you may contact our Discord server, where other members of this organization are present. +The best way to donate, we believe, is in the form of skill. If you think you have the potential to help us in pushing the project further, like fixing bugs, adding new features, etc., you are free to do so. For this, you may contact our Matrix Space, or Discord server, where other members of this organization are present. ## Contribute to the code @@ -15,7 +15,7 @@ Here is the list and links to donate to some of our maintainers. - [MCMrARM](https://github.com/MCMrARM) - Author of the [apple-bce driver](https://github.com/t2linux/apple-bce-drv). Donate via [Paypal](https://paypal.me/mcmrarm). - [JPyke3](https://github.com/JPyke3) - Played a major role in getting Manjaro working on T2 Macs. Donate via [Patreon](https://patreon.com/pykee) or [On Chain](https://github.com/JPyke3/mbp-manjaro#donations). - [marcosfad](https://github.com/marcosfad) - Played a major role in getting Ubuntu working on T2 Macs. Donate via [Paypal](https://paypal.me/marcosfad) or [GitHub Sponsors](https://github.com/sponsors/marcosfad). -- [NoaHimesaka1873](https://github.com/NoaHimesaka1873) - Currently maintains boot images and kernels for Arch and EndeavourOS. Donate via [GitHub Sponsors](https://github.com/sponsors/NoaHimesaka1873) or [Toss (South Korea residents only)](https://toss.me/yuruverse). +- [NoaHimesaka1873](https://github.com/NoaHimesaka1873) - Currently maintains boot images and kernels for Arch and EndeavourOS and runs chat.t2linux.org homeserver. Donate via [GitHub Sponsors](https://github.com/sponsors/NoaHimesaka1873). - [Redecorating](https://github.com/Redecorating) - Played a major role in adding support for T2 Macs in the apple-gmux driver, required for hybrid graphics. Also has written T2 related kernel patches and worked on T2 related kernel regressions. Donate via [PayPal](https://paypal.me/redecorating). - [AdityaGarg8](https://github.com/AdityaGarg8) - Current maintainer of Ubuntu. Has also helped in writing T2 kernel patches and upstreaming various patches. Donate via **GitHub sponsors** ([Link](https://github.com/sponsors/AdityaGarg8)) or **Buy Me a Coffee** ([Link](https://www.buymeacoffee.com/gargadityav)). - [networkException](https://github.com/networkException) - Wiki creator and maintainer. Donate via [GitHub Sponsors](https://github.com/sponsors/networkException). diff --git a/docs/distributions/fedora/home.md b/docs/distributions/fedora/home.md index 92e7072f..5d0559f1 100644 --- a/docs/distributions/fedora/home.md +++ b/docs/distributions/fedora/home.md @@ -1,3 +1,3 @@ Welcome to the T2 Fedora wiki! -Follow [the installation guide](https://wiki.t2linux.org/distributions/fedora/installation/) to get started. If you need help, join the t2linux Discord [server](https://discord.com/invite/68MRhQu) and ask in `#fedora`. Alternatively, you can open an issue in the GitHub [issue tracker](https://github.com/t2linux/wiki/issues). You can also refer to the [FAQ](https://wiki.t2linux.org/distributions/fedora/faq/) to fix common problems. +Follow [the installation guide](https://wiki.t2linux.org/distributions/fedora/installation/) to get started. If you need help, join the t2linux Matrix [Fedora Room](https://matrix.to/#/#fedora:t2linux.org), or Discord [server](https://discord.com/invite/68MRhQu) and ask in `#fedora`. Alternatively, you can open an issue in the GitHub [issue tracker](https://github.com/t2linux/wiki/issues). You can also refer to the [FAQ](https://wiki.t2linux.org/distributions/fedora/faq/) to fix common problems. diff --git a/docs/distributions/ubuntu/home.md b/docs/distributions/ubuntu/home.md index cfa49148..a221ac2a 100644 --- a/docs/distributions/ubuntu/home.md +++ b/docs/distributions/ubuntu/home.md @@ -1,3 +1,3 @@ Welcome to the T2 Ubuntu wiki! -Follow [the installation guide](https://wiki.t2linux.org/distributions/ubuntu/installation/) to get started. If you need help, join the t2linux Discord [server](https://discord.com/invite/68MRhQu) and ask in `#ubuntu` over there. Alternately, you can open an issue in the GitHub [issue tracker](https://github.com/t2linux/T2-Ubuntu/issues). You can also refer to the [FAQ](https://wiki.t2linux.org/distributions/ubuntu/faq/) to fix common problems. +Follow [the installation guide](https://wiki.t2linux.org/distributions/ubuntu/installation/) to get started. If you need help, join the t2linux Matrix [Ubuntu Room](https://matrix.to/#/#ubuntu:t2linux.org), or Discord [server](https://discord.com/invite/68MRhQu) and ask in `#ubuntu` over there. Alternately, you can open an issue in the GitHub [issue tracker](https://github.com/t2linux/T2-Ubuntu/issues). You can also refer to the [FAQ](https://wiki.t2linux.org/distributions/ubuntu/faq/) to fix common problems. diff --git a/docs/distributions/ubuntu/installation.md b/docs/distributions/ubuntu/installation.md index 435e13a3..26ef815e 100644 --- a/docs/distributions/ubuntu/installation.md +++ b/docs/distributions/ubuntu/installation.md @@ -55,4 +55,4 @@ In order to make changes to the config for `tiny-dfr`, copy `/usr/share/tiny-dfr ## Troubleshooting -If you are facing issues while installing or have post installation issues (E.g.: Wi-Fi, sound etc.), refer to the [FAQ](https://wiki.t2linux.org/distributions/ubuntu/faq/) section first. If it is not able to help you, you may open an issue [here](https://github.com/t2linux/T2-Ubuntu/issues) or contact us on the [Discord server](https://discord.com/invite/68MRhQu). +If you are facing issues while installing or have post installation issues (E.g.: Wi-Fi, sound etc.), refer to the [FAQ](https://wiki.t2linux.org/distributions/ubuntu/faq/) section first. If it is not able to help you, you may open an issue [here](https://github.com/t2linux/T2-Ubuntu/issues), or contact us on the [Matrix Space](https://matrix.to/#/#space:t2linux.org) or [Discord server](https://discord.com/invite/68MRhQu). diff --git a/docs/index.md b/docs/index.md index c0850fdb..46c8cb72 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,10 @@ To get started with an installation, refer to the [roadmap](https://wiki.t2linux # Contact us -You may contact us on the [Linux on T2 Macs (2018+) Discord Server](https://discord.com/invite/68MRhQu), where you can find most of the people involved. +You may contact us on the [Linux on T2 Macs (2018+) Matrix Space](https://matrix.to/#/#space:t2linux.org) or [Linux on T2 Macs (2018+) Discord Server](https://discord.com/invite/68MRhQu), where you can find most of the people involved. + +!!! Warning "Discord Server is age-restricted" + For unknown reason, our Discord server is age-restricted. Please use Matrix instead if you can't go though age verification. # Contribute diff --git a/docs/notable-contributors.md b/docs/notable-contributors.md index 3bb0bd32..e0c9b06a 100644 --- a/docs/notable-contributors.md +++ b/docs/notable-contributors.md @@ -18,7 +18,7 @@ If there is someone missing that you think should be on this list, send a PR on - AdityaGarg8 (Ubuntu and wiki maintenance) [https://github.com/AdityaGarg8](https://github.com/AdityaGarg8) - EmreTech (Gentoo) [https://github.com/EmreTech](https://github.com/EmreTech) - T2minator (Tails) [https://github.com/T2minator](https://github.com/T2minator) -- NoaHimesaka1873 (Arch, Manjaro, EndeavourOS and wiki maintenance) [https://github.com/NoaHimesaka1873](https://github.com/NoaHimesaka1873) +- NoaHimesaka1873 (Arch, Manjaro, EndeavourOS, wiki maintenance and runs chat.t2linux.org Matrix homeserver) [https://github.com/NoaHimesaka1873](https://github.com/NoaHimesaka1873) - The Asahi Linux Contributors (Wi-Fi and Bluetooth) [https://asahilinux.org/](https://asahilinux.org/) - lemmyg (Fine audio tuning for MacBook Pro 16 inch 2019) [https://github.com/lemmyg](https://github.com/lemmyg) - slsrepo (t2archinstall for Arch Linux) [https://github.com/slsrepo/t2archinstall](https://github.com/slsrepo/t2archinstall) diff --git a/mkdocs.yml b/mkdocs.yml index d8e7c584..9dbdda3e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -3,7 +3,7 @@ site_name: t2linux wiki site_author: the t2linux.org contributors site_url: https://t2linux.org/ -copyright: "© 2021-2025 t2linux.org CC-BY-SA-4.0" +copyright: "© 2021-2026 t2linux.org CC-BY-SA-4.0" theme: palette: diff --git a/theme/main.html b/theme/main.html index 1ba5d21b..2ccd05ec 100644 --- a/theme/main.html +++ b/theme/main.html @@ -6,5 +6,5 @@ color: var(--md-typeset-color); } - Join our Matrix Space + Join our Matrix Space or Discord Server {% endblock %} From 5213c9504d0a4dbe2781be7eba69b0b2117691e7 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Thu, 22 Jan 2026 19:08:12 +0530 Subject: [PATCH 5/5] Index: Shorten the line having invite links --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 46c8cb72..b94ed328 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ To get started with an installation, refer to the [roadmap](https://wiki.t2linux # Contact us -You may contact us on the [Linux on T2 Macs (2018+) Matrix Space](https://matrix.to/#/#space:t2linux.org) or [Linux on T2 Macs (2018+) Discord Server](https://discord.com/invite/68MRhQu), where you can find most of the people involved. +You may contact us on our [Matrix Space](https://matrix.to/#/#space:t2linux.org) or [Discord Server](https://discord.com/invite/68MRhQu), where you can find most of the people involved. !!! Warning "Discord Server is age-restricted" For unknown reason, our Discord server is age-restricted. Please use Matrix instead if you can't go though age verification.