diff --git a/docs/cpp/vcpkgwindows.md b/docs/cpp/vcpkgwindows.md index cc7d8f1..472d7bd 100644 --- a/docs/cpp/vcpkgwindows.md +++ b/docs/cpp/vcpkgwindows.md @@ -3,7 +3,7 @@ !!! warning - We recommend you use [Chocolatey to install packages](../computer/packagemanager.md), or [WSL](../computer/wsl.md). + We recommend you use [Chocolatey to install packages](../computer/packagemanager.md), or [WSL](../linux/wsl.md). vcpkg is an alternative, but it is more complex and difficult to setup. diff --git a/docs/linux/files/Linux_Introduction.pdf b/docs/linux/files/Linux_Introduction.pdf new file mode 100644 index 0000000..fefd2e0 Binary files /dev/null and b/docs/linux/files/Linux_Introduction.pdf differ diff --git a/docs/linux/files/VirtualBox_Kubuntu_Installation_Guide.pdf b/docs/linux/files/VirtualBox_Kubuntu_Installation_Guide.pdf new file mode 100644 index 0000000..707b0c5 Binary files /dev/null and b/docs/linux/files/VirtualBox_Kubuntu_Installation_Guide.pdf differ diff --git a/docs/misc/img/WinSCP0.jpeg b/docs/linux/img/WinSCP0.jpeg similarity index 100% rename from docs/misc/img/WinSCP0.jpeg rename to docs/linux/img/WinSCP0.jpeg diff --git a/docs/misc/img/WinSCP1.jpeg b/docs/linux/img/WinSCP1.jpeg similarity index 100% rename from docs/misc/img/WinSCP1.jpeg rename to docs/linux/img/WinSCP1.jpeg diff --git a/docs/computer/img/cmd-2.jpg b/docs/linux/img/cmd-2.jpg similarity index 100% rename from docs/computer/img/cmd-2.jpg rename to docs/linux/img/cmd-2.jpg diff --git a/docs/computer/img/copy_ubuntu.jpg b/docs/linux/img/copy_ubuntu.jpg similarity index 100% rename from docs/computer/img/copy_ubuntu.jpg rename to docs/linux/img/copy_ubuntu.jpg diff --git a/docs/computer/img/setup-3.jpg b/docs/linux/img/setup-3.jpg similarity index 100% rename from docs/computer/img/setup-3.jpg rename to docs/linux/img/setup-3.jpg diff --git a/docs/linux/index.md b/docs/linux/index.md new file mode 100644 index 0000000..639e67c --- /dev/null +++ b/docs/linux/index.md @@ -0,0 +1,13 @@ + +# Linux + +For a few courses you'll have to use the operating system Linux :simple-linux: + +You can install Linux on your Windows computers with basically 2 different ways: + +1. with [WSL](./wsl.md) (Windows Subsystem for Linux) +2. by running it [virtually with VirtualBox](./virtualbox.md) + +And you'll have to access some Linux servers [using ssh](./ssh.md). + +One big difference is the [filesystem](../computer/filesystem.md), make sure you familiarise yourself with it. \ No newline at end of file diff --git a/docs/linux/intro.md b/docs/linux/intro.md new file mode 100644 index 0000000..46f88ce --- /dev/null +++ b/docs/linux/intro.md @@ -0,0 +1,4 @@ + +# Introduction to Linux + +[See slides for introduction to Linux](./files/Linux_Introduction.pdf) \ No newline at end of file diff --git a/docs/misc/ssh.md b/docs/linux/ssh.md similarity index 95% rename from docs/misc/ssh.md rename to docs/linux/ssh.md index 54e8dc1..3373d51 100644 --- a/docs/misc/ssh.md +++ b/docs/linux/ssh.md @@ -65,7 +65,7 @@ Under Windows it should be possible to do the same as macOS/Linux with [puttyssh](https://putty.org/). - The best alternative is to use [WSL](../computer/wsl.md) and follow the same instructions as those for macOS/Linux. + The best alternative is to use [WSL](../linux/wsl.md) and follow the same instructions as those for macOS/Linux. To copy files using a graphic interface use WinSCP, and configure a session following the figures here: ![WinSCP0](./img/WinSCP0.jpeg) diff --git a/docs/linux/virtualbox.md b/docs/linux/virtualbox.md new file mode 100644 index 0000000..43aa472 --- /dev/null +++ b/docs/linux/virtualbox.md @@ -0,0 +1,4 @@ + +# Running Linux in a virtual environment + +[See slides to install Ubuntu in VirtualBox](./files/VirtualBox_Kubuntu_Installation_Guide.pdf) \ No newline at end of file diff --git a/docs/computer/wsl.md b/docs/linux/wsl.md similarity index 100% rename from docs/computer/wsl.md rename to docs/linux/wsl.md diff --git a/mkdocs.yml b/mkdocs.yml index 8599b35..da351e1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -54,7 +54,6 @@ nav: - computer/filesystem.md - computer/terminal.md - computer/packagemanager.md - - computer/wsl.md - computer/bestsoftware.md - Programming: - programming/chooselanguage.md @@ -75,6 +74,12 @@ nav: - cpp/xcode.md - cpp/wslclion.md - cpp/vcpkgwindows.md + - Linux: + - linux/index.md + - linux/intro.md + - linux/virtualbox.md + - linux/ssh.md + - linux/wsl.md - Git: - git/index.md - git/gitintro.md @@ -93,7 +98,6 @@ nav: - writing/references.md - writing/latextogether.md - Misc: - - misc/ssh.md - misc/delftblue.md