about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* nixpkgs: Remove samplicator and vbindiff.aszlig2012-12-131-22/+0
| | | | | | | | | | Thes packages are now in upstream nixpkgs, please have a look at these commits for more details: NixOS/nixpkgs@e42dc52f4266cd39a0c3a30c2b12f9bc4360a7e5 NixOS/nixpkgs@6acc5289fc3a6c82de1b5099c0b27fbaca7cb252 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Directly override chromium package.aszlig2012-12-131-10/+7
| | | | | | | | | | | | The chromium package in upstream nixpkgs no longer uses the config attribute set in order to determine package build options, so we don't need to pass around fake config attributes anymore. In addition we now have a convenient chromiemBetaWrapper attribute which allows us to directly specify a specific channel, which is possibly already built by Hydra. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel sources to v3.7.0-rc7.aszlig2012-11-261-3/+3
| | | | | | | So, as promised, finally upgrading kernels on both machines to the latest version :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move kernel source expr into nixpkgs/config.nix.aszlig2012-11-263-12/+13
| | | | | | | | | | | | I'm just using the kernel source from mmrnmhrm, even though it's older than dnyarri's kernel config. The reason is because I want to make sure that a nixos-rebuild won't bring up any changes. It is rather unlikely, but I better want to make sure it won't happen. Afterwards, let's upgrade that old kernel, because the 3.7.0-rc7 tag was pushed by Linus just about two hours ago. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add nixpkgs/config.nix to common.nix.aszlig2012-11-261-8/+1
| | | | | | | | | This finally results in a consistent nixpkgs configuration among all machines and regardless of system env and user env. The config.git expression is no longer needed, as I'm using gitFull anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add expressions from ~/.nixpkgs/config.nix.aszlig2012-11-261-0/+338
| | | | | | | | | | | | Luckily, this file is already common on all my machines, so there's no need to consolidate anything, except that it may be useful to set nixpkgs.config to those expressions as well. The expressions in this new file are partly unfinished and not yet cleaned up packages I'm either working on or just needed "right now", so these will eventually become part of upstream nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move common NixOS expressions into common.nix.aszlig2012-11-263-333/+173
| | | | | | | This should at least clean up some of this mess and only hardware and filesystem specific stuff should now endup within the respective machine expressions. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/dnyarri: Fix import of kernel config.aszlig2012-11-261-1/+7
| | | | | | | | | Now all kernel configuration files should point to a consistent location (/home/aszlig/linux/.config). While I'm still not happy how the kernel configuration stuff is handled right now, this at least consolidates the issue a bit. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add network.nix and move configs into machines/.aszlig2012-11-263-0/+4
| | | | | | | | | | | The network.nix file roughly resembles a charon network expression file. Not that i intend to use charon in order to manage both machines right now, but it definitely makes sense that way. At the moment the network.nix file is just imported by /etc/nixos/configuration.nix on both machines, pointing to the respective attribute set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri/mmrnmhrm: Update NixOS configurations.aszlig2012-11-262-28/+103
| | | | | | | | | | | | | This is a somewhat messy change, as I experimented around with the new audio setup, had a filesystem corruption in-between, checked if the memory is okay, repaired the filesystem, added NIX_OTHER_STORES, found out that it doesn't work so well, as we might have impurities, proceeded with the audio stuff. So, that's how both configurations are now and I still need to clean up this configuration mess by having one single configuration "library" which is shared by both machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Add pin configuration patch for hda-intel.aszlig2012-11-261-0/+30
| | | | | | | | This should get pinning right for my shiny new 10.2-"allaround" surround system. This is no patch that should go into upstream kernel, because I'm just retasking all the jacks of the sound card to be output channels. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add configuration.nix from mmrnmhrm and dnyarri.aszlig2012-11-192-0/+379
This is the initial commit in an effort to merge Nix configurations of both machines. These configurations are the onmodified /etc/nixos/configuration.nix files. Signed-off-by: aszlig <aszlig@redmoonstudios.org>