about summary refs log tree commit diff
path: root/machines
Commit message (Collapse)AuthorAgeFilesLines
...
* labtop: antimonyProfpatsch2015-07-091-0/+1
|
* katara: various changesProfpatsch2015-07-091-47/+90
|
* 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>
* 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>
* 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>
* 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>
* 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
|
* dnyarri: Temporarily disable HDMI xrandr head.aszlig2015-05-121-1/+1
| | | | | | | That monitor died a few days ago (probably blown capacitor), so let's disable it until I got time to fix that monitor. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Update kernel/config to 4.1-rc3.aszlig2015-05-122-14/+34
| | | | | | | | | It's about time I update these machines to the latest and greatest kernel. Not much to say about the config as it's mostly catching up with new options, although I'm still not happy to do configuration manually without generalizing common options. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Add Synaptics configuration.aszlig2015-05-041-0/+5
| | | | | | | | | | Not really optimized to what I would like it to, but much better than with the default setup and it's annoying tap buttons. Odds are greater that I might switch back to keynav instead of investing more time in configuring a pointing device. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Integrate machine into vuizvui.Profpatsch2015-04-301-0/+3
|
* Initial config for katara.Profpatsch2015-04-301-0/+126
|
* machines: Work around NixOS/nixpkgs#7272.aszlig2015-04-292-2/+6
| | | | | | | | This causes an infinite recursion on evaluation if we import something from a module argument. So until we have an importsArgs module attribute we're going to refer to ../../nixpkgs-path.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Handle all <nixpkgs> paths with nixpkgs-path.nix.aszlig2015-04-293-5/+5
| | | | | | | | | This file is just defaulting to <nixpkgs>, but we're going to substitue it by the channel generator. We also need to make sure that we don't have any other references to <nixpkgs>, but the latter can best be done on Hydra's side if we don't make <nixpkgs> available to vuizvui builds. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add `openlab` user to group dialoutJohannes Fürmann2015-04-071-1/+1
| | | by default usb <-> rs232 interfaces which are used to connect to 3d printers are owned by the group `dialout`.
* Remove references to pkgs.lib within modules.aszlig2015-04-042-4/+4
| | | | | | | | We now no longer can (or even should) refer to pkgs.lib within modules since the merge of the module system improvements in NixOS/nixpkgs@889f72b. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: small mouse improvementOpenlab Labtop2015-04-031-1/+1
|
* labtop: device ID for grupOpenlab Labtop2015-04-031-1/+1
|
* labtop tmux & fish, mouse configOpenlab Labtop2015-04-031-8/+22
|
* labtop: Add slic3r to systemPackages.aszlig2015-04-021-4/+1
| | | | | | Also, since NixOS/nixpkgs@6b467ad we no longer need to use allowBroken. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Actually enable trackpoint support.aszlig2015-04-021-0/+1
| | | | | | | So far only emulateWheel has been set, but it doesn't work if you don't also enable the module. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Add pronterface to systemPackages.aszlig2015-04-021-1/+1
| | | | | | Its upstream package is called "printrun" and includes Pronterface. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Merge hardware config into one labtop.nix.aszlig2015-04-012-34/+25
| | | | | | | | | | This reverts the split up of the config from 55ec3a1 and puts all the stuff from the hardware configuration file into the main config. The reason for this is that vuizvui is structured so that the machine definition *IS* the actual hardware configuration which deviates from a common profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Improved Config for LabtopOpenlab Labtop2015-04-012-15/+59
|
* machines: Add an "use" attr for configuration.nix.aszlig2015-04-011-0/+3
| | | | | | | | Useful to call the machine from configuration.nix like this: (import <vuizvui/machines> {}).aszlig.mmrnmhrm.use Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Fix evaluation error.aszlig2015-03-181-1/+1
| | | | | | | | Regression is from 012fc8e4f399af06ab013ba136fe1d2cffb913f1. We have renamed the package, so let's put in the right attribute path. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move last machine from labernix to vuizvui.aszlig2015-03-182-0/+121
| | | | | | | | | | | | I've moved the restrictions config of Postfix into the default module for now and actually fixed it so that it's actually working (the config value wasn't set before). Also, the option type was incorrectly set to types.list, which aliases to types.listOf and expects another function (kind) as its argument. This marks the end of LaberNix and the beginning of a new Vuizvui! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Refactor overrides into my base profile.aszlig2015-03-181-1/+1
| | | | | | | | | | | | | | | | | Just moving the overrides into the base profile isn't enough here, as we wouldn't be able to refer to packages anymore, because the global nixpkgs.config override is now gone. Instead, we're now putting pkgs.vuizvui.* into the NixOS module system by a new profiles/common.nix, which is used unconditionally for all machines. Of course, the result of this is that we now need to change all references to vuizvui-related packages, which also is a good thing, because we will no longer shadow existing packages from upstream nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib: Refactor kernel configuration into a module.aszlig2015-03-183-85/+57
| | | | | | | | | | | | | | This means, we don't have that lib directory anymore and also we're not doing text substitution on the kernel config but instead override the original attributes. However, this needs to be refactored even further, so we can use the NixOS kernel system, which allows for certain modules to require specific kernel features. That way we can automatically create a kernel config from the list of required features and we only need to set a specific base config instead of specifying the *full* kernel config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Inline synergy.conf into machine "mmrnmhrm".aszlig2015-03-181-1/+20
| | | | | | | | Thus we now got rid of the cfgfiles directory, especially because the Synergy server config file is rather small, so inlining makes sense here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Integrate heinrich+labtop from labernix.aszlig2015-03-183-0/+217
| | | | | | | | | | | So far I'm not quite sure whether mailserver really belongs to labnet, so I'm leaving it at the labernix subtree. Maybe it even makes sense to just make it a profile until we have it on a real machine. We no longer need common.nix for these machines, because it is already done via callMachine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move common{-workstation}.nix into profiles.aszlig2015-03-186-9/+7
| | | | | | | | | | | | Both files are specific to my machines only and need to be generalized in order to be useful for anyone else. Moving these files has a few other censequences, such that we now need to automatically import the module-list.nix in callMachine. Speaking of module-list.nix, the file is now alphabetically sorted. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Properly namespace module attributes.aszlig2015-03-182-4/+4
| | | | | | | | So far the modules were still using the old naming scheme of vuizvui.name where name is the corresponding module name directly instead of the category. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add a small README about contribution.aszlig2015-03-181-0/+4
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/mmrnmhrm: Fix reference to cfgfiles/.aszlig2015-03-181-1/+1
| | | | | | Whoops, forgot about this one in 2b8256b. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Move own machines into machines/aszlig.aszlig2015-03-188-7/+27
| | | | | | | | | | | Introduces callMachine in machines/default.nix, which returns an attribute set containing the (input) configuration and also a build attribute containing the output configuration and thus also the builds. However, we still have references to ../../common-workstation.nix which we need to refactor very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>