Skip to content

Commit 4b634e4

Browse files
leviportleviport
authored
Merge branch 'master' into update-ubuntu-24.04
2 parents 9266177 + d2b5127 commit 4b634e4

File tree

4 files changed

+44
-71
lines changed

4 files changed

+44
-71
lines changed

‎content/guides.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ To see ports, keyboard layouts, function keys, and product quickstart guides, fi
3131
| Adder WS [(addw1)](https://tech-docs.system76.com/models/addw1/README.html) | Meerkat [(meer5)](https://tech-docs.system76.com/models/meer5/README.html) | Launch [(launch_1)](https://tech-docs.system76.com/models/launch_1/README.html) |
3232
| Adder WS [(addw2)](https://tech-docs.system76.com/models/addw2/README.html) | Meerkat [(meer6)](https://tech-docs.system76.com/models/meer6/README.html) | Launch [(launch_2)](https://tech-docs.system76.com/models/launch_2/README.html) |
3333
| Adder WS [(addw3)](https://tech-docs.system76.com/models/addw3/README.html) | Meerkat [(meer7)](https://tech-docs.system76.com/models/meer7/README.html) | Launch Lite [(launch_lite_1)](https://tech-docs.system76.com/models/launch_lite_1/README.html) |
34-
| Bonobo WS [(bonw14)](https://tech-docs.system76.com/models/bonw14/README.html) | Thelio B4 [(thelio-b4)](https://tech-docs.system76.com/models/thelio-b4/README.html) | | Launch Heavy [(launch_heavy_1)](https://tech-docs.system76.com/models/launch_heavy_1/README.html) | Thelio Major [(thelio-major-r3)](https://tech-docs.system76.com/models/thelio-major-r3/README.html) |
35-
| Bonobo WS [(bonw15)](https://tech-docs.system76.com/models/bonw15/README.html) | Thelio Major [(thelio-major-b1-b2/r1-r2)](https://tech-docs.system76.com/models/thelio-major-b1-b2-r1-r2/README.html) |
36-
| Darter Pro [(darp6)](https://tech-docs.system76.com/models/darp6/README.html) | Thelio Massive B1 [(thelio-massive-b1)](https://tech-docs.system76.com/models/thelio-massive-b1.2/README.html) |
37-
| Darter Pro [(darp7)](https://tech-docs.system76.com/models/darp7/README.html) | Thelio Mega R1 [(thelio-mega-r1)](https://tech-docs.system76.com/models/thelio-mega-r1.0/README.html) |
38-
| Darter Pro [(darp8)](https://tech-docs.system76.com/models/darp8/README.html) | Thelio Mira R1 [(thelio-mira-r1)](https://tech-docs.system76.com/models/thelio-mira-r1.0/README.html) |
39-
| Darter Pro [(darp9)](https://tech-docs.system76.com/models/darp9/README.html) | Thelio Mira B1 [(thelio-mira-b1)](https://tech-docs.system76.com/models/thelio-mira-b1.0/README.html) |
40-
| Galago Pro [(galp4)](https://tech-docs.system76.com/models/galp4/README.html) | Thelio Mira R3 [(thelio-mira-r3)](https://tech-docs.system76.com/models/thelio-mira-r3/README.html) |
41-
| Galago Pro [(galp5)](https://tech-docs.system76.com/models/galp5/README.html) |
34+
| Bonobo WS [(bonw14)](https://tech-docs.system76.com/models/bonw14/README.html) | Meerkat [(meer8)](https://tech-docs.system76.com/models/meer8/README.html) | Launch Heavy [(launch_heavy_1)](https://tech-docs.system76.com/models/launch_heavy_1/README.html) | Thelio Major [(thelio-major-r3)](https://tech-docs.system76.com/models/thelio-major-r3/README.html) |
35+
| Bonobo WS [(bonw15)](https://tech-docs.system76.com/models/bonw15/README.html) | Thelio B4 [(thelio-b4)](https://tech-docs.system76.com/models/thelio-b4/README.html) |
36+
| Darter Pro [(darp6)](https://tech-docs.system76.com/models/darp6/README.html) | Thelio Major [(thelio-major-b1-b2/r1-r2)](https://tech-docs.system76.com/models/thelio-major-b1-b2-r1-r2/README.html) |
37+
| Darter Pro [(darp7)](https://tech-docs.system76.com/models/darp7/README.html) | Thelio Massive B1 [(thelio-massive-b1)](https://tech-docs.system76.com/models/thelio-massive-b1.2/README.html) |
38+
| Darter Pro [(darp8)](https://tech-docs.system76.com/models/darp8/README.html) | Thelio Mega R1 [(thelio-mega-r1)](https://tech-docs.system76.com/models/thelio-mega-r1.0/README.html) |
39+
| Darter Pro [(darp9)](https://tech-docs.system76.com/models/darp9/README.html) | Thelio Mira R1 [(thelio-mira-r1)](https://tech-docs.system76.com/models/thelio-mira-r1.0/README.html) |
40+
| Galago Pro [(galp4)](https://tech-docs.system76.com/models/galp4/README.html) | Thelio Mira B1 [(thelio-mira-b1)](https://tech-docs.system76.com/models/thelio-mira-b1.0/README.html) |
41+
| Galago Pro [(galp5)](https://tech-docs.system76.com/models/galp5/README.html) | Thelio Mira R3 [(thelio-mira-r3)](https://tech-docs.system76.com/models/thelio-mira-r3/README.html) |
4242
| Galago Pro [(galp6)](https://tech-docs.system76.com/models/galp6/README.html) |
4343
| Galago Pro [(galp7)](https://tech-docs.system76.com/models/galp7/README.html) |
4444
| Gazelle [(gaze15)](https://tech-docs.system76.com/models/gaze15/README.html) |

‎content/launch-keyboard.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,7 @@ We have documentation that goes over changing the keycaps, switches, and more on
7373

7474
- [Launch (launch_1)](https://tech-docs.system76.com/models/launch_1/repairs.html)
7575
- [Launch (launch_2)](https://tech-docs.system76.com/models/launch_2/repairs.html)
76+
- [Launch (launch_3)](https://tech-docs.system76.com/models/launch_3/repairs.html)
7677
- [Launch Lite (launch_lite_1)](https://tech-docs.system76.com/models/launch_lite_1/repairs.html)
7778
- [Launch Heavy (launch_heavy_1)](https://tech-docs.system76.com/models/launch_heavy_1/repairs.html)
79+
- [Launch Heavy (launch_heavy_3)](https://tech-docs.system76.com/models/launch_heavy_3/repairs.html)

‎content/windows.md

Lines changed: 27 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -45,72 +45,36 @@ Installing Windows is undertaken at your own risk. It's possible not all hardwar
4545
---
4646
| Laptop Model | Windows 10 Support | Windows 11 Support |
4747
| ------------ | ------------------ | ------------------ |
48-
| addw1 | Yes | Yes |
49-
| addw2 | Yes | No |
50-
| addw3 | Yes | Yes |
51-
| bonw14 | Yes | No |
52-
| bonw15 | Yes | Yes |
53-
| darp6 | Yes | No |
54-
| darp7 | Yes | No |
55-
| darp8 | Yes | No |
56-
| darp9 | Yes | Yes |
57-
| galp4 | Yes | No |
58-
| galp5 | Yes | No |
59-
| galp6 | Yes | No |
60-
| galp7 | Yes | Yes |
61-
| gaze15 | Yes | No |
62-
| gaze16 | Yes | No |
63-
| gaze17 | Yes | No |
64-
| gaze18 | Yes | Yes |
65-
| lemp9 | Yes | No |
66-
| lemp10 | Yes | No |
67-
| lemp11 | Yes | No |
68-
| lemp12 | Yes | Yes |
69-
| oryp6 | Yes | No |
70-
| oryp7 | Yes | No |
71-
| oryp8 | Yes | No |
72-
| oryp9 | Yes | No |
73-
| oryp10 | Yes | No |
74-
| oryp11 | Yes | Yes |
75-
| pang10 | Yes | Yes |
76-
| pang11 | Yes | Yes |
77-
| pang12 | Yes | Yes |
78-
| pang13 | Yes | Yes |
79-
| pang14 | Yes | Yes |
80-
| serw12 | Yes | Yes |
81-
| serw13 | Yes | Yes |
48+
| Adder WS (addw1) | Yes | Yes |
49+
| Adder WS (addw2) | Yes | No |
50+
| Adder WS (addw3) | Yes | Yes |
51+
| Bonobo WS (bonw14) | Yes | No |
52+
| Bonobo WS (bonw15) | Yes | Yes |
53+
| Darter Pro (darp8 and older) | Yes | No |
54+
| Darter Pro (darp9 and newer) | Yes | Yes |
55+
| Galago Pro (galp6 and older) | Yes | No |
56+
| Galago Pro (galp7 and newer) | Yes | Yes |
57+
| Gazelle (gaze17 and older) | Yes | No |
58+
| Gazelle (gaze18 and newer) | Yes | Yes |
59+
| Lemur Pro (lemp11 and older) | Yes | No |
60+
| Lemur Pro (lemp12 and newer) | Yes | Yes |
61+
| Oryx Pro (oryp10 and older) | Yes | No |
62+
| Oryx Pro (oryp11 and newer) | Yes | Yes |
63+
| Pangolin (pang10 and newer) | Yes | Yes |
64+
| Serval WS (serw12 and newer) | Yes | Yes |
8265

8366
| Desktop Model | Windows 10 Support | Windows 11 Support |
8467
| ----------------- | ------------------ | ------------------ |
85-
| meer5 | Yes | Yes |
86-
| meer6 | Yes | Yes |
87-
| meer7 | Yes | Yes |
88-
| thelio-r1 | Yes | Yes |
89-
| thelio-r2 | Yes | Yes |
90-
| thelio-r3 | Yes | Yes |
91-
| thelio-b1 | Yes | Yes |
92-
| thelio-b2 | Yes | Yes |
93-
| thelio-b3 | Yes | Yes |
94-
| thelio-b4 | Yes | Yes |
95-
| thelio-b5 | Yes | Yes |
96-
| thelio-mira-r1 | Yes | Yes* |
97-
| thelio-mira-r2 | Yes | Yes* |
98-
| thelio-mira-r3 | Yes | Yes* |
99-
| thelio-mira-b1 | Yes | Yes* |
100-
| thelio-mira-b2 | Yes | Yes* |
101-
| thelio-mira-b3 | Yes | Yes* |
102-
| thelio-mira-b4 | Yes | Yes* |
103-
| thelio-major-r1 | Yes | Yes* |
104-
| thelio-major-r2 | Yes | Yes* |
105-
| thelio-major-r3 | Yes | Yes* |
106-
| thelio-major-r4 | Yes | Yes* |
107-
| thelio-major-b1 | Yes | Yes* |
108-
| thelio-major-b2 | Yes | Yes* |
109-
| thelio-major-b3 | Yes | Yes* |
110-
| thelio-major-b4 | Yes | Yes* |
111-
| thelio-mega-r1 | Yes | Yes* |
112-
| thelio-mega-r2 | Yes | Yes* |
113-
| thelio-massive-b1 | Yes | Yes* |
68+
| Meerkat (meer5 and newer) | Yes | Yes |
69+
| Thelio (thelio-r1 and newer) | Yes | Yes |
70+
| Thelio (thelio-b1 and newer) | Yes | Yes |
71+
| Thelio Mira (thelio-mira-r1 and newer) | Yes | Yes* |
72+
| Thelio Mira (thelio-mira-b1 and newer) | Yes | Yes* |
73+
| Thelio Major (thelio-major-r1 and newer) | Yes | Yes* |
74+
| Thelio Major (thelio-major-b1 and newer) | Yes | Yes* |
75+
| Thelio Mega (thelio-mega-r1 and newer) | Yes | Yes* |
76+
| Thelio Massive (thelio-massive-b1 and newer) | Yes | Yes* |
77+
| Thelio Spark (thelio-spark-b1-n2 and newer) | Yes | Yes* |
11478

11579
\* For desktop computers you will want to confirm you have an 8th Gen Intel Core Processor or 2000 Ryzen AMD Processor, and that you have TPM enabled in the UEFI settings.
11680

‎shell.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{ pkgs ? import <nixpkgs> {} }:
2+
pkgs.mkShell {
3+
nativeBuildInputs = with pkgs; [
4+
nodejs-18_x
5+
nodePackages.npm
6+
];
7+
}

0 commit comments

Comments
 (0)