about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* collections: Renome MPlayer to mplayer.aszlig2013-02-071-1/+1
| | | | | | | | This is due to the following commit in nixpkgs: NixOS/nixpkgs@f59881fc30d3e72d72f6f2e9e3688226bea0d2e9 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Refactor into different override types.aszlig2013-01-141-41/+47
| | | | | | | | | | | We now have arg overrides and derivation overrides. Both are implemented using mapOverride, which allows to specify overrides in batches using dotted attrset nesting. In addition new packages are now clearly separated away and alphabetically ordered, so that it's easy to add another new package to the list. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Move blop into a subdirectory.aszlig2013-01-142-14/+17
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Move libCMT into a subdirectory.aszlig2013-01-142-23/+26
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Move pvolctrl into a subdirectory.aszlig2013-01-142-33/+36
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Move librxtx_java into a subdirectory.aszlig2013-01-142-22/+25
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Move axbo into a subdirectory.aszlig2013-01-142-74/+77
| | | | | | So, first package to be managed using the callPackage mechanism, more to follow. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Reindent and add callPackage support.aszlig2013-01-141-205/+208
| | | | | | | As we now refer to "self" for the overrides package collections itself, we need to go one level deeper in indentation inside the overrides. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move catapult env from overrides into envs.aszlig2013-01-142-13/+13
| | | | | | | This one was actually missing from commit 5cd07981d83f080775d6f144a940e05a4cc7310c. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Reference old package with "pkgs.".aszlig2013-01-141-5/+5
| | | | | | | This is necessary to prevent infinite recursion. Of course a package override has a hard time overriding itself, right? :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Move kernel/hetzner/rdwarf to ../envs.aszlig2013-01-142-28/+28
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Completely separate environments.aszlig2013-01-143-10/+17
| | | | | | | | | Environments are now handled through nixpkgs/config.nix and get all packages from nixpkgs plus the packageOverrides in ../overrides. So we can actually remove "p" in overrides/default.nix which was recursively referencing the overrides attrs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Move aszlig-env into ../envs.aszlig2013-01-143-16/+17
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Move packageOverrides into ../overrides.aszlig2013-01-142-283/+287
| | | | | | | This currently just to clearly separate these from the nixpkgs configuration and will be refined further in upcoming commits. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Add binutils to system environment.aszlig2013-01-141-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Add hexedit instead of htop.aszlig2013-01-141-1/+1
| | | | | | Remove htop, because it is now in the system environment. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Enhance build for axbo-research.aszlig2013-01-141-9/+89
| | | | | | | Still not usable, but at least now it should possible to install it. Now also adds librxtx_java as a dependency instead of the bundled one. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Update kernel to v3.8.0-rc3.aszlig2013-01-101-3/+3
| | | | | | Actually it's a few commits past rc3 :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Use the new xrandrHeads option for xorg.aszlig2013-01-101-15/+1
| | | | | | Just committed the new multi head option upstream at NixOS/nixos@0129717. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Add synergy call and configuration.aszlig2013-01-092-0/+22
| | | | | | | | | | | | So, now we no langer need to issue synergys by the window manager or in the shell, just log in and everything is set up :-) Well, of course you should only do something like this in a trusted environment, because this means, that mouse movements and keystrokes are sent unencrypted! Be sure to set up a SSH tunnel or something similar if you're in a hostile environment. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Provide fixed default XRandR properties.aszlig2013-01-091-1/+19
| | | | | | | In my case this is just dual head for this machine. Synergy is not yet added to the NixOS configuration, but this is in preparation for it to work. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common.nix: Start GnuPG agent by default.aszlig2013-01-091-0/+3
| | | | | | | I still don't see the reason to start the OpenSSH agent by default, because GnuPG has SSH agent support built-in as well. So, let's disable the SSH agent. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Avoid repetitious use of "with pkgs".aszlig2013-01-091-9/+11
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Move package list into ../collections.aszlig2013-01-092-79/+83
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Update to kernel 3.8.0-rc2.aszlig2013-01-091-3/+3
| | | | | | 3.8.0-rc1 is quite old, so we really _need_ to upgrade, right? :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common.nix: Add a few more system-wide packages.aszlig2013-01-091-3/+10
| | | | | | | | I use things like compression tools, psmisc (esp. fuser), file, vlock and htop as other users (well, "root" comes in mind ;-) as well, so it makes sense to make it available system-wide. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common.nix: Add user "aszlig" by default.aszlig2013-01-091-0/+11
| | | | | | | This is especially useful in case someone wants to build the system from scratch and doesn't remember group memberships anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Add xpdf to aszlig-env.aszlig2013-01-091-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Add manpages to aszlig-env.aszlig2013-01-091-0/+2
| | | | | | | Might come in handy if you want to look up documentation to syscalls or libc calls. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Change to btrfs-only filesystem layout.aszlig2012-12-271-20/+5
| | | | | | | | | | | | | | | | | | So, this was a big adventure during the last days, because as you might have guessed from my older configuration this was a single-disk system. And that single disk failed, so I had to do data recovery instead of actual useful things in upstream NixOS. Fortunately I could recover everything, so nothing is lost... just a bit hard to find :-D Anyway, the new filesystem layout is now without LUKS and LVM, as I really want to have the flexibility to change striping/raid behaviour per file and possibly encryption as well someday. Well, as you might have noticed from the previous commit: ecryptfs is now built into the kernel and is currently my workaround for encryption until btrfs finally gets native crypto support. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs/config: Update kernel sources to 3.8-rc1.aszlig2012-12-271-3/+3
| | | | | | | In reality it's not the -rc1 tag directly but the master branch, so we are a few commits ahead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Remove obsolete comments.aszlig2012-12-271-28/+0
| | | | | | | | | | | | | | | | | The first one was for ffmpeg and x11grab support. Maybe I'll need this someday again if I happen to create a screencast again. But for now, just remove it. And the second one actually was an attempt to patch git to always sign commits. I have found a better and more selective solution by just adding the following alias: rebase-sign = !EDITOR=cat git rebase -i -x 'git commit --amend --no-edit -S' This should make it easy to sign all commits prior to pushing easily with: git rebase-sign upstream/master Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Update kernel config to version 3.8.0.aszlig2012-12-271-8/+16
| | | | | | | | | | This is still somewhat tedious to do because we need to revert 7e62e31f9f2bba0864ee8dd05b490c17387f5322, rebuild the nix file and then reset the revert. So, let's see when I start getting annouyed by this ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Add kernel configuration as an attrset.aszlig2012-12-272-5/+1281
| | | | | | | | | | | So, now we have lots of duplication which needs to be merged as soon as possible. This commit is obviously quite similar to the previous commit: 7e62e31f9f2bba0864ee8dd05b490c17387f5322 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Add kernel configuration as an attrset.aszlig2012-12-132-7/+1083
| | | | | | | | | So, this is the first step towards enhancing manual kernel configuration. Of course. this still looks a bit ugly because I personally don't like all-uppercase variable names for the kernel config and it still needs to have a few more expressions to properly handle value types (y/n/m, int, hex, string). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Update kernel source to latest mainline.aszlig2012-12-131-3/+3
| | | | | | Great, more updates from the 3.8.0 merge window :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* 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>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-24 15:36:41 +0000