about summary refs log tree commit diff
path: root/machines/aszlig
Commit message (Collapse)AuthorAgeFilesLines
* machines/tyree: Enable libinputaszlig2018-04-251-0/+1
| | | | | | | | | | This has been in the configuration.nix for a while and it seems to be working. It might be a good idea to add it to the managed profile, but we first have to test whether this really works for other machines than tyree. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Impose a size limit on journaldaszlig2018-04-251-0/+2
| | | | | | | | | The machine doesn't have a lot of MMC space, so putting a whole lot of logs which we probably won't need for such a long time isn't a good idea. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Add options for encryptionaszlig2018-04-251-0/+18
| | | | | | | | | The new installation of this Laptop uses encryption and so far these options have been residing in the local configuration.nix, so let's get it over to Vuizvui. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Switch from Chromium to Firefoxaszlig2018-04-251-1/+1
| | | | | | | | The machine's user already has switched to Firefox since quite a while, so let's actually add it to systemPackages. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/shakti: Provide EDID informationaszlig2018-04-231-0/+15
| | | | | | | | | | | | | | The monitor reports back EDID via DVI but the HDMI->DVI adapter seems to not handle that correctly. Also the monitor has weird resolutions, so using the fallback modes provided by the kernel also doesn't seem to work and the monitor stays blank. While hardcoding the EDID information isn't a very good idea for this machine in general (because it might be connected to a different monitor), for now this is the easiest workaround because I don't have access to that machine. Signed-off-by: aszlig <aszlig@nix.build>
* machines/dnyarri: Switch to latest kernelaszlig2018-04-231-1/+2
| | | | | | | | | Similar to 8562389f5e13e42329fc26ca53e9cf54ac0e541e but now for dnyarri. I grew a bit tired recently to fix up kernels, so let's actually run the latest release version instead. Signed-off-by: aszlig <aszlig@nix.build>
* tishtushi: Remove fbcon and usb-storage modulesaszlig2018-04-211-1/+0
| | | | | | | | Not sure why I added them in the first place, but it was probably because they were listed in the hardware config generated by nixos-generate-config. Signed-off-by: aszlig <aszlig@nix.build>
* machines: Remove unneeded crypto modules in initrdaszlig2018-04-213-13/+0
| | | | | | | These were needed a few months ago but they're now automatically added if boot.initrd.luks.devices is non-empty. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tishtushi: Use latest release kernelaszlig2018-04-211-2/+3
| | | | | | | I'm a bit tired of constantly running into regression from release canidate kernels, so let's switch to released kernels for now. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tishtushi: Remove discard option in /nixaszlig2018-04-211-1/+1
| | | | | | | We no longer write directly to the physical block device, so let's not try to TRIM a mapper device. Signed-off-by: aszlig <aszlig@nix.build>
* tishtushi: Change to new partitioning schemeaszlig2018-04-211-16/+43
| | | | | | | | | | | I had to recover tishtushi while on the road because I have used zstd compression, which GRUB doesn't support. So instead of just adding a boot partition I decided to actually do what I long wanted to do, which is to actually encrypt the disks, so the new partitioning reflects that. Signed-off-by: aszlig <aszlig@nix.build>
* machines/shakti: Add file systemsaszlig2018-04-131-6/+27
| | | | Signed-off-by: aszlig <aszlig@nix.build>
* machines/shakti: Add Firefox to systemPackagesaszlig2018-04-121-0/+1
| | | | Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Move Chromium to machinesaszlig2018-04-122-2/+2
| | | | | | | The new machine (shakti) is going to use Firefox, so let's make sure this is machine-specific. Signed-off-by: aszlig <aszlig@nix.build>
* machines/shakti: Enable deluge serviceaszlig2018-04-121-0/+2
| | | | Signed-off-by: aszlig <aszlig@nix.build>
* shakti: Add dropbox to systemPackagesaszlig2018-04-121-2/+2
| | | | | | At least for now until the owner gets rid of it. Signed-off-by: aszlig <aszlig@nix.build>
* machines: Add new machine "shakti"aszlig2018-04-121-0/+39
| | | | | | This is only a placeholder right now so we get Hydra builds. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Move updateMicrocode to machinesaszlig2018-04-122-0/+3
| | | | | | | | This is clearly something that is specific to the actual hardware, so even though both brawndo and tyree share the same CPU vendor, we will have a third managed machine that is going to be different. Signed-off-by: aszlig <aszlig@nix.build>
* machines: Remove arilouaszlig2018-04-031-42/+0
| | | | | | | | | | Why do I fix up a machine that doesn't exist anymore? This was from a time where I had no laptop and was travelling around with an USB stick in order to have a working environment on other machines, but that's no longer the case. Signed-off-by: aszlig <aszlig@nix.build>
* machines/arilou: Use correct modulesPathaszlig2018-04-031-3/+1
| | | | | | | | | | | Since I wrote the config for that machine, the modulesPath attribute is actually a thing in NixOS modules, so let's use that one instead. Besides, I really tend to like that even more restrictive restrictive evaluation mode, because it allows us to get rid of all those references to the Nix path. Signed-off-by: aszlig <aszlig@nix.build>
* dnyarri: Remove gpodder derivation attrs overrideaszlig2018-02-261-11/+1
| | | | | | | | | | | I've put in an assertion back then to make sure that once gpodder 3.10.1 is released, we get a failure so we don't stay behind forever. With NixOS/nixpkgs@4d1e72cfbb8de0d8adf2c047aad14f29eb4f77bf, not only the version is bumped but also the icon theme is added back, so we can drop the whole override of the attributes. Signed-off-by: aszlig <aszlig@nix.build>
* dnyarri/gpodder: Add hicolor_icon_themeaszlig2018-02-181-0/+3
| | | | | | | | | | | | This is needed in order to correctly display icons if someone doesn't use a full desktop environment. I'm not sure why NixOS/nixpkgs@bff6d624e05c53777a9d2fd85872884983f74313 removed this (in particular gnome3.defaultIconTheme, but hicolor_icon_theme should be enough anyway), but let's re-add it for our configuration until this is sorted out. Signed-off-by: aszlig <aszlig@nix.build>
* dnyarri: Use latest master for podcastparseraszlig2018-02-181-4/+20
| | | | | | | | | | | | | | | | Seems that 543ca6580d6f52d58caf975c0ed583956aa08b39 was not enough to fix the actual issue, because the real issue was in podcastparser. The upstream issue is gpodder/gpodder#394 and the pull request fixing this is gpodder/podcastparser#17. Instead of just updating podcastparser, I also updated gpodder to latest master, because it contains a few more fixes. I've tested whether this fixes my issue and it did (feed items now have the correct date). Signed-off-by: aszlig <aszlig@nix.build>
* machines/aszlig: Use zstd compression for btrfsaszlig2018-02-044-5/+5
| | | | | | | I've been using this for a while and got better results than zlib and lzo, so let's actually use this for all my machines. Signed-off-by: aszlig <aszlig@nix.build>
* Revert "machines: Remove tyree"aszlig2018-02-021-0/+47
| | | | | | | | | This reverts commit dfd3d86562f09d812b330893cec053ab3d371bdf. The machine is back on NixOS again :-) Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* dnyarri: Override gpodder to use latest masteraszlig2018-02-021-1/+11
| | | | | | | | | | | This is mainly to get gpodder/gpodder@c937184987431427dfcf8ac9bc098ce0ac but there are other fixes in the current master version, so instead of just patching the single fix, I'm heading for master directly instead. I've also added an assertion on the version attribute so that whenever there is a new upstream version, we can revert this. Signed-off-by: aszlig <aszlig@nix.build>
* machines: Remove tyreeaszlig2017-12-111-47/+0
| | | | | | | Tyree is dead, no further comment... Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/dnyarri/i3: Replace Chromium with FireFoxaszlig2017-12-111-2/+2
| | | | | | | I'm using Firefox now and also having a label which only says "Browser" is a bit more browser-agnostic. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tishushi: Remove obsolete synergy clientaszlig2017-10-301-3/+0
| | | | | | | I'm no longer using Synergy for anything, so let's prevent synergc from attempting to connect to a non-existant server. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tyree: Add a few photo editing programsaszlig2017-10-181-1/+3
| | | | | | | | In the end I guess we're going to remove one or more of these, but right now let's add all of them to have a way to evaluate. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @BrokkoliBerta
* profiles/workstation: Move gpodder to dnyarriaszlig2017-09-071-1/+1
| | | | | | | Actually this is the only one workstation where I use gpodder, so let's move it there and also don't make it a lazy package. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Unify most options for brawndo and tyreeaszlig2017-09-072-120/+12
| | | | | | | | | | | | | | | | | | | Both machines are using Plasma along with a few common KDE applications, so let's actually be more aggressive about deduplicating the options, because after all whenever these machines start to deviate more from each other, we can still either override those options or move them out. I've also cleaned up a few packages, so instead of having mpv *and* vlc we now have mpv and bomi for both machines. The latter is mostly about figuring out whether it's actually a good GUI video player, as it is basically a front-end for mpv. With this unification this means that some packages which are generally useful, such as okular and gwenview are now not only available to tyree but brawndo as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @dwenola, @BrokkoliBerta
* machines/tyree: Add a few more KDE applicationsaszlig2017-09-071-4/+11
| | | | | | | | | | | Most of them are KDE PIM applications and kmail so far was already within the systemPackages in the configuration.nix directly so far. The one exception to these is kmix (an audio volume mixer), which is generally useful to have I think. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @BrokkoliBerta
* modules/aszlig: Make vim module a plain packageaszlig2017-07-242-4/+4
| | | | | | | | | | | | I don't use anything that's machine specific within my Vim configuration (and even if, we can pass it via the callPackage arguments) so it's kinda pointless that it's a module instead of a plain package (override). This makes it also easier to nix-build the package without the need to go through the module system. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Introduce new system.kernel.useBleedingEdge optionaszlig2017-07-202-2/+4
| | | | | | | | | | | | This dissolves the user.aszlig.system.kernel module, which was not only to stay on the latest bleeding edge kernel but also to enable BFQ. The latter has been factored out already a while ago already. Originally, I had a fully custom kernel config for mmrnmhrm and dnyarri, but it's no longer the case and thus the user.aszlig.system.kernel module is now no longer needed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Convert packageOverrides to overlaysaszlig2017-07-171-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two other occasions where packageOverrides are still in use, one of them is @sternenseemann's fliewatuet machine and another one is @devhell's package profile. I've replaced every other occurence of packageOverrides and replaced it with overlays and checked the store path hash after evaluation. The reason why I left @sternenseemann's fliewatuet alone was that for I wasn't quite sure whether "bluez = pkgs.bluez5" is still needed or intentional to pin it to version 5. Because if it's not the case the packageOverrides can just be dropped because bluez is already bluez5 in upstream <nixpkgs>. For @devhell's package profile, I did the conversion, but the store path turned out to be a different one than what it was prior to the change. I did take a quick look at the requisites of the drv and found that sox was one of the different paths that led to the change in the final store path. This obviously needs to be tested and/or investigated first. Other than that, the main reason why I'm moving everything to overlays is that it's the replacement for packageOverrides and also has a better way to pass through chains of overrides than packageOverrides had. My guess is that after NixOS 17.09, the old packageOverrides function will be removed, so let's make sure we're ready for that. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell, @sternenseemann
* machines/tyree: Remove OpenSSH serviceaszlig2017-06-291-1/+0
| | | | | | | I no longer need to actively debug the kernel or do much development on the machine, so this is no longer needed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add kate to systemPackagesaszlig2017-06-241-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Only enable redistributable firmwareaszlig2017-06-181-1/+1
| | | | | | | | We only use the firmware blobs for the CPU microcode and the GPU, both of them are redistributable so there is no need to enable those that have even more licensing restrictions. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Remove Tomahawk from the source treeaszlig2017-06-182-3/+2
| | | | | | | | | | | | | | Tomahawk is no longer actively developed and the current state within vuizvui is also broken. So after asking the users of brawndo and tyree whether they still use it they answered with a "no", so it doesn't make sense to fix up that package if noone is using it anyway. This has also been announced via the README in the official GitHub repository, where the change + comments can be seen here: https://github.com/tomahawk-player/tomahawk/commit/c8389592488c07079 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add an overridden Gajim with old pycryptoaszlig2017-04-232-5/+5
| | | | | | | | This is for the time being until either NixOS/nixpkgs#21671 has been resolved or the next major version of Gajim has been released, because the latter no longer uses pycrypto. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Move all of my packages into pkgs/aszligaszlig2017-04-233-4/+4
| | | | | | | | | | | | | This already has started in e0abe1dbbda54c1f048b5d38df05e1a3289216a6 with @Profpatsch putting his packages into its own namespace, so let's continue on that and move my crap into my own namespace as well. The only difference in my approach is that I'm now also using a new function called callPackageScope, which declutters pkgs/default.nix a bit and moves the individual callPackage invocations into aszlig/default.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* 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>