about summary refs log tree commit diff
path: root/machines
Commit message (Collapse)AuthorAgeFilesLines
...
* devhell/titan: Add neomuttdevhell2017-09-131-0/+1
|
* 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
* machines/titan: Add netalyzrdevhell2017-09-051-0/+1
|
* machines/schnurrkadse: add surfsternenseemann2017-09-031-0/+1
|
* machines/schnurrkadse: add pulseaudio zeroconf discoverysternenseemann2017-09-031-0/+2
|
* machines/haku: Revert setting addSSL to trueaszlig2017-09-011-1/+0
| | | | | | | | | | | | | This reverts commit 0cfbc3bcd4be9ba3798f1752f82f6ea2d3aba650. Since NixOS/nixpkgs@ae9d311565d8c790900ebbc0976e447034930112 the addSSL option is now mutually exclusive to forceSSL. Turns out that this actually was a bug that got introduced in NixOS/nixpkgs@a912a6a291eaa5f6a2ad9143c9e276779c357a41. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* haku: add static vpn interfaceProfpatsch2017-09-011-0/+8
|
* machines/haku: add test mailinglistProfpatsch2017-09-011-1/+1
|
* machines/haku: Fix evaluation error for nginxaszlig2017-08-191-0/+1
| | | | | | | | In order to use forceSSL you now also need to use addSSL and there is an assertion now to check that since NixOS/nixpkgs@a912a6a291eaa5f6a2ad914. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* profpatsch/pkgs: Fix attribute for searxaszlig2017-08-011-1/+1
| | | | | | | | | | Since NixOS/nixpkgs@c217f48c358db05bd0ad7893e8e3ebabe4784cbe, the searx package is no longer in pythonPackages but a top-level attribute. Tested eval by "nix-instantiate machines -A profpatsch.haku.build". Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* 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>
* machines/eris: Remove terminatordevhell2017-07-181-1/+0
|
* machines/profpatsch: enable fcitx & mozc japanese IMEProfpatsch2017-07-171-0/+4
|
* machines/fliewatuet: remove packageOverridessternenseemann2017-07-171-6/+1
| | | | cc @aszlig
* 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/haku: forgot the firewall exception for searxProfpatsch2017-07-101-1/+3
|
* machines/haku: move searx from katara to hakuProfpatsch2017-07-102-5/+5
|
* machines/katara: back to wpa_supplicant againProfpatsch2017-07-101-8/+8
|
* machines/katara: add TERM to the environmentProfpatsch2017-07-101-0/+2
|
* machines/katara: add anki plugin depsProfpatsch2017-07-101-1/+1
|
* modules/profpatsch/scannning: add option to list remote scannersProfpatsch2017-07-101-1/+6
| | | | | 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-2/+15
|
* machines/haku: remove pub subdomain againProfpatsch2017-07-081-8/+3
| | | | | Apparently `enableACME` doesn’t generate certificates for the right subdomains if they are on the same machine in different virtual hosts.
* machines/haku: add a pub subdomainProfpatsch2017-07-081-3/+8
|
* machines/haku: fix warpspeed serviceProfpatsch2017-07-081-2/+2
|
* machines/haku: add correct port numberProfpatsch2017-07-081-0/+2
|
* machines/katara: fix evaluation errorProfpatsch2017-07-081-1/+0
|
* machines/haku: refactor a bit to include into base server configProfpatsch2017-07-083-7/+43
| | | | | Until now, the config on the actual server was deviating because I changed it locally.
* machines/hannswurscht: increase stackenblocken volumeProfpatsch2017-07-071-1/+1
|
* machines/{titan,eris,skunkworks}: Enable BFQdevhell2017-07-063-0/+3
|
* modules/openlab: add speedtestProfpatsch2017-07-041-0/+1
| | | | A simple script to gather DNS & download speed data.
* machines/titan: Switch wirelesstools for iwdevhell2017-06-301-1/+1
| | | | Signed-off-by: devhell <devhell@mailfresser.de>
* machines/eris: Add missing /bootdevhell2017-06-291-0/+5
| | | | | | | For whatever reason the /boot configuration was missing and subsequently nixos-rebuild would fail. Thanks for pointing out the error @aszlig! Signed-off-by: devhell <devhell@mailfresser.de>
* machines/titan: Disable synaptics in favor of libinputdevhell2017-06-291-3/+8
| | | | | | | Let's see how the touchpad on this new laptop behaves with libinput instead of synaptics. Signed-off-by: devhell <devhell@mailfresser.de>
* 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>
* Revert "devhell/titan: Disable networking.wireless"devhell2017-06-271-1/+1
| | | | | | | This reverts commit 2e90b9562939208e5392790834c6ffd89aede692. Sorry about this. I was wrong as it seems networking.wireless is required for connman.
* devhell/titan: Disable networking.wirelessdevhell2017-06-271-1/+1
| | | | Not even sure if it is needed anymore to keep connman working.
* devhell/titan: Switch to connman for networkingdevhell2017-06-271-3/+3
|
* machines/tyree: Add kate to systemPackagesaszlig2017-06-241-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* titan: Adapt to new hardwaredevhell2017-06-231-16/+16
|
* Merge migration of devhell's machinesaszlig2017-06-224-0/+705
|\ | | | | | | | | | | | | This merges pull request #15 and thus also introduces @devhell as a new member of vuizvui. Changes were approved by @devhell via XMPP.
| * skunkworks: Revert workaround for dvorak layoutaszlig2017-06-221-2/+1
| | | | | | | | | | | | | | | | | | This reverts commit 646e0cb3dede3880ed578d09b7337445990f5416. The layout checker has been fixed in NixOS/nixpkgs@44c64fef16ed566786c8. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
| * devhell: Mergo overrides/pkgs into vuizvuiaszlig2017-06-223-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Factor out devhell's services into vuizvuiaszlig2017-06-223-0/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Merge network expressions into machinesaszlig2017-06-223-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Those definitions are machine-specific, so IMHO it doesn't make sense to abstract those options because in the end they're bound to a specific machine nonetheless and won't be re-used. If one day it's necessary to re-use these definitions it still can be done very easily. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
| * Move devhell's machines into machines/aszlig2017-06-224-0/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | profpatsch/jmtpfs: Drop vuizvui packageaszlig2017-06-221-1/+1
|/ | | | | | | | | | | | | | | | | The package fails because the mtp-jolla.patch was already applied upstream, see the following build log: https://headcounter.org/hydra/log/d21f1590i2hs6xhgkdr00906ksnvgxfz-libmtp-1.1.13.drv This is the upstream commit by @Profpatsch that's now part of libmtp version 1.1.13: https://sourceforge.net/p/libmtp/code/ci/8919ebeef58251639454c2394c0274597be3df9c/ Tested by evaluating machines.profpatsch.katara. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch