From 78d1d415ec8e5396834dfce0f5a123be6bea7d59 Mon Sep 17 00:00:00 2001 From: marten <43725244+tiyn@users.noreply.github.com> Date: Thu, 4 Aug 2022 20:03:22 +0200 Subject: [PATCH 1/5] package-manager: new error added is marginal trust --- wiki/linux/arch-linux/package-manager.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/wiki/linux/arch-linux/package-manager.md b/wiki/linux/arch-linux/package-manager.md index ddfbab1..031a9ad 100644 --- a/wiki/linux/arch-linux/package-manager.md +++ b/wiki/linux/arch-linux/package-manager.md @@ -33,3 +33,18 @@ gpg --lsign Where is the placeholder of the identification string of the key. It usually gets gets printed in the line above the error looking like `FAILED (unknown public key )`. + +### Error while updating `is marginal trust` + +Both `yay` and `pacman` use gpg keys to confirm the package manager gets the +right package. +It is possible that it runs into errors when importing new keys. +If the error `[...] Key [...] is marginal trust` occurs while updating the +system, it can be fixed by running the following commands and then restarting +the update process of the package manager. + +```sh +pacman -Sy archlinux-keyring +pacman-key --populate archlinux +pacman-key --refresh-keys +``` From 030d53200b6b09da444484ee367d88fdb1d0ecb6 Mon Sep 17 00:00:00 2001 From: marten <43725244+tiyn@users.noreply.github.com> Date: Fri, 5 Aug 2022 03:19:32 +0200 Subject: [PATCH 2/5] Update dm-crypt.md --- wiki/linux/dm-crypt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/linux/dm-crypt.md b/wiki/linux/dm-crypt.md index bc9858d..fa9e665 100644 --- a/wiki/linux/dm-crypt.md +++ b/wiki/linux/dm-crypt.md @@ -30,7 +30,7 @@ or the partition is to small for your purposes, make sure to resize the partition first accordingly (see [disk management](./disk-management.md)). `cryptsetup resize crypt-volume` -## Creating an automatic encryption key with an USB stick +## Creating an automatic decryption key with an USB stick This guide assumes you to have an Arch Linux System, as installed in [this wikis arch linux installation](./arch-linux/installation.md). From 3aef8ced1d3f698835d1507ea4999eed04cf019b Mon Sep 17 00:00:00 2001 From: marten <43725244+tiyn@users.noreply.github.com> Date: Sun, 7 Aug 2022 20:42:48 +0200 Subject: [PATCH 3/5] Update video.md --- wiki/video.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wiki/video.md b/wiki/video.md index 666b66f..0d5497c 100644 --- a/wiki/video.md +++ b/wiki/video.md @@ -31,5 +31,8 @@ This way you don't have to search for your discs all the time. ``` - [MKS Extractor GUI](https://www.videohelp.vom/software/MKS-Extractor-GUI) - for windows can extract subtitles from a `.mkv` file -- [VidCoder](https://vidcoder.net) for windows can compress `.mkv` files. + for windows can extract subtitles from a `.mkv` file. +- [Subtitleedit]([https://www.videohelp.vom/software/MKS-Extractor-GUI](https://www.nikse.dk/subtitleedit)) + for linux can extract subtitles from a `.mkv` file and do ocr. +- [VidCoder](https://vidcoder.net) for windows can compress `.mkv` files. Its an adapted version of the HandBrake software. +- [HandBrake]([https://vidcoder.net](https://handbrake.fr/)) for linux can compress `.mkv` files. From e1e72879a9c3d5a13a86e35133a5fc81388d63cd Mon Sep 17 00:00:00 2001 From: marten <43725244+tiyn@users.noreply.github.com> Date: Wed, 10 Aug 2022 02:49:59 +0200 Subject: [PATCH 4/5] Update music.md --- wiki/music.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/music.md b/wiki/music.md index 2060aa9..1ac83a7 100644 --- a/wiki/music.md +++ b/wiki/music.md @@ -9,10 +9,10 @@ access a server for it. ## Server/Client If you want to keep your system clean of much data, you can use this kind of setup. -There are differences depending on your preffered client interface. +There are differences depending on your preffered software interface. - [Airsonic](./airsonic.md) is a free fork of Subsonic, can be dockerized and has - a web-interface. + a web-interface and multiple possible client options. ## Scan CDs From 3688c29f8f4547da6edbfc395627c961e44b183b Mon Sep 17 00:00:00 2001 From: marten <43725244+tiyn@users.noreply.github.com> Date: Wed, 10 Aug 2022 03:26:11 +0200 Subject: [PATCH 5/5] Update airsonic.md --- wiki/airsonic.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiki/airsonic.md b/wiki/airsonic.md index b67fe3c..7a4473b 100644 --- a/wiki/airsonic.md +++ b/wiki/airsonic.md @@ -14,4 +14,7 @@ As already mentioned it is possible to use a bunch of different clients because the server is compatible with most of the Subsonic clients. - [Ultrasonic](https://www.f-droid.org/en/packages/org.moire.ultrasonic) is a - free and open-source android subsonic/airsonic client. + free and open-source android subsonic-compatible client. +- [Sonixd](https://github.com/jeffvli/sonixd) is a + free and open-source cross-plattform subsonic- and jellyfin-compatible client. + It uses a look and feel similar to the spotify client.