about summary refs log tree commit diff
path: root/machines/aszlig/mmrnmhrm.nix
Commit message (Collapse)AuthorAgeFilesLines
* machines/mmrnmhrm: Merge machine into dnyarriaszlig2017-04-181-79/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* machines/aszlig: temporarily whitelist webkitgtksternenseemann2017-03-071-0/+5
| | | | | | | | webkitgtk-2.4.11 is insecure, I am whitelisting it for now to fix the evaluation errors on the hydra. Consider, what you want to do on the issue long term, or just revert this commit as soon as the CVEs are fixed upstream, @aszlig!
* machines/aszlig: Remove "with lib;"aszlig2017-01-021-4/+2
| | | | | | | | | | | I now prefer to explicitly state the function along with the "lib." namespace instead of making it available over the whole scope of the module. One of the main reasons for this is that you can do early error checking with nix-instantiate --parse. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri/mmrnmhrm: Enable all firmwareaszlig2016-11-281-0/+1
| | | | | | This is needed mostly for the GPUs and for KMS to hopefully work. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri/mmrnmhrm: Switch to generic kernelaszlig2016-11-281-1/+0
| | | | | | | | | | | | | | | | | I've been patching these machines up since ages and I'm tired now to do both kernel configs *again* for the recent kernel versions. Of course, in the long run I still want them to have their customized kernel, but right now it's better to have a recent generic kernel rather than have a fucked up custom kernel. Also, this removes all that cruft for the Intel HDA pinning on dnyarri, because the machine now has two X-Fi sound cards. Both machines probably won't boot now, so we'll have to adjust a few things very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/aszlig: Use lists for filesystem optionsaszlig2016-02-151-6/+1
| | | | | | | | | We had this since NixOS/nixpkgs@3c5fca9 and since the merge of master into closure-size (NixOS/nixpkgs@d039c87) we also have it there, so there is no excuse now to not switch to lists, especially because we already used concatStringsSep on lists anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Add to synergy configuration.aszlig2015-10-131-0/+2
| | | | | | | | | Having to switch keyboards when I have my laptop at home is quite annoying, so let's add the laptop (tishtushi) to the synergy config but without setting a mouse region so it won't get more annoying than switching keyboards ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/mmrnmhrm: Change synergy keystrokes.aszlig2015-10-131-2/+2
| | | | | | | | | Having Menu/AudioPlay used for synergy isn't really a very good idea if some applications actually use those keys, so let's move on to a similar scheme as with my i3 config and use function keys to not collide with Super+1, Super+2, ... Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Enable kmscon.aszlig2015-10-071-0/+2
| | | | | | | | I'm going to remove legacy fbdev support from the kernel configurations, so in order to still have terminals besides the X server we need to enable this (also, kmscon allows more eyecandy if we want that). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib: Refactor kernel configuration into a module.aszlig2015-03-181-15/+6
| | | | | | | | | | | | | | This means, we don't have that lib directory anymore and also we're not doing text substitution on the kernel config but instead override the original attributes. However, this needs to be refactored even further, so we can use the NixOS kernel system, which allows for certain modules to require specific kernel features. That way we can automatically create a kernel config from the list of required features and we only need to set a specific base config instead of specifying the *full* kernel config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Inline synergy.conf into machine "mmrnmhrm".aszlig2015-03-181-1/+20
| | | | | | | | Thus we now got rid of the cfgfiles directory, especially because the Synergy server config file is rather small, so inlining makes sense here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move common{-workstation}.nix into profiles.aszlig2015-03-181-1/+1
| | | | | | | | | | | | Both files are specific to my machines only and need to be generalized in order to be useful for anyone else. Moving these files has a few other censequences, such that we now need to automatically import the module-list.nix in callMachine. Speaking of module-list.nix, the file is now alphabetically sorted. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Properly namespace module attributes.aszlig2015-03-181-2/+2
| | | | | | | | So far the modules were still using the old naming scheme of vuizvui.name where name is the corresponding module name directly instead of the category. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/mmrnmhrm: Fix reference to cfgfiles/.aszlig2015-03-181-1/+1
| | | | | | Whoops, forgot about this one in 2b8256b. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Move own machines into machines/aszlig.aszlig2015-03-181-0/+67
Introduces callMachine in machines/default.nix, which returns an attribute set containing the (input) configuration and also a build attribute containing the output configuration and thus also the builds. However, we still have references to ../../common-workstation.nix which we need to refactor very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>