Merge branch 'master' of github:/tiyn/wiki

wiki/linux/arch-linux/installation.md

@@ -84,7 +84,7 @@ The right partition has the label `Linux filesystem`.
 For this guide this partition is assumed to be `/dev/sda2`.
 
 ```sh
-cryptsetup -c aes-xts-plain -y -s 512 luksFormat /dev/sda2
+cryptsetup -c aes-xts-plain -s 512 -y -v luksFormat /dev/sda2
 ```
 Afterwards confirm with `YES`.
 Now you can assign a passphrase.

wiki/linux/dm-crypt.md

@@ -7,7 +7,7 @@ DM-Crypt can create and manage encrypted devices.
 ### Creating an Encrypted Devices
 
 To create a encrypted device simply run:
-`cryptsetup -y -v luksFormat /dev/sda2`.
+`cryptsetup -c aes-xts-plain -s 512 -y -v luksFormat /dev/sda2`.
 Where `/dev/sda2` is the device to be created.
 
 ### Create/Add a Key File to an encrypted volume

wiki/linux/x_window_system.md

@@ -10,6 +10,30 @@ It is maintained by the [X.Org Foundation](https://x.org/wiki/).
 
 This section addresses various usages of the X Window System.
 
+### Screen Locker
+
+The X Window System allows various screen lockers to be used.
+One of them is `slock` by [suckless](/wiki/linux/suckless.md).
+This will stand in as a screen locker for this section.
+The screen can be run by simply running the following command.
+
+```sh 
+slock
+```
+
+By default this will not be run automatically when the computer goes into sleep.
+This can be changed by installing and using `xss-lock` like the following example shows.
+
+```sh 
+xss-lock -- slock &
+```
+
+Run this command at startup if the automatic locking is wanted.
+
+In this context it can be useful to enable the screensaver or set the computer to automatically go
+to sleep after a certain amount of time.
+For this navigate to the [corresponding section](#turning-off-the-screen).
+
 ### Kill Windows
 
 Windows can be killed with the utility `xkill`.
@@ -86,6 +110,18 @@ Section "ServerFlags"
 EndSection
 ```
 
+Another option to do this is by using the command `xset`.
+An example for this are the follwing commands which will enable the screensaver to act upon 10
+minutes of inactivity.
+
+```sh 
+xset s on 
+xset s 600
+```
+
+For more informations on this visit the
+[Arch wiki](https://wiki.archlinux.org/title/Session_lock#DPMS).
+
 ##### Adjust DPI and UI Scale
 
 The dots per inch (DPI) is a measurement of spatial video dot density.