machines/mmrnmhrm: Merge machine into dnyarri

Unfortunately, mmrnmhrm has died because of three blown up capacitors
which resulted in hard shut downs due to CPU0 temperature values that
were out of range.

At first I assumed a real temperature problem and thus vacuumed the fan
and everything else, applied new thermal paste and it still failed after
a few minutes. What I found a bit odd was the fact that the machine
powered off even though the last reading of the CPU temperature was 40
degrees Celsius, so that definitly wasn't the problem.

So I went on to look for any blown capacitors on the main board, because
that's probably one of the most frequent cause of hardware failure... at
least for mainboards and monitors. One of the three capacitors I found
to be leaking seems to be leading to the CPU temperature sensor as far
as I can tell (I didn't test with a multimeter though, because I have
lent it out to someone else).

While it shouldn't be hard to fix the blown capacitors (apart from the
fact that we had national holiday during the Easter week), my long-term
goal was to make mmrnmhrm obsolete anyway, so it was a good opportunity
to do exactly that.

The reason why I wanted to get rid of mmrnmhrm was that it has been a
very slow machine since commit 2df7ee103a01da34c9c82235bc286dde35e0f1ba,
which was essentially a hardware downgrade back then.

Dnyarri always has been the better machine hardware-wise but I couldn't
use it to its full potential because it had a cooling issue. The latter
has been resolved a few weeks ago, where I replaced the CPU fan and it's
now not only less noisy but stays at below 50 degrees Celsius even on
high load.

Merging mmrnmhrm into dnyarri also means, that we now have a new disk
layout:

 +---------------+--------------+--------------+--------------+
 | Disk 1        | Disk 2       | Whole disk 3 | Whole disk 4 |
 +---------------+--------------+--------------+--------------+
 | EFI partition | crypt-vault  | crypt-root-3 | crypt-root-4 |
 | crypt-swap-1  | crypt-swap-2 +-----------------------------+
 | crypt-root-1  | crypt-root-2 |
 +---------------+--------------+

Disk 1 and 2 use GUID partitions while disk 3 and 4 don't have a
partition table but use btrfs across the whole device. The crypt-vault
partition is solely for unlocking other crypto volumes so that a single
passphrase unlocks all of the LUKS containers rather than needing to
provide 6 passphrases.

Also, I've migrated to using UEFI for booting, which is why there now is
an EFI partition as well. Having no redundancy on the EFI and the
crypt-vault partitions doesn't hurt so much because in the event of
drive failure all of the containers can still be unlocked via a
passphrase instead of the vault key.

Disk 3 and 4 are the disks that were formerly installed into mmrnmhrm
and now comprise one big btrfs volume together with the two disks (1 and
2) already present inside dnyarri.

Instead of RAID1 on data and metadata, the btrfs file system layout now
is RAID10 for data and metadata.

This merge also removes synergy for obvious reasons (no other machine
anymore) and disables kmscon because it was just a test in the first
place and I found it a bit annoying to work with.

Summary: Mmrnmhrm is (are?) dead, long live dnyarri!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 0 insertions, 1 deletions

diff --git a/machines/default.nix b/machines/default.nix
index 3525a3e1..a976bbc4 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -3,7 +3,6 @@ with import ../lib;
 {
   aszlig = {
     dnyarri   = callMachine ./aszlig/dnyarri.nix {};
-    mmrnmhrm  = callMachine ./aszlig/mmrnmhrm.nix {};
     arilou    = callMachine ./aszlig/arilou.nix {};
     kzerza    = callMachine ./aszlig/kzerza.nix {};
     meshuggah = callMachine ./aszlig/meshuggah.nix {};