about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* test-chromium-build: Generate test scripts.aszlig2013-04-121-4/+11
| | | | | | | These scripts should make it easy to run throwaway Chromium settings without touching the main settings in ~/.config/chromium. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Fix kernelPackages attribute set.aszlig2013-04-122-2/+2
| | | | | | | Referring to kernelPackages recursively is no longer needed in current nixpkgs, so let's remove it :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Add a few more packages.aszlig2013-04-121-0/+6
| | | | | | | These packages were usually lurking around in my user env, so let's move them to the collections. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update TKabber SVN to revision 2010.aszlig2013-04-121-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Update kernel source and configuration.aszlig2013-03-032-3/+8
| | | | | | | This updates the kernel source to the latest mainline master revision plus the fake extra version. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri+mmrnmhrm: Use inherit for kernel src info.aszlig2013-03-012-4/+3
| | | | | | | No changes in functionality, only style change, as using inherit is much easier on the eyes than repeating those attributes twice. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Update kernel config and source.aszlig2013-03-012-4/+4
| | | | | | | | | This time we now divert from the mainline kernel, as I have added a fake version (-pre-rc1) in order to properly test my VirtualBox patches. They differentiate the version by using preprocessor macros, which is still 3.8.0 during the merge window. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Update kernel config and source.aszlig2013-02-282-4/+11
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Enable kernel support for Wacom tablets.aszlig2013-02-281-0/+4
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kernel/mmrnmhrm: Update kernel to latest master.aszlig2013-02-252-3/+7
| | | | | | | This updates the kernel source to the latest version in Linus' tree and adds the new config options to mmrnmhrm's configuration. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Clean up ugliness in function headers.aszlig2013-02-222-2/+2
| | | | | | No feature changes, it just caused eye cancer to me. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kconf: Update mmrnmhrm's kernel config to 3.9.aszlig2013-02-221-4/+12
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kernel: Update to latest linux master branch.aszlig2013-02-221-3/+3
| | | | | | Yeah, let's get the latest bugs from the merge window :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Add "aszlig" to the audio group.aszlig2013-02-071-0/+5
| | | | | | | | | | | Pulse doesn't seem to get the right permissions to the audio devices. I'm not sure whether this is a multi-seat configuration problem or if the culprit is because synergy doesn't count as a physical pointer in some cases. This needs some research, I think. But maybe it's even a better idea to run pulseaudio as a systemd service, because it's a remote sink for dnyarri as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Catch up with mmrnmhrm's xserver config.aszlig2013-02-071-1/+9
| | | | | | | This should now bring the synergy and multi head config in sync, so both machines blend into a seamless 4-monitor-system. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Update kernel configuration to v3.8.aszlig2013-02-071-2/+12
| | | | | | | These changes were lying around uncommitted for quite some time, so better commit now than never :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Add tkabber urgent plugin.aszlig2013-02-073-0/+28
| | | | | | | | | This is particularily useful sometimes to activate if you actually _want_ to be interrupted in your work flow. It is within the Tkabber 3rd party plugins repository. So maybe we want to package the plugin repository in upstream nixpkgs? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to latest master.aszlig2013-02-071-2/+2
| | | | | | | Of course just for the sake of not being stuck an a specific -rc tag, this is gonna put us a few commits forward into the futuuuuuuuureeeee, err, yes :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.8.0-rc5.aszlig2013-02-071-3/+3
| | | | | | We're not in the dark age anymore, so let's move forward! :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Factor out kconf generator into lib/default.nix.aszlig2013-02-073-25/+21
| | | | | | | This should get rid of the duplication already marked with XXX and of course should make the machine-specific configuration way easier to read. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* 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>