about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* machines: Allow to easily build ISO images.aszlig2015-06-271-1/+27
| | | | | | | | | | | | | I know it's a somewhat hacky approach to strip off "_module", "boot.loader" and "fileSystems" from the machine config, but that should be the options which are to be set by iso-image.nix but that way we can re-use the upstream module. Also, if one of our modules sets an option without a proper "vuizvui." namespace, we get an error as well. But it's our policy anyway to always namespace with "vuizvui." so it's even good to get an error here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* working geditOpenlab Labtop2015-06-241-1/+1
|
* labtop: geditOpenlab Labtop2015-06-241-0/+1
|
* labtop: ackOpenlab Labtop2015-06-161-1/+1
|
* labtop: packagesOpenlab Labtop2015-06-161-13/+14
|
* Labtop configOpenlab Labtop2015-06-161-0/+9
|
* Fix conflicting definitions for wireless.enable.aszlig2015-06-162-2/+2
| | | | | | | | | Since NixOS/nixpkgs@e212e07, boolean options don't default to true anymore if they're defined multiple times. So we need to explicitly override the value for networking.wireless.enable, because we have set it to false in the base profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Fix override of sessionVariables.aszlig2015-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | Ugh... I must have been quite distracted while writing this. Of course, doing a mkOverride on environment.sessionVariables instead of environment.sessionVariables.NIX_PATH is going to clear *all* sessionVariables instead of just replacing NIX_PATH. This time however, I did a short test with: nix-instantiate --eval --strict -E ' (import <nixpkgs/nixos/lib/eval-config.nix> { modules = [ ./modules/profiles/common.nix ]; }).config.environment.sessionVariables ' ... to make sure I just didn't break it *again*. Also, I'm going to immediately test this after the next evaluation, as my current system is lacking quite a lot of necessary sessionVariables. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Modify NIX_PATH for the channel.aszlig2015-06-111-7/+44
| | | | | | | | | | | That way we no longer need to rewrite anything from <nixpkgs> anymore, because we only need to build one generation of the system and have the right system-wide NIX_PATH for vuizvui. For now however, let's test this properly before we can drop the rewrite of nixos-rebuild and friends. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Fix references to pulseaudio.aszlig2015-05-304-8/+8
| | | | | | | | In NixOS/nixpkgs@be5f408, the "pulseaudio" attribute has been removed to prevent accidentally using it if we just want to have the library, so let's fix this on our side. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: xmonadProfpatsch2015-05-281-2/+2
|
* katara: get locate workingProfpatsch2015-05-281-1/+1
|
* katara: fontconfigProfpatsch2015-05-281-0/+13
|
* katara: restructureProfpatsch2015-05-281-17/+34
|
* Config changes vor kataraProfpatsch2015-05-281-10/+45
|
* Merge pull request #5 (fix-typos) from devhell.aszlig2015-05-161-4/+4
|\ | | | | | | | | | | | | Fixes typos in the README for the modules subdirectory. I have a long track record of bad grammar and spelling, so thanks a lot to @devhell for the corrections.
| * README.md: Fix typosdevhell2015-05-151-4/+4
|/ | | | | We have a seriously good looking `README.md` here. Let's try to make it sound good too. ;-)
* modules/README: Fix "also is" vs. "is also".aszlig2015-05-151-1/+1
| | | | | | It's my not day for spulling and gremmar. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Fix typo for "listed".aszlig2015-05-151-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Add URL for the option reference.aszlig2015-05-151-0/+7
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Fix typos for module-list.nix.aszlig2015-05-151-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to v4.1-rc3-165-g110bc76.aszlig2015-05-151-2/+2
| | | | | | | Oh noes... we're too old, no particular reason for updating the kernel rather than the consistent urge to stay on mainline master. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Update to latest upstream master.aszlig2015-05-121-6/+2
| | | | | | Drop patch for NixOS/nixops#280 because it has been applied upstream. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Enable preferLocalBuild for mkChannel.aszlig2015-05-121-0/+1
| | | | | | | | It's kinda pointless to shovel the whole source to a remote machine and then shovel the whole source back to the Hydra master without doing any real compiling or other CPU-intensive processing. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-08 08:14:11 +0000