about summary refs log tree commit diff
path: root/machines/aszlig
Commit message (Collapse)AuthorAgeFilesLines
...
* machines/brawndo: Add gpodder instead of miroaszlig2017-04-191-1/+1
| | | | | | | | Miro is unmaintained and very buggy, while gpodder is a bit more minimal it's still maintained and also more reliable. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @dwenola
* dnyarri: Fix allowUnfreePredicate match of hplipaszlig2017-04-191-1/+1
| | | | | | | | | | | The derivation name now is just "hplip-VERSION" (eg. "hplip-3.16.11") instead of "pythonX.Y-hplip-VERSION". The upstream commit changing this was: NixOS/nixpkgs@3760c8c7fde6e8b15d19b063579d05018fc2d8b3 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/aszlig: Revert whitelisting webkitgtkaszlig2017-04-195-22/+0
| | | | | | | | | | | | | | This reverts the following commits: * f34f60216a94f41e684b2b2a29be9ca5f8f72940 * fb6cd06936a469fad708e1095b5ee25ad1298375 Using permittedInsecurePackages on all my machines isn't something I want to pursue, because this really affects *one* single package and I really don't want to whitelist webkitgtk-2.4.11 across all of my machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/mmrnmhrm: Merge machine into dnyarriaszlig2017-04-182-112/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: fix double definition of a setsternenseemann2017-03-073-15/+12
|
* machines/aszlig: temporarily whitelist webkitgtksternenseemann2017-03-076-0/+30
| | | | | | | | 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!
* Remove/rename occurences of kde5aszlig2017-03-022-7/+8
| | | | | | | | | | | | | | This fixes the attributes accordingly to the following two upstream commits: * NixOS/nixpkgs@f21d4d00152726c02f870cb20faba4aca18ef49a * NixOS/nixpkgs@8eb4d2afbc1d61d316073f25f5885a46ccb37ea2 The first renames desktopManager.kde5 to desktopManager.plasma5 and the second one removes the kde5 attribute from the top-level packages set and puts applications in kdeApplications instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Remove notsureaszlig2017-02-161-95/+0
| | | | | | | | This machine hasn't been in use since a year or even longer and the successor machine (brawndo) is already in use since a while, so we can safely drop the machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add calibre to systemPackagesaszlig2017-01-191-1/+1
| | | | | | Needed for access to Kobo reader. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Switch to SDDMaszlig2017-01-131-1/+1
| | | | | | | I guess it's time very soon[TM] to switch these machines to a common profile, because I got rid of the legacy KDM for tyree already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/meshuggah: Set cyan color in promptaszlig2017-01-121-0/+1
| | | | | | | | | | | This is mainly to distinguish the prompt color from my workstations so it's clearly obvious that I'm working on meshuggah rather than say mmrnmhrm. We needed to add another option to the zsh module so that we can easily override machine colors for other machines as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add new machine "meshuggah"aszlig2017-01-121-0/+55
| | | | | | | | Currently only a very minimal base configuration, nothing too fancy yet. The machine is going to serve as a audio/media server in my living room. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/dnyarri: Enable sane with hplipaszlig2017-01-021-4/+21
| | | | | | | | | | | This machine is used for collecting all that useless paperwork gathered since a few years, so I need scanner support. Unfortunately the scanner (it's part of a HP Officejet all-in-one thingy) needs to have a proprietary plugin for hplip in order to work, which is not nice and I'm not very proud about needing to do this. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/aszlig: Remove "with lib;"aszlig2017-01-025-22/+12
| | | | | | | | | | | 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>
* machines/managed: Implement a preliminary profileaszlig2017-01-023-17/+9
| | | | | | | | | | | | Currently I just needed to support HP printers and scanners among all the managed machines, so I thought it would be a good oportunity to start a common profile for end user machines. Right now there isn't that much factored out yet, but instead of copy & pasting the printer/scanner config into all three machines I'm putting it into the profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/dnyarri: Add paperwork to systemPackagesaszlig2016-12-221-0/+2
| | | | | | | I use this machine to archive all the crap that's piling up over the years and paperwork is quite useful in this regard :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move taalo-build to workstation profileaszlig2016-12-151-1/+0
| | | | | | | I need this on all my machines, so nix-env'ing it on every machine on demand was getting tedious over time. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Use a more sensible Nix configaszlig2016-11-291-1/+6
| | | | | | | We want to have sandboxed builds and a read-only store. Might make sense to apply this to all machines in the long term. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tishtushi: Switch to common kernel configaszlig2016-11-281-23/+2
| | | | | | | | | | | This brings tishtushi in par with dnyarri and mmrnmhrm, because the patch for the BFQ scheduler doesn't apply, while the one we already have in pkgs.vuizvui.kernel.bfqsched *does* apply. Besides it doesn't make sense to use different versions of the *same* patch within the same repository. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri/mmrnmhrm: Enable all firmwareaszlig2016-11-282-0/+2
| | | | | | 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-284-3002/+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>
* tishtushi: Update BFQ scheduler patch for v4.9-rc2aszlig2016-10-271-4/+10
| | | | | | | | | | | | | | | | The rebased patch has been announced upstream at: https://groups.google.com/forum/#!topic/bfq-iosched/Et-axgapbrs Unfortunately the GitHub branch isn't linked there, but it can be found here: https://github.com/linusw/linux-bfq/tree/add-bfq-logical This time the patch adds the BFQ scheduler as an extra scheduler instead of modifying CFQ, so we need to add extra kernel options again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Remove support for rtl8192cuaszlig2016-10-131-3/+0
| | | | | | | Now that internal WiFi is working, we don't need that WiFi dongle anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kernel: Switch to use boot.kernelPatchesaszlig2016-10-131-14/+13
| | | | | | | | Since NixOS/nixpkgs@da36847d925058fd86f027b64cc712c57be11ad8 we no longer need so much cruft to specify kernel patches, so let's switch to boot.kernelPatches instead of the hackery we had so far. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Add axbo to systemPackagesaszlig2016-09-251-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Set boot loader timeout to 1saszlig2016-08-301-1/+1
| | | | | | | | Not being able to get into boot menu is quite annoying. IIRC I saw some Grub config in other distros that allow to hold a key to display the boot menu without the need to set the timeout >0. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Add BFQ patch replacing CFQaszlig2016-08-301-9/+10
| | | | | | | | | | | | | | | | So far until version 4.7.0 I've used the BFQ patch that adds BFQ as another I/O scheduler to the kernel. I'm using BFQ as the default scheduler on this machine, so it makes sense to completely replace the CFQ scheduler with the BFQ implementation. Paolo Valente has already ported this to 4.8 according to this post: https://groups.google.com/d/msg/bfq-iosched/RQNkbDf9rAg/DqgVDGs7AAAJ So let's just switch to the implementation that might get mainlined someday. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Rename kde5.krita to just "krita"aszlig2016-08-161-3/+3
| | | | | | | This now is a top-level attribute and it has been removed from kde5.* in NixOS/nixpkgs@de27f97e2d612bf372ad625f42d860ca8363dee4. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Disable xterm "desktop manager"aszlig2016-08-101-0/+1
| | | | | | | We have a real VT for debugging and even if we'd need an XTerm for the xsession, we can still do so from the VT as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Switch from autologin to SDDMaszlig2016-08-091-2/+1
| | | | | | | | Most of the initial development is done on this laptop and it's going to get into production mode. So having a Laptop with autologin is kinda pointless, especially while you're travelling. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add Krita to systemPackagesaszlig2016-08-091-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/{brawndo,notsure}: Add Steamaszlig2016-08-092-2/+4
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/{brawndo,notsure}: Enable 32bit DRI libsaszlig2016-08-082-0/+2
| | | | | | | Unfortunately, this is a requirement for Steam and other 32bit games, so let's make sure it's available. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Revert "machines/brawndo: Disable containers"aszlig2016-08-071-1/+0
| | | | | | | | | | This reverts commit decd0f04f517e832e2479ec2543141399cc87c80. Since NixOS/nixpkgs@9f0acda, the containers-imperative NixOS test is succeeding again, so we don't need this workaround anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* machines/brawndo: Disable containersaszlig2016-08-011-0/+1
| | | | | | | For now the containers-imperative tests are failing and containers aren't used on this machine either, so let's just disable them. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Bring back temporarily removed Tomahawk referencesaszlig2016-08-011-1/+1
| | | | | | | | | | | | This reverts the following commits: 4f4c778e424e72d51242dbfadde0a2a806efb68b 22fac6bad53e797ca84d7c7ac7e0fca3c0a912c8 We can now move Tomahawk back to the corresponding profiles/machines, because the build has been fixed in f7e934e74595a0d7524159d6faa1b2bb5d. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Enable Synapticsaszlig2016-07-231-0/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Switch to systemd-bootaszlig2016-07-231-3/+2
| | | | | | | I've copied the notsure config, which wasn't an EFI system, so let's actually use systemd-boot here, shall we? ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Allow unfree in nixpkgs.configaszlig2016-07-231-0/+1
| | | | | | | Unfortunately, this is currently necessary for the Broadcom wireless drivers. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Add hardware-specific infoaszlig2016-07-231-2/+8
| | | | | | Hardware-specific info largely from nixos-generate-config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Temporarily remove Tomahawkaszlig2016-07-231-1/+1
| | | | | | Just because it doesn't build at the moment and just temporarily. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add new machine "brawndo" to the managed machinesaszlig2016-07-231-0/+104
| | | | | | | This one more or less shares the same profile as "notsure", but I'm too lazy right now to consolidate and/or modularize everything properly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Update kernel sources + configsaszlig2016-07-162-16/+46
| | | | | | | | | | Nothing very scary here, just getting things up to date. This also reflects on my choices of kernel options, most of them probably are unnecessary but I'm going to rip apart the whole kernel config very soon[TM] anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/dnyarri: Remove VirtualBoxaszlig2016-07-161-4/+1
| | | | | | | I no longer use VirtualBox on any of my machines anymore, so let's remove it for good :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Avoid renaming network interfacesaszlig2016-07-111-0/+3
| | | | | | | | | | | | | | | | | This seems to be related to this bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1434986 The problem here is a race condition, because NetworkManager is trying to pick up the device _before_ the renaming and then fails to correctly identify it. Another solution would be to reorder the service unit after the networkd service, but that would only work well if the interface is plugged in at boot time and if it's pluggen in/out afterwards we likely have the same problem again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add user to group networkmanageraszlig2016-07-101-1/+1
| | | | | | | | | | | The main user currently doesn't have permissions to use NetworkManager, because until now I've used a fixed list of APs directly using wpa_supplicant.conf and disabled NM via configuration.nix. However for end users it's a bit tedious to manage wireless networks that way, so let's add user "bla" to the networkmanager group. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add Okular to systemPackagesaszlig2016-07-101-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Rename deprecated optionsaszlig2016-06-281-2/+2
| | | | | | | | The options nix.useChroot and boot.loader.gummiboot.enable were changed since quite a while, so let's fix it to get rid of annoying warnings during rebuild. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Fix typo in "hardvare"aszlig2016-06-261-1/+1
| | | | | | Damn it, it seems to be too early in the morning X-D Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Switch to pulseaudioFull for most of my machinesaszlig2016-06-261-0/+1
| | | | | | | | The default (light) package doesn't contain all the modules I need from time to time, so having te replace the running pulseaudio daemon with the full one is more of a hassle than worth keeping the light package. Signed-off-by: aszlig <aszlig@redmoonstudios.org>