diff --git a/doc.zih.tu-dresden.de/docs/software/misc/zsh_autocd.png b/doc.zih.tu-dresden.de/docs/software/misc/zsh_autocd.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d30a13f2dcc3af6e706fe8849aff6ee0739a76c
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/software/misc/zsh_autocd.png differ
diff --git a/doc.zih.tu-dresden.de/docs/software/misc/zsh_autocomplete_parameters.png b/doc.zih.tu-dresden.de/docs/software/misc/zsh_autocomplete_parameters.png
new file mode 100644
index 0000000000000000000000000000000000000000..374e34a84ee88d6c0c9d47c47af609d01fc2c63c
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/software/misc/zsh_autocomplete_parameters.png differ
diff --git a/doc.zih.tu-dresden.de/docs/software/misc/zsh_autosuggestion.png b/doc.zih.tu-dresden.de/docs/software/misc/zsh_autosuggestion.png
new file mode 100644
index 0000000000000000000000000000000000000000..872ed226a3f66e78063ad610e5edd8c0463a2922
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/software/misc/zsh_autosuggestion.png differ
diff --git a/doc.zih.tu-dresden.de/docs/software/misc/zsh_syntax_highlighting.png b/doc.zih.tu-dresden.de/docs/software/misc/zsh_syntax_highlighting.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e1e888c2bab317d1309289c07582dc08cdd1858
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/software/misc/zsh_syntax_highlighting.png differ
diff --git a/doc.zih.tu-dresden.de/docs/software/misc/zsh_typo.png b/doc.zih.tu-dresden.de/docs/software/misc/zsh_typo.png
new file mode 100644
index 0000000000000000000000000000000000000000..de04ba3d061cfb3c402e8b6d02bd7f60698e69c8
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/software/misc/zsh_typo.png differ
diff --git a/doc.zih.tu-dresden.de/docs/software/zsh.md b/doc.zih.tu-dresden.de/docs/software/zsh.md
new file mode 100644
index 0000000000000000000000000000000000000000..147758a6a66dd84aeb040c80d0000110f4af882c
--- /dev/null
+++ b/doc.zih.tu-dresden.de/docs/software/zsh.md
@@ -0,0 +1,238 @@
+# ZSH
+
+!!! warning
+ Though all efforts have been made to ensure the accuracy and
+ currency of the content on this website, please be advised that
+ some content might be out of date and there is no continuous
+ website support available. In case of any ambiguity or doubts,
+ users are advised to do their own research on the content's
+ accuracy and currency.
+
+The [ZSH](https://www.zsh.org), short for `z-shell`, is an alternative shell for Linux that offers
+many convenience features for productive use that `bash`, the default shell, does not offer.
+
+This should be a short introduction to `zsh` and offer some examples that are especially useful
+on ZIH systems.
+
+## `oh-my-zsh`
+
+`oh-my-zsh` is a plugin that adds many features to the `zsh` with a very simple install. Simply run:
+
+```
+marie@login$ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+```
+
+and then, if it is not already your login shell, run `zsh` or re-login.
+
+The rest of this document assumes that you have `oh-my-zsh` installed and running.
+
+## Features
+
+### Themes
+
+There are many different themes for the `zsh`. See the
+[GitHub-page of `oh-my-zsh`](https://github.com/ohmyzsh/ohmyzsh) for more details.
+
+### Auto-completion
+
+`zsh` offers more auto-completion features than `bash`. You can auto-complete programs, filenames, parameters,
+`man`-pages and a lot more, and you can cycle through the suggestions with `TAB`-button.
+
+
+
+### Syntax-highlighting
+
+When you add this line to your `~/.zshrc` with `oh-my-zsh` installed, you get syntax-highlighting directly
+in the shell:
+
+```bash
+plugins+=(
+ zsh-syntax-highlighting
+)
+```
+
+
+
+### Typo-correction
+
+With
+
+```bash
+setopt correct_all
+ENABLE_CORRECTION="true"
+```
+
+in `~/.zshrc` you get correction suggestions when the shell thinks
+that it might be what you want, e.g. when a command
+is expected to be handed an existing file.
+
+
+
+### Automatic `cd`
+
+Adding `AUTO_CD` to `~/.zshrc` file allows to leave out the `cd` when a folder name is provided.
+
+```bash
+setopt AUTO_CD
+```
+
+
+
+### `fish`-like auto-suggestions
+
+Install [`zsh-autosuggestions`](https://github.com/zsh-users/zsh-autosuggestions) to get `fish`-shell-like
+auto-suggestions of previous commands that start with the same letters and that you can complete with
+the right arrow key.
+
+
+
+??? example "Addons for your shell"
+ === "`bash`"
+ ```bash
+ # Create a new directory and directly `cd` into it
+ mcd () {
+ mkdir -p $1
+ cd $1
+ }
+
+ # Find the largest files in the current directory easily
+ function treesizethis {
+ du -k --max-depth=1 | sort -nr | awk '
+ BEGIN {
+ split("KB,MB,GB,TB", Units, ",");
+ }
+ {
+ u = 1;
+ while ($1 >= 1024) {
+ $1 = $1 / 1024;
+ u += 1
+ }
+ $1 = sprintf("%.1f %s", $1, Units[u]);
+ print $0;
+ }
+ '
+ }
+
+ #This allows you to run `slurmlogpath $SLURM_ID` and get the log-path directly in stdout:
+ function slurmlogpath {
+ scontrol show job $1 | sed -n -e 's/^\s*StdOut=//p'
+ }
+
+ # `ftails` follow-tails a slurm-log. Call it without parameters to tail the only running job or
+ # get a list of running jobs or use `ftails $JOBID` to tail a specific job
+ function ftails {
+ JOBID=$1
+ if [[ -z $JOBID ]]; then
+ JOBS=$(squeue --format="%i \\'%j\\' " --me | grep -v JOBID)
+ NUMBER_OF_JOBS=$(echo "$JOBS" | wc -l)
+ JOBID=
+ if [[ "$NUMBER_OF_JOBS" -eq 1 ]]; then
+ JOBID=$(echo $JOBS | sed -e "s/'//g" | sed -e 's/ .*//')
+ else
+ JOBS=$(echo $JOBS | tr -d '\n')
+ JOBID=$(eval "whiptail --title 'Choose jobs to tail' --menu 'Choose Job to tail' 25 78 16 $JOBS" 3>&1 1>&2 2>&3)
+ fi
+ fi
+ SLURMLOGPATH=$(slurmlogpath $JOBID)
+ if [[ -e $SLURMLOGPATH ]]; then
+ tail -n100 -f $SLURMLOGPATH
+ else
+ echo "No slurm-log-file found"
+ fi
+ }
+
+ #With this, you only need to type `sq` instead of `squeue -u $USER`.
+ alias sq="squeue --me"
+ ```
+ === "`zsh`"
+ ```bash
+ # Create a new directory and directly `cd` into it
+ mcd () {
+ mkdir -p $1
+ cd $1
+ }
+
+ # Find the largest files in the current directory easily
+ function treesizethis {
+ du -k --max-depth=1 | sort -nr | awk '
+ BEGIN {
+ split("KB,MB,GB,TB", Units, ",");
+ }
+ {
+ u = 1;
+ while ($1 >= 1024) {
+ $1 = $1 / 1024;
+ u += 1
+ }
+ $1 = sprintf("%.1f %s", $1, Units[u]);
+ print $0;
+ }
+ '
+ }
+
+ #This allows you to run `slurmlogpath $SLURM_ID` and get the log-path directly in stdout:
+ function slurmlogpath {
+ scontrol show job $1 | sed -n -e 's/^\s*StdOut=//p'
+ }
+
+ # `ftails` follow-tails a slurm-log. Call it without parameters to tail the only running job or
+ # get a list of running jobs or use `ftails $JOBID` to tail a specific job
+ function ftails {
+ JOBID=$1
+ if [[ -z $JOBID ]]; then
+ JOBS=$(squeue --format="%i \\'%j\\' " --me | grep -v JOBID)
+ NUMBER_OF_JOBS=$(echo "$JOBS" | wc -l)
+ JOBID=
+ if [[ "$NUMBER_OF_JOBS" -eq 1 ]]; then
+ JOBID=$(echo $JOBS | sed -e "s/'//g" | sed -e 's/ .*//')
+ else
+ JOBS=$(echo $JOBS | tr -d '\n')
+ JOBID=$(eval "whiptail --title 'Choose jobs to tail' --menu 'Choose Job to tail' 25 78 16 $JOBS" 3>&1 1>&2 2>&3)
+ fi
+ fi
+ SLURMLOGPATH=$(slurmlogpath $JOBID)
+ if [[ -e $SLURMLOGPATH ]]; then
+ tail -n100 -f $SLURMLOGPATH
+ else
+ echo "No slurm-log-file found"
+ fi
+ }
+
+ #With this, you only need to type `sq` instead of `squeue -u $USER`.
+ alias sq="squeue --me"
+
+ #This will automatically replace `...` with `../..` and `....` with `../../..`
+ # and so on (each additional `.` adding another `/..`) when typing commands:
+ rationalise-dot() {
+ if [[ $LBUFFER = *.. ]]; then
+ LBUFFER+=/..
+ else
+ LBUFFER+=.
+ fi
+ }
+ zle -N rationalise-dot
+ bindkey . rationalise-dot
+
+ # This allows auto-completion for `module load`:
+ function _module {
+ MODULE_COMMANDS=(
+ '-t:Show computer parsable output'
+ 'load:Load a module'
+ 'unload:Unload a module'
+ 'spider:Search for a module'
+ 'avail:Show available modules'
+ 'list:List loaded modules'
+ )
+
+ MODULE_COMMANDS_STR=$(printf "\n'%s'" "${MODULE_COMMANDS[@]}")
+
+ eval "_describe 'command' \"($MODULE_COMMANDS_STR)\""
+ _values -s ' ' 'flags' $(ml -t avail | sed -e 's#/$##' | tr '\n' ' ')
+ }
+
+ compdef _module "module"
+ ```
+
+## Setting `zsh` as default-shell
+
+Please ask HPC support if you want to set the `zsh` as your default login shell.
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index eb7407f52d1a6a69dcc2fe5585569e5e7086d9df..51885fab70587470746e280a3874831521e96459 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -27,6 +27,7 @@ nav:
- Private Modulefiles: software/private_modules.md
- Custom EasyBuild Modules: software/custom_easy_build_environment.md
- Python Virtual Environments: software/python_virtual_environments.md
+ - ZSH: software/zsh.md
- Containers:
- Singularity: software/containers.md
- Singularity Recipes and Hints: software/singularity_recipe_hints.md
diff --git a/doc.zih.tu-dresden.de/wordlist.aspell b/doc.zih.tu-dresden.de/wordlist.aspell
index 8bcd6a7c24872843e665bc7fc1ed91241284c780..ef6dc3d94888a5c6fe6ef99394d3e03d63e85df6 100644
--- a/doc.zih.tu-dresden.de/wordlist.aspell
+++ b/doc.zih.tu-dresden.de/wordlist.aspell
@@ -1,5 +1,7 @@
personal_ws-1.1 en 203
Abaqus
+Addon
+Addons
ALLREDUCE
Altix
Amber
@@ -160,8 +162,8 @@ LAPACK
lapply
Leichtbau
LINPACK
-Linter
linter
+Linter
lmod
LoadLeveler
localhost
@@ -230,14 +232,14 @@ OpenBLAS
OpenCL
OpenGL
OpenMP
-OpenMPI
openmpi
+OpenMPI
OpenSSH
Opteron
OTF
overfitting
-Pandarallel
pandarallel
+Pandarallel
PAPI
parallelization
parallelize
@@ -256,8 +258,8 @@ PMI
png
PowerAI
ppc
-Pre
pre
+Pre
Preload
preloaded
preloading
@@ -292,8 +294,8 @@ RSS
RStudio
Rsync
runnable
-Runtime
runtime
+Runtime
sacct
salloc
Sandybridge
@@ -342,8 +344,8 @@ TensorFlow
TFLOPS
Theano
tmp
-ToDo
todo
+ToDo
toolchain
toolchains
torchvision
@@ -382,6 +384,7 @@ XLC
XLF
Xming
yaml
-ZIH
zih
+ZIH
ZIH's
+ZSH