about summary refs log tree commit diff
path: root/modules/user/aszlig
Commit message (Collapse)AuthorAgeFilesLines
* profiles/managed: Add ark to systemPackagesaszlig2017-11-041-0/+1
| | | | | | | | | | This really makes sense for an end user system, so let's actually add it to the system path. It seems that it also needs unzip and other archivers in $PATH but I haven't actually verified if that's really the case, because the Nix expression for ark already contains those archivers. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Set a default desktop manageraszlig2017-11-041-0/+1
| | | | | | | | | | This has changed in NixOS/nixpkgs@93c54acf97077567e8d6135a36f191e872b2 so that there's now an assertion to set a default. For all the profiles I've set this properly but managed to forget it for brawndo and tyree, which is now the case. Signed-off-by: aszlig <aszlig@nix.build>
* modules/aszlig: Change my email addressaszlig2017-10-272-2/+2
| | | | | | | I'm no longer employed by RedMoon Studios, so while I still receive email on this address, it makes more sense to move on to nix.build :-) Signed-off-by: aszlig <aszlig@nix.build>
* Change to new GnuPG keyaszlig2017-10-242-2/+2
| | | | | | | | | | | The previous GnuPG key (4DFD43EC834B6901BDA2BAAC1DE8E48E57DB5436) was subject to the ROCA vulnerability, so I had to revoke it. For details about this vulnerability, please visit: https://crocs.fi.muni.cz/public/papers/rsa_ccs17 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstations: Add fd to packagesaszlig2017-10-121-0/+1
| | | | | | | | It's a fast and less verbose alternative to find and while it won't replace find entirely for me it certainly will be useful for less complicated stuff or simple one-liners. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/managed: Remove kmix againaszlig2017-09-251-1/+0
| | | | | | | | | | | Reverts adding kmix as introduced in e49eca5c0c9c27352825c455d3e1b8a938245755. This causes two mixer icons to show up in the tray, which is kinda redundant. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @dwenola, @BrokkoliBerta
* profiles/managed: Replace simple-scan by skanliteaszlig2017-09-171-1/+1
| | | | | | | | | | This has been introduced by NixOS/nixpkgs@c4c187ed7226e2132c13070444d0, thanks to @pshendry. IMHO it makes more sense to use this instead of simple-scan, because the managed machines run KDE while simple-scan is a Gnome application. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Move gpodder to dnyarriaszlig2017-09-071-1/+0
| | | | | | | 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>
* profiles/workstation: Don't make Firefox lazyaszlig2017-09-072-1/+1
| | | | | | | | I might move to Firefox as my primary browser again. Apart from that, I regularily use it anyway, so having it as a lazy package doesn't make sense. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Unify most options for brawndo and tyreeaszlig2017-09-071-1/+65
| | | | | | | | | | | | | | | | | | | 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
* profiles/workstation: Add pv to systemPackagesaszlig2017-09-051-0/+1
| | | | | | | I tend to use it more frequently than I thought I would and it's quite small, so let's make it the default for my workstations. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Add xournal to lazy-packagesaszlig2017-09-041-0/+1
| | | | | | | I'm not going to use this a lot, so let's not clutter up the closure size with it, even though the package is actually quite small. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* madules/programs: Remove xpdf moduleaszlig2017-09-023-21/+1
| | | | | | | | | Since version 4.0 of xpdf, the UI has vastly changed and the configuration setting I'm using in this module no longer is necessary for me. So let's drop the module altogether until I'm getting used to the new xpdf and find new things I don't like :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Rename all occurences of gpg2 to gpgaszlig2017-08-191-1/+1
| | | | | | | | | | | | This is in reaction to upstream commit NixOS/nixpkgs@e34ce9d1c551fb43742aada6bb43ccb1a52e64a1. One of the changes in GnuPG 2.1.23 is that the main binary is now called gpg instead of gpg2. See the full release announcement here: https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000412.html Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles: Remove IPv6 patch for systemd v233aszlig2017-07-312-19/+0
| | | | | | | | | | | This reverts commit 224a63100f6233fda762c72818cad57173411802 and 85f3d5340e53e2624f65248740ed04cb1f5e94e9. Since the last staging merge done in commit NixOS/nixpkgs@740d76371e6c1c76bae4801fc5b736a796c1ebbe we have systemd version 234, which already has the change this patch has addressed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/managed: Add patch for networkd IPv6 fixaszlig2017-07-261-0/+11
| | | | | | | | | | This is exactly the same patch/implementation as I've added for my machines in 85f3d5340e53e2624f65248740ed04cb1f5e94e9. I wanted to delay this a bit until I have tested it by myself, which I have by now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/aszlig: Make vim module a plain packageaszlig2017-07-242-387/+1
| | | | | | | | | | | | 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-201-20/+0
| | | | | | | | | | | | 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>
* profiles/base: Add patch for networkd IPv6 fixaszlig2017-07-171-0/+8
| | | | | | | | | | | | | | | The upstream issue is systemd/systemd#3879 and this bug has annoyed me for a while now. I've also opened a pull request (NixOS/systemd#12) to the NixOS fork of systemd, but this is pending since almost a month now and the bug is still annoying as fuck, so let's patch it in vuizvui. I'm not yet porting this to other machines yet, because I want to test whether this actually really solves my problem (even though it's exactly what the upstream bug describes) or whether we need to patch something else as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell (uses networkd as well)
* Convert packageOverrides to overlaysaszlig2017-07-172-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* profiles/managed: Enable BFQ scheduler by defaultaszlig2017-07-061-0/+2
| | | | | | | Now that the scheduler is in mainline, I think there is nothing now to stop us from unleashing it to end users :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Move BFQ stuff into its dedicated moduleaszlig2017-07-062-33/+9
| | | | | | | | | Not everybody likes to have the latest release canidate kernel, so we now have an option called vuizvui.system.kernel.bfq.enable, which *only* enables the BFQ scheduler per default. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
* modules/kernel: Really enable BFQ by defaultaszlig2017-07-063-25/+15
| | | | | | | | | | | | | | | I previously wrote that patch in a hurry, so I thought it would be enough to set CONFIG_DEFAULT_IOSCHED to "bfq". But in block/elevator.c the actual default for blk-mq is a constant and can't be configured via CONFIG_DEFAULT_IOSCHED. So we're now patching just that constant and nothing more. Also, I've enabled CONFIG_DM_MQ_DEFAULT, because the DM devices need to be switched to blk-mq as well and for example on dnyarri I'm actually using the device mapper for LUKS. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Remove nix.conf option log-serversaszlig2017-06-221-1/+0
| | | | | | | This option does no longer exist in current Nix 1.12 and has been removed in NixOS/nix@0afeb7f51e3465c7c27bc5a83017e9ffde8c6725. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/kernel: Patch in a way to default to BFQaszlig2017-06-222-1/+24
| | | | | | | | The mainline kernel only allows switching schedulers via sysfs and for each individual device. I don't want to do that so let's do this with a small patch so we can set BFQ as the default blk-MQ scheduler. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* system/kernel: Drop BFQ scheduler patchaszlig2017-06-222-10171/+4
| | | | | | | | We're using kernel 4.12 and the BFQ scheduler is included there as a blk-BQ scheduler, so instead of the patch, let's just use a config where we set BFQ to be used as the default scheduler. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Remove nix-repl from packagesaszlig2017-06-222-15/+0
| | | | | | | Nix 1.12 already contains "nix repl" and as I'm using Nix 1.12 on all of my machines the nix-repl package is obsolete. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* santander: Update + convert to Chromium extensionaszlig2017-06-183-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new version of the "TRAVIC-Sign" extension that's used by the Santander bank now relies on native messaging, so it's much much easier for us to sandbox and also easier to integrate. For more information about native messaging see: https://developer.chrome.com/extensions/nativeMessaging So the upstream only contains a Firefox extension, but it doesn't deviate very much (at least since the new non-XUL API) from the Chromium extension API, so we only need to patch the manifest (where we also constrain the sites that the extension is allowed to run) and refer to the Wine wrapper in the native messaging host configuration file. Right now, the Chromium version that we have in <nixpkgs> still refers to /usr/share/chromium/extensions in order to search for system-provided extensions, so we need to fix that as well. In our workstation profiles we now no longer have the santander package in lazyPackages, because it's also no longer a binary. Previously the main reason why I added it to lazyPackages was that the whole santander package had a closure size of several hundred megabytes because of the Wine prefix. The latter now is essentially empty. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/aszlig: Cope with new xrandrHeads optionsaszlig2017-06-182-7/+8
| | | | | | | | | | | | | | | The way xrandrHeads are addressed has changed with the following upstream merge commit: NixOS/nixpkgs@9dca737d6269759745c9e68ea462446cde4d9be9 Now xrandrHeads are no longer a list of strings but a list of attribute sets, but we new do have even more information about a particular head. So apart from fixing this, we new also set --primary whenever applicable in "xreset". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Remove Tomahawkaszlig2017-06-181-1/+0
| | | | | | | This is a follow-up to b703865f1757d716954aa31f1fbaabc52ed4e3b3, because I forgot to actually remove it from my own profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add an overridden Gajim with old pycryptoaszlig2017-04-231-2/+2
| | | | | | | | 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-234-9/+9
| | | | | | | | | | | | | 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>
* pkgs: Remove unused/obsolete packagesaszlig2017-04-231-1/+1
| | | | | | | A lot of crap has been accumulated there over the years, so I'm removing at least the stuff that I have introduced. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* taalo-build: Use Nix 1.11 for the backendaszlig2017-04-231-1/+10
| | | | | | | | | | | | | | | | | | Nix 1.12 already got rid of most of the Perl stuff so the Perl script backing taalo-build doesn't work anymore because Nix/CopyClosure.pm is no longer available. One way to fix this properly is to part the backend to C++ and use the new ssh-ng store backend. This would also have the advantage that we don't need to hardcode protocol internals here anymore. Unfortunately, Nix 1.12 isn't stable yet and we would break Nix 1.11 if we use the new store API. So that's why I'm pinning the backend to use Nix 1.11 instead and leave that ugly Perl script until Nix 1.2 is stable. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Fix BFQ patch for kernel 4.11-rc7aszlig2017-04-191-141/+257
| | | | | | | | | | | | | | Previously in d6848012b86088cbfd70666a0cfae95c567e7199 I've just rebased the patch I had against 4.10 against kernel 4.11, but that didn't work out so well. So this is now a rebase against the new branch from Paolo Valente at: https://github.com/linusw/linux-bfq/tree/bfq-v8 Hopefully this time it will compile ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/packages: Switch to Chromium stableaszlig2017-04-191-1/+1
| | | | | | | | I'm fed up with fixing up Chromium beta and currently the included GN doesn't bootstrap as well. So for now let's run with Chromium stable until I'm masochistic enough to dig into Chromium again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Rebase BFQ patch on kernel 4.11-rc4aszlig2017-04-192-11/+10052
| | | | | | | | | | | | It's basically only a very small change, because block/Makefile now contains objects for block-MQ schedulers (one of these will also include BFQ in possibly the next mainline kernel) and thus the patch no longer applies. Having that potch here in the source tree is a lot of crap lying around, so we better get rid of it ASAP. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Fix build of nix-replaszlig2017-04-191-0/+1
| | | | | | | | Compiling nix-repl with Nix 1.12pre5152_915f62fa will only work by enabling support for ISO C++ 2014, because nix/util.hh uses includes from <experimental/*>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Make a few pkgs lazyaszlig2017-02-083-28/+32
| | | | | | | | Most of these packages I don't need for daily work and thus only clutter up the closure paths of those systems, so let's put them into lazyPackages. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/gajim: Disable tests expected to failaszlig2017-02-071-0/+6
| | | | | | | | | We inject our own declarative config into Gajim by patching the source, which unfortunately kills a few tests which assume the default configuration, especially in terms of the GUI (for example the Vuizvui config has a single window GUI). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Fix build of nix-replaszlig2017-02-071-2/+5
| | | | | | | | Since NixOS/nix@21948deed99a3295e4d5666e027a6ca42dc00b40 nix::Pid::wait() no longer takes a boolean argument and is now blocking by default. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/managed: Add simple-scanaszlig2017-01-191-0/+2
| | | | | | | Might be a good idea to have an actual application that can be used to scan stuff (apart from Gimp and others with SANE support). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Fix up BFQ patch for kernel 4.10aszlig2017-01-121-2/+6
| | | | | | | | | | | | | First of all, using .patch from the GitHub compare view is not going to work because the concatenated diffs are in reverse order for use within "git apply". And the second thing why it's not working is that the patch has a hunk that changes the version in Makefile to add an extra version -rc1-bfq, which would only apply for kernel 4.10-rc1 but not for subsequent release canidates. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/meshuggah: Set cyan color in promptaszlig2017-01-121-1/+13
| | | | | | | | | | | 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>
* aszlig/kernel: Update BFQ to v8r7 for 4.10-rc1aszlig2017-01-121-2/+10
| | | | | | | | | | | | | The patch is from https://github.com/linusw/linux-bfq/tree/bfq-v8. It's a combined patch until the parent of the branch's head, because the latest commit is a work-in-progress commit. I have only tested evaluation and didn't test whether the patch actually applies yet, because the machines currently using the BFQ patch are broken because the old BFQ patch no longer applies for kernel 4.10. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/managed: Implement a preliminary profileaszlig2017-01-021-0/+39
| | | | | | | | | | | | 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>
* Move taalo-build to workstation profileaszlig2016-12-151-0/+2
| | | | | | | 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>
* programs/vim: Disable mouse supportaszlig2016-11-291-0/+1
| | | | | | | This one is annoying and it seems to be enabled by default in recent Vim versions, so let's get rid of it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri/mmrnmhrm: Switch to generic kernelaszlig2016-11-281-43/+20
| | | | | | | | | | | | | | | | | 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>
* modules/git: Fix/flesh out type for Git configaszlig2016-11-091-2/+3
| | | | | | | | | | | | | | We need to properly separate attrsOf from the nested attrsOf because otherwise the either type isn't able to distinguish between both types during merging of the subtypes. Now we have sub sections which is '[section "subsection"]' in Git's config syntax and attrsOf (attrsOf ...) on our side and simple sections like '[section]' which is just a plain attrsOf. This way we have an additional type constraint in that we can't mix up subsections with sections by the same name. Signed-off-by: aszlig <aszlig@redmoonstudios.org>