about summary refs log tree commit diff
path: root/modules/user
Commit message (Collapse)AuthorAgeFilesLines
* 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
* devhell/packages: Fix attribute for glancesaszlig2017-09-051-1/+1
| | | | | | | | | Eval error introduced by 761856c84d8abae87aa1cd3b2a0f70f9f1bf4397. It's actually in pythonPackages. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
* 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>
* devhell/packages: Add glancesdevhell2017-09-051-0/+1
|
* 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>
* devhell/packages: Fix attribute for "jrnl"aszlig2017-09-021-1/+1
| | | | | | | | The jrnl package is now a top-level attribute since NixOS/nixpkgs@3ff173ffde475f96f12b379f4ae21658e63045c1. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
* 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>
* devhell/packages: Remove arc-themedevhell2017-08-311-1/+1
| | | | | Currently I'm not using GNOME anyway, and it's failing on Hydra, so might as well disable it at the moment.
* devhell/profiles: Fix package overridesaszlig2017-08-251-13/+11
| | | | | | | | | | | | | | | | | | | Regression introduced by 5990a4d62f2d3146ddd03ec2461d45b2102e5f42. In this commit, I copied over the nixpkgs.config.packageOverrides attribute, but didn't trim off the "nixpkgs.config", so the packageOverrides attribute didn't get evaluated correctly. While converting everything to overlays in 0feae9218e6f922366665e6515bc, I noticed that for @devhell's profile the store paths were different. In hindsight, this is pretty obvious given that overrides didn't apply *at* *all* but with the move to nixpkgs.overlays they suddenly applied. So this moves the overrides to overlays instead and drops the override on gnupg, because gnupg is already gnupg21 in upstream <nixpkgs>. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
* devhell/packages: Remove vivaldidevhell2017-08-201-1/+0
| | | | Tried it. Meh.
* 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/packages: Add termitedevhell2017-07-141-0/+1
| | | | Let's see what the fuss is all about.
* modules/openlab/speedtest: may_ was kind of a no-opProfpatsch2017-07-121-3/+1
|
* modules/openlab/speedtest: add curl timeoutProfpatsch2017-07-111-3/+17
| | | | When the connection drops packages, it should be picked up by the script.
* modules/openlab: use a smaller speedtest fileProfpatsch2017-07-111-2/+2
| | | | Based on comments in https://github.com/openlab-aux/orgafoo/issues/257.
* modules/profpatsch/scannning: add option to list remote scannersProfpatsch2017-07-101-3/+18
| | | | | sane has a file called `net.conf` which is a list of hosts that are searched for remote scanners.
* machines/hannswurscht: serve speedtest output with nginxProfpatsch2017-07-081-6/+1
|
* modules/openlab: improve speedtest scriptProfpatsch2017-07-082-19/+38
| | | | | | Add an option to specify the file where new data should be appended to. Check the size of the actual downloaded file. Add IPv6 and IPv6 checks and a version field for outputs.
* machines/haku: refactor a bit to include into base server configProfpatsch2017-07-081-0/+1
| | | | | Until now, the config on the actual server was deviating because I changed it locally.
* modules/openlab: small patch to speedtest for more correct pingProfpatsch2017-07-071-3/+4
|
* 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>
* modules/openlab: add correct locale for speedtestProfpatsch2017-07-051-0/+1
|
* modules/openlab: add speedtestProfpatsch2017-07-042-0/+86
| | | | A simple script to gather DNS & download speed data.
* Merge migration of devhell's machinesaszlig2017-06-223-0/+526
|\ | | | | | | | | | | | | This merges pull request #15 and thus also introduces @devhell as a new member of vuizvui. Changes were approved by @devhell via XMPP.
| * devhell: Mergo overrides/pkgs into vuizvuiaszlig2017-06-221-0/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces another profile module called "packages", which contains all the package configuration (including overrides) of all the machines in the devhell namespace. The machine-specific configuration is now merged into the machine configurations the same way as we've done previously with the services. One major difference here is that the haskellPackages workaround is no longer needed in the package configuration, as it is handled by vuizvui. Tested this by evaluating all machines and all evaluations succeeded. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
| * devhell: Move users_dev.nix into base profileaszlig2017-06-221-0/+7
| | | | | | | | | | | | | | | | | | IMHO this module is really too small to factor it out into its own profile module, so I'm putting it into the base profile as it's really common among all of devhell's machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
| * Factor out devhell's services into vuizvuiaszlig2017-06-221-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added another profile called "services", which now resembles the services_common.nix from the previous configuration. The machine-specific definitions now reside directly inside the machine's Nix expressions for now, until they're properly refactored. Most of these machine-specific values can be easily modularized, especially the xrdb config, for example having one base xrdb module and only small machine-specific definitions if stuff needs to be overridden. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
| * devhell/profiles/base: Disable firewallaszlig2017-06-221-0/+2
| | | | | | | | | | | | | | | | This is from network/network_common.nix and it really affects all of the machines, so it makes sense to add it to the base profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
| * Move devhell's machines into machines/aszlig2017-06-221-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In his configuration he had machine_common.nix which was imported from the other machine_*.nix files. However in order to start modularizing I've converted machine_common.nix into a proper NixOS module which now resides in modules/user/devhell/profiles/base.nix and can be simply activated via: vuizvui.user.devhell.profiles.base.enable = true; Apart from that I've removed the following configuration definitiens from machine_common.nix: nix.binaryCaches = [ "https://headcounter.org/hydra/" "https://cache.nixos.org/" ]; nix.requireSignedBinaryCaches = true; nix.binaryCachePublicKeys = [ "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.nixPath = lib.mkOptionDefault [ "nixpkgs=/home/dev/git/remote/other_github/nixpkgs" ]; The reason for removing them is because we already handle that via the vuizvui core modules (modules/core/common.nix). I've tested this by evaluating the machines by temporarily setting "allowUnfree = true" (which is part of another module I didn't migrate yet) and it succeeds. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
* | 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>
* machines/openlab: add man support to all machinesProfpatsch2017-06-201-0/+1
| | | | It’s just annoying otherwise.
* 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>
* stackenblocken: add volume optionProfpatsch2017-06-011-1/+10
|
* move to `enableRedistributableFirmware` for Profpatsch/OpenlabProfpatsch2017-05-121-1/+1
| | | | | This is because `enableAllFirmware` now contains a new entry that is unfree. Other machines probably want to move as well, cc @aszlig @sternenseemann.
* 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>