about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* pkgs/nixops: Update to latest upstream master.aszlig2015-10-301-2/+2
| | | | | | | Includes more fixes regarding "nixops ssh" which fix problems in relation to TTY allocation. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/nixops: Update to latest upstream master.aszlig2015-10-291-3/+3
| | | | | | | | As all my important changes to NixOps so far have either been pushed by me or merged in, this version now should contain all the fixes necessary to do painless deployment for Hetzner machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/taskwarrior: Rebase patch for v2.5.0.aszlig2015-10-241-7/+7
| | | | | | It got bumped to version 2.5.0 in NixOS/nixpkgs@f0d1766. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/nixops: Switch to vuizvui branch of my fork.aszlig2015-10-231-18/+3
| | | | | | | | | | | | | | | Instead of merging all those PRs via the patches attribute, I've now created a branch that has all those PRs merged, which are: * NixOS/nixops#201: Use dedicated SSH keypair for "none" backend * NixOS/nixops#348: Fixup and refactor Hetzner backend tests * NixOS/nixops#349: hetzner: Don't create /root/.ssh/authorized_keys * NixOS/nixops#350: Fix tests for the "none" backend So our version of NixOps now should now correctly cope with users.mutableUsers set to false. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tishtushi: Patch quirk for AudioQuest Dragonfly.aszlig2015-10-166-1/+195
| | | | | | | | | It's already in version 4.3-rc5, but the following patch seems to be more correct: http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096516.html Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/nixops: Update to latest upstream master.aszlig2015-10-141-2/+2
| | | | | | | This by coincidence is version 1.3.1 with our own patches (which still apply). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to version 4.3.0-rc5.aszlig2015-10-131-3/+3
| | | | | | | | Using -rc4 really feels rather old, so let's get it to latest upstream master, which is exactly -rc5 without any additional commits at the moment. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Add to synergy configuration.aszlig2015-10-132-0/+5
| | | | | | | | | Having to switch keyboards when I have my laptop at home is quite annoying, so let's add the laptop (tishtushi) to the synergy config but without setting a mouse region so it won't get more annoying than switching keyboards ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/mmrnmhrm: Change synergy keystrokes.aszlig2015-10-131-2/+2
| | | | | | | | | Having Menu/AudioPlay used for synergy isn't really a very good idea if some applications actually use those keys, so let's move on to a similar scheme as with my i3 config and use function keys to not collide with Super+1, Super+2, ... Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Revert kernel 4.3 VirtualBox patch.aszlig2015-10-121-12/+0
| | | | | | | | | | | | This reverts the following commits: * 3b50260bb166a70a661634b3496e920d21a3ae3d * d6e723dec33951120d8b8299fbb9e49e55cc1d91 The patch is no longer needed since the upgrade in NixOS/nixpkgs@5fee5c6 because the patch was already from upstream. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/aszlig: Remove CONFIG_CGROUP_BFQIO.aszlig2015-10-073-3/+0
| | | | | | Since the new BFQ patch, this option does no longer exist. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/bfqsched: Update to version 4.2.0-v7r9.aszlig2015-10-071-5/+5
| | | | | | | | | | | | | | | | | From the changelog: * IMPROVEMENT: Changed BFQ to use the blkio controller instead of its own controller. BFQ now registers itself as a policy to the blkio controller and implements its hierarchical scheduling support using data structures that already exist in blk-cgroup. The bfqio controller's code is completely removed. * CODE IMPROVEMENTS: Applied all suggestions from Tejun Heo, received on the last submission to LKML: https://lkml.org/lkml/2014/5/27/314 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Update kernel src/cfg to 4.3rc4.aszlig2015-10-073-19/+60
| | | | | | | | | | | | | It's actually v4.3-rc4 plus 34 commits ahead. Also I'm being a bit lazy if it comes to the configuration here, adding modules I probably won't need. That's because I currently don't have the time to read more into the details. Anyway, in the future I'd like to unify kernel configuration anyway, so the laziness hopefully won't stay around for very long. :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Enable kmscon.aszlig2015-10-072-0/+4
| | | | | | | | I'm going to remove legacy fbdev support from the kernel configurations, so in order to still have terminals besides the X server we need to enable this (also, kmscon allows more eyecandy if we want that). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Re-enable HDMI xrandr head.aszlig2015-10-071-1/+1
| | | | | | | | This reverts commit 6d823f636947701f98ee5943187f0a99f0827e72. Second screen on dnyarri is back :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Properly strip VirtualBox patch.aszlig2015-09-251-1/+2
| | | | | | | We need to strip off one path component, because the patches generated by Trac's diff viewer contain absolute paths. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Patch VirtualBox for kernel 4.3.aszlig2015-09-251-0/+11
| | | | | | | | | | I could have added this to the upstream <nixpkgs>, but we only include and support release versions. This fixes the following failed build for VirtualBox: https://headcounter.org/hydra/build/748430 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Force rebuilding GHC+packages.aszlig2015-09-101-0/+8
| | | | | | | | | | | | | | | | | | | | | I was glad that the issues because of the longstanding GHC determinism bug (https://ghc.haskell.org/trac/ghc/ticket/4012) happened less frequently with GHC 7.10. Unfortunately, they still happen, as reported by @Profpatsch at headcounter/deployment#19 so we're going to override the GHC derivation with an additional attribute that is exported into the environment of the builder. This attribute causes GHC and all dependant packages to be rebuilt on the Headcounter Hydra. The original issue was because we're using the official NixOS binary cache as well as building everything from source. It's helpful for not needing to rebuild the entire world, but for Haskell packages it's harmful until the mentioned GHC bug has been fixed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: Haskell dev packages (with hoogle)Profpatsch2015-09-101-0/+11
|
* katara: various changesProfpatsch2015-08-261-198/+284
|
* profiles/common: Use nix.nixPath to set NIX_PATH.aszlig2015-08-221-9/+7
| | | | | | | | | | | | | | | We were using environment.sessionVariables before, but NixOS/nixpkgs@3f1354a added an option exclusively for this. It internally still sets environment.sessionVariables, so it doesn't change anything for us because we're overriding the full list anyway. But should we switch from overriding to appending/prepending someday, we could get unexpected behaviour, so that's why I'm switching to nix.nixPath here. Thanks to @devhell for bringing this to my attention. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Fix option for virtualbox.aszlig2015-08-201-2/+2
| | | | | | | | The option is no longer called services.virtualboxHost but now virtualisation.virtualbox.host. See NixOS/nixpkgs@6440e9b for more details. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Only build ISOs if createISO is set.aszlig2015-08-131-1/+2
| | | | | | | | | | | | | | | | Here we have our actual implementation. Note however, that one can still build an ISO image out of any machine by using: nix-build machines -A machine.attr.iso.config.system.build.isoImage However, none of these ISOs are built by default, except for kzerza, which has vuizvui.createISO enabled. The implementation has one little goof as it creates empty attrsets if a particular machine doesn't have createISO enabled. But for our current purposes that's okay "enough". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kzerza: Enable building it as an ISO image.aszlig2015-08-131-0/+1
| | | | | | | | We only really need an ISO image for kzerza, as mentioned in the previous commit, because that's the one that's really dd'ed onto an USB stick. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/system: Add an option to build an ISO.aszlig2015-08-132-0/+13
| | | | | | | | | | | | | | Building ISO images for all machines really doesn't make sense if we only have _one_ machine at the moment, where we really use it (kzerza). So we now have an option which can be defined for a particular machine configuration, which is then going te be excempted from the ISO building process. The latter isn't yet implemented however, only the option is here right now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/packages: Add abook to systemPackages.aszlig2015-08-111-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/grandpa: Update to latest Git master.aszlig2015-08-081-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/grandpa: Update to latest upstream master.aszlig2015-08-081-2/+2
| | | | | | Includes changes for the new Rockfabrik dancefloor/stage setup. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Revert disabling hinotify tests.aszlig2015-08-081-7/+0
| | | | | | | | | | | | This reverts the following commits: b0a2a69: profiles/base: Temporarily disable hinotify tests. fc35a3d: profiles/base: Properly disable hinotify tests. These are no longer needed as it has been quickly fixed upstream at NixOS/nixpkgs@e75e0d9, thanks to @peti. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Properly disable hinotify tests.aszlig2015-08-081-5/+6
| | | | | | | | Using nixpkgs.config.haskellPackageOverrides isn't going to work for NixOS configurations, because the other packageOverrides will override the haskellPackageOverrides with a new instantiation of <nixpkgs>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Temporarily disable hinotify tests.aszlig2015-08-081-0/+6
| | | | | | | | | | | | | Build failure is here: https://headcounter.org/hydra/build/722122/nixlog/1/raw I'm overriding this in the base profile for now to get my main workstations up to date ASAP. Cc: @peti Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-08-081-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Update to version 4.1-v7r8.aszlig2015-08-081-5/+5
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri/mmrnmhrm: Update kernel+conf to v4.2-rc5.aszlig2015-08-083-36/+100
| | | | | | | It has been a long time (~2 months) since I've been back to my workstations, so there was a new kernel release in-between. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Add headcounter.org signing key.aszlig2015-07-291-0/+4
| | | | | | | Since NixOS/nixpkgs@e3a5bca, signed binary caches are mandatory, so let's set it in our default profile for vuizvui. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: skip libreoffice testsProfpatsch2015-07-091-1/+1
|
* labtop: antimonyProfpatsch2015-07-091-0/+1
|
* katara: various changesProfpatsch2015-07-091-47/+90
|
* pkgs/grandpa: Update to latest Git master.aszlig2015-07-061-6/+7
| | | | | | | | The current master version includes a few fixes I made for setting default values for the Rockfabrik stage setup, which is to be used by my machine called "kzerza" (booted solely via USB storage device). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Don't patch <nixpkgs> anymore.aszlig2015-06-301-15/+2
| | | | | | | | | | Since d2ff1a9, we now set a new NIX_PATH instead of patching <nixpkgs>, which is way less error-prone and get less unexpecting results if we evaluate against an unmodified <nixpkgs>. So, patching <nixpkgs> is obsolete and thus removed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kzerza: Restart GrandPA on failure.aszlig2015-06-291-0/+1
| | | | | | | | We don't want the ExecStopPost action to run whenever GrandPA exits with a failure state, because this would make debugging very nasty ("Noooo, don't shut doooooooow... DAMN!"), especially on read-only media. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kzerza: Power off system when GrandPA stops.aszlig2015-06-291-0/+2
| | | | | | | | | | | | This was the behaviour back then when NixOS still used upstart and after some searching I found that ExecStopPost is what we want here, despite its name (I'd imply that it is used in parts to stop the service rather than executed after the service has stopped). So in turn, it means that using Ctrl-Q within GrandPA shuts down the whole system. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Remove /boot options from ISO images.aszlig2015-06-291-1/+7
| | | | | | | | We can't really do a "mkForce {}" or "mkForce null" on the submodule type and the upstream module throws an error on null values, so we simply define a dummy fileSystem with the noauto option set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kzerza: Enable GPM by default.aszlig2015-06-291-0/+3
| | | | | | | | | | This has been enabled before, but got lost while refactoring my base profile in fb1ddce32989fdea137f2b225ae4c24d2badf3a4. It is okay to have it only in the workstation profile, but if it comes to kzerza, the GrandPA application depends on it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Always set CP437ish console font.aszlig2015-06-291-0/+1
| | | | | | | | | The default font changed to Terminus in NixOS/nixpkgs@0b68b92. I personally hate Terminus with a passion, so I simply don't want it to cause eye cancer on any of my machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Properly override ISO configuration.aszlig2015-06-291-9/+19
| | | | | | | | | | | | | | | | | | | | | | We now do it the exact opposite way than introduced in 27dce7b. Instead of evaluating the machine config and stripping off the options we don't want to conflict with the iso-image.nix module, we now wrap the iso-image.nix module itself and just mkForce the values we don't want to collide. The reason for this is that the previous implementation just didn't work because dependent module options from the machine config (for example config.system.build.*) were already evaluated and thus we end up with overriding configuration options but get an initrd with the machine options (which we actually want to override) instead of the fileSystem/boot options that come with the iso-image.nix module. Although I'm not quite happy with this approach, it's still better than the old one and if iso-image.nix gets conflicting options we at least get a better error message rather than the definitions simply being stripped off. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Set a proper boot loader label for ISOs.aszlig2015-06-281-0/+1
| | | | | | Introduced in NixOS/nixpkgs@f9bd72f24cfc8c160d144615522b0bc692cde9d0. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests: Fix test evaluation for heinrich.aszlig2015-06-271-2/+2
| | | | | | | Namespacing the options with "vuizvui." now leads to failing tests, which I probably should have checked in the previous commit, my bad! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/heinrich: Fix module option namespacing.aszlig2015-06-271-3/+3
| | | | | | | | | The machine was using only configuration-internal options, which is why I missed it when I was introducing a common namespace. Still, the machine needs to be refactored, but right now I'm just going to give it a proper namespace in order to fix evaluation of the ISO images. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Build ISO images for all machines.aszlig2015-06-271-0/+15
| | | | | | | | | Originally only needed for "kzerza", because that machine has always resided on an USB stick, but could be useful for "arilou" and others as well. That way you always have a (hopefully working) USB and CD image available for all machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-16 23:57:26 +0000