diff --git a/_includes/nav.html b/_includes/nav.html
index a649fe92..5db86462 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -87,7 +87,7 @@
PC OS
- PC Live OS
+ Tor focused distributions Mobile OS Android Privacy Add-ons Router Firmware
diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/android-operating-systems.html
similarity index 57%
rename from _includes/sections/mobile-operating-systems.html
rename to _includes/sections/android-operating-systems.html
index 1b1de836..6825a1bf 100644
--- a/_includes/sections/mobile-operating-systems.html
+++ b/_includes/sections/android-operating-systems.html
@@ -1,16 +1,26 @@
Mobile Operating Systems
+
Android-based Operating Systems
+
Even though the source code of the following operating systems is provided, installing Google Apps may compromise your setup.
+{% include cardv2.html
+ title="CalyxOS"
+ image="/assets/img/svg/3rd-party/calyxos.svg"
+ description='CalyxOS is a custom ROM based on the Android Open Source Project with Pixel phones. It aims to be secure and private by default including a number of good choices for default applications. It also supports verified boot.'
+ badges="info:AOSP"
+ website="https://calyxos.org"
+ gitlab="https://gitlab.com/calyxos"
+%}
+
{% include cardv2.html
title="GrapheneOS"
image="/assets/img/svg/3rd-party/grapheneos.svg"
image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg"
description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
badges="info:AOSP"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
website="https://grapheneos.org/"
github="https://github.com/GrapheneOS/"
%}
@@ -20,49 +30,14 @@
image="/assets/img/svg/3rd-party/lineageos.svg"
description='LineageOS is a custom ROM based on the Android Open Source Project with official support for a wide variety of devices. The project is the successor to the popular CyanogenMod project, focusing on system control and customization, device longevity, and privacy. For security reasons, we do not recommend third-party builds of LineageOS for unsupported devices.'
badges="info:AOSP"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
website="https://www.lineageos.org/"
privacy-policy="https://www.lineageos.org/legal/"
github="https://github.com/LineageOS"
%}
-{% include cardv2.html
- title="Ubuntu Touch"
- image="/assets/img/svg/3rd-party/ubuntu.svg"
- description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported."
- badges="info:GNU/Linux"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
- website="https://ubuntu-touch.io/"
- privacy-policy="https://ubports.com/privacy"
- github="https://github.com/ubports"
-%}
-
Worth Mentioning
-
Replicant
- {% include badge.html
- color="info"
- text="AOSP"
- %}
- - An open-source operating system based on Android, aiming to replace all proprietary components with free software.
-
-
-
- OmniROM
- {% include badge.html
- color="info"
- text="AOSP"
- %}
- {% include badge.html
- color="warning"
- icon="far fa-question-circle"
- text="contrib"
- tooltip="This software may depend on or recommend non-free software."
- %}
- - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.
-
-
MicroG
{% include badge.html
@@ -72,8 +47,6 @@
{% include badge.html
color="warning"
icon="far fa-question-circle"
- text="contrib"
- tooltip="This software may depend on or recommend non-free software."
%}
- A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at Lineage for microG.
-
-{% include cardv2.html
- title="Tails"
- image="/assets/img/svg/3rd-party/tails.svg"
- description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
- badges="info:GNU/Linux"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
- website="https://tails.boum.org/"
- git="https://git-tails.immerda.ch/tails/"
-%}
-
-
Worth Mentioning
-
-
-
- Fedora Workstation
- {% include badge.html
- color="info"
- text="GNU/Linux"
- %}
- - Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.
-
-
-
- Debian
- {% include badge.html
- color="info"
- text="GNU/Linux"
- %}
- - Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.
-
-
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html
index 2fe24f81..0882ebee 100644
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@@ -4,83 +4,83 @@
If you are currently using an operating system like Windows 10, you should pick an alternative here.
-{% include cardv2.html
- title="Qubes OS"
- image="/assets/img/svg/3rd-party/qubes_os.svg"
- description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
- badges="info:Xen"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
- website="https://www.qubes-os.org/"
- privacy-policy="https://www.qubes-os.org/privacy/"
- github="https://github.com/QubesOS"
- tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
-%}
-
{% include cardv2.html
title="Fedora Workstation"
image="/assets/img/svg/3rd-party/fedora.svg"
description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.'
- badges="info:GNU/Linux"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+ badges="info:Linux"
website="https://getfedora.org/"
privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy"
git="https://src.fedoraproject.org/"
%}
+{% include cardv2.html
+ title="Ubuntu"
+ image="/assets/img/svg/3rd-party/ubuntu.svg"
+ description='Ubuntu is a Linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers, and IoT devices.'
+ badges="info:Linux"
+ website="https://ubuntu.com"
+ privacy-policy="https://ubuntu.com/legal/data-privacy"
+ git="https://launchpad.net/ubuntu"
+%}
+
+
Advanced Operating Systems
+
+
+ These options have advanced features and are unique in some way. These options will likely require the user to read technical background documentation.
+
+
+{% include cardv2.html
+ title="Alpine Linux"
+ image="/assets/img/svg/3rd-party/alpinelinux.svg"
+ description='Alpine Linux is a very minimal distribution designed to be secure and very resource efficient. Alpine Linux can run from RAM, and merge configuration files into the system on boot using Alpine local backup. Alpine Linux is often used on servers and in Linux containers.'
+ badges="info:Linux"
+ website="https://alpinelinux.org/"
+ privacy-policy="https://alpinelinux.org/privacy-policy.html"
+ gitlab="https://gitlab.alpinelinux.org"
+%}
+
+{% include cardv2.html
+ title="Arch Linux"
+ image="/assets/img/svg/3rd-party/archlinux.svg"
+ description='A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement.'
+ badges="info:Linux"
+ labels="color==success::link==https://tests.reproducible-builds.org/archlinux/archlinux.html::text==Reproducable builds"
+ website="https://www.archlinux.org/"
+ privacy-policy="https://wiki.archlinux.org/index.php/ArchWiki:Privacy_policy"
+ gitlab="https://gitlab.archlinux.org"
+%}
+
{% include cardv2.html
title="Debian"
image="/assets/img/svg/3rd-party/debian.svg"
description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
- badges="info:GNU/Linux"
+ badges="info:Linux"
+ labels="color==success::link==https://reproducible.debian.net::text==Reproducable builds"
website="https://www.debian.org/"
privacy-policy="https://www.debian.org/legal/privacy"
tor="http://sejnfjrq6szgca7v.onion"
gitlab="https://salsa.debian.org/qa/debsources"
%}
-
Worth Mentioning
+{% include cardv2.html
+ title="NixOS"
+ image="/assets/img/svg/3rd-party/nixos.svg"
+ description='NixOS is a Linux distribution with a unique approach to package and configuration management. Built on top of the Nix package manager, it is completely declarative, makes upgrading systems reliable, and has many other advantages.'
+ badges="info:Linux"
+ labels="color==success::link==https://r13y.com::text==Reproducable builds"
+ website="https://nixos.org"
+ privacy-policy="https://nixos.wiki/wiki/NixOS_Wiki:Privacy_policy"
+ github="https://github.com/NixOS"
+%}
-
-
OpenBSD
- {% include badge.html
- color="info"
- text="BSD"
- %}
- - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
-
-
-
- Arch Linux
- {% include badge.html
- color="info"
- text="GNU/Linux"
- %}
- {% include badge.html
- color="warning"
- icon="far fa-question-circle"
- text="contrib"
- tooltip="This software may depend on or recommend non-free software."
- %}
- - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a
- completely open source version of Arch Linux.
-
-
-
- Trisquel
- {% include badge.html
- color="info"
- text="GNU/Linux"
- %}
- - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.
-
-
-
- Whonix
- {% include badge.html
- color="info"
- text="GNU/Linux"
- %}
- - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
- and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
-
-
+{% include cardv2.html
+ title="Qubes OS"
+ image="/assets/img/svg/3rd-party/qubes_os.svg"
+ description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
+ badges="info:Xen"
+ website="https://www.qubes-os.org/"
+ privacy-policy="https://www.qubes-os.org/privacy/"
+ github="https://github.com/QubesOS"
+ tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
+%}
diff --git a/_includes/sections/other-mobile-operating-systems.html b/_includes/sections/other-mobile-operating-systems.html
new file mode 100644
index 00000000..f1cb488d
--- /dev/null
+++ b/_includes/sections/other-mobile-operating-systems.html
@@ -0,0 +1,11 @@
+
Other Mobile Operating Systems
+
+{% include cardv2.html
+ title="Ubuntu Touch"
+ image="/assets/img/svg/3rd-party/ubuntu.svg"
+ description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported."
+ badges="info:Linux"
+ website="https://ubuntu-touch.io/"
+ privacy-policy="https://ubports.com/privacy"
+ github="https://github.com/ubports"
+%}
diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html
index c2dbea93..b8a2c0f0 100644
--- a/_includes/sections/router-firmware.html
+++ b/_includes/sections/router-firmware.html
@@ -6,7 +6,6 @@
image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg"
description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
badges="info:Linux"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
website="https://openwrt.org/"
git="https://git.openwrt.org/"
%}
@@ -17,46 +16,7 @@
image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg"
description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
badges="info:BSD"
- labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
website="https://www.pfsense.org/"
privacy-policy="https://www.pfsense.org/privacy.html"
github="https://github.com/pfsense/"
%}
-
-{% include cardv2.html
- title="LibreCMC"
- image="/assets/img/svg/3rd-party/librecmc.svg"
- image-dark="/assets/img/svg/3rd-party/librecmc-dark.svg"
- description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
- badges="info:GNU/Linux"
- website="https://librecmc.org"
- git="https://gogs.librecmc.org/libreCMC/libreCMC"
-%}
-
-
Worth Mentioning
-
-
-
- OpenBSD
- {% include badge.html
- color="info"
- text="BSD"
- %}
- - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
-
-
-
- DD-WRT
- {% include badge.html
- color="info"
- text="GNU/Linux"
- %}
- {% include badge.html
- color="warning"
- icon="far fa-question-circle"
- text="contrib"
- tooltip="This software may depend on or recommend non-free software."
- %}
- - A Linux-based open-source firmware compatible with several models of routers and access points.
-
-
diff --git a/_includes/sections/tor-operating-systems.html b/_includes/sections/tor-operating-systems.html
new file mode 100644
index 00000000..e5e09d9d
--- /dev/null
+++ b/_includes/sections/tor-operating-systems.html
@@ -0,0 +1,23 @@
+
Tor-Focused Distributions
+
+
+ These Linux distributions are developed with the purpose of directing all network traffic through Tor.
+
+
+{% include cardv2.html
+ title="Tails"
+ image="/assets/img/svg/3rd-party/tails.svg"
+ description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
+ badges="info:Linux"
+ website="https://tails.boum.org/"
+ git="https://git-tails.immerda.ch/tails/"
+ %}
+
+{% include cardv2.html
+ title="Whonix"
+ image="/assets/img/svg/3rd-party/whonix.svg"
+ description='A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" and a Tor "Gateway". All communication are forced through the Tor network to accomplish this. Whonix is best used in conjunction with Qubes.'
+ badges="info:Linux"
+ website="https://www.whonix.org/"
+ github="https://github.com/Whonix"
+%}
diff --git a/assets/img/svg/3rd-party/alpinelinux.svg b/assets/img/svg/3rd-party/alpinelinux.svg
new file mode 100644
index 00000000..e2aef2d3
--- /dev/null
+++ b/assets/img/svg/3rd-party/alpinelinux.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/assets/img/svg/3rd-party/archlinux.svg b/assets/img/svg/3rd-party/archlinux.svg
new file mode 100644
index 00000000..4b46a612
--- /dev/null
+++ b/assets/img/svg/3rd-party/archlinux.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/assets/img/svg/3rd-party/calyxos.svg b/assets/img/svg/3rd-party/calyxos.svg
new file mode 100644
index 00000000..21743c85
--- /dev/null
+++ b/assets/img/svg/3rd-party/calyxos.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/assets/img/svg/3rd-party/nixos.svg b/assets/img/svg/3rd-party/nixos.svg
new file mode 100644
index 00000000..dacba154
--- /dev/null
+++ b/assets/img/svg/3rd-party/nixos.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/assets/img/svg/3rd-party/whonix.svg b/assets/img/svg/3rd-party/whonix.svg
new file mode 100644
index 00000000..212ea7db
--- /dev/null
+++ b/assets/img/svg/3rd-party/whonix.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/pages/old.html b/pages/old.html
index c7149c09..8e7e86e3 100644
--- a/pages/old.html
+++ b/pages/old.html
@@ -73,12 +73,14 @@ permalink: /classic/
{% include sections/operating-systems.html %}
-{% include sections/live-operating-systems.html %}
+{% include sections/tor-operating-systems.html %}
-{% include sections/mobile-operating-systems.html %}
+{% include sections/android-operating-systems.html %}
{% include sections/android-addons.html %}
+{% include sections/other-mobile-operating-systems.html %}
+
{% include sections/router-firmware.html %}
{% include sections/windows10.html %}
diff --git a/pages/os.html b/pages/os.html
index 08d138da..536f2cf3 100644
--- a/pages/os.html
+++ b/pages/os.html
@@ -13,41 +13,14 @@ description: "Even your own computer could be compromising your privacy. Discove
When running a recent enough Linux kernel, you can check the CPU vulnerabilities it detects by tail -n +1 /sys/devices/system/cpu/vulnerabilities/*. By using tail -n +1 instead of cat, the file names are also visible.
-
-
- In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the tail command. To mitigate this, disable hyper-threading from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports /etc/default/grub.d/:
-
-
-
-
sudo mkdir /etc/default/grub.d/ to create a directory for additional grub configuration
-
echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT l1tf=full,force mds=full,nosmt mitigations=auto,nosmt nosmt=force" | sudo tee /etc/default/grub.d/mitigations.cfg to create a new grub config file source with the echoed content
-
sudo grub-mkconfig -o /boot/grub/grub.cfg to generate a new grub config file including these new kernel boot flags
-
sudo reboot to reboot
-
after the reboot, check tail -n +1 /sys/devices/system/cpu/vulnerabilities/* again to see that everything referring to SMT now says "SMT disabled."
How to install/update CPU microcode firmware on Linux - Regardless of your CPU manufacturer, you should always install the latest microcode packages available to be protected from CPU vulnerabilities, especially if the command above reports no microcode in its output.
-
-{% include sections/live-operating-systems.html %}
-
-{% include sections/mobile-operating-systems.html %}
+{% include sections/android-operating-systems.html %}
{% include sections/android-addons.html %}
+{% include sections/other-mobile-operating-systems.html %}
+
{% include sections/router-firmware.html %}
{% include sections/windows10.html %}