about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* i3: Make workspace 10 reachable by the 0 key.aszlig2014-07-161-1/+1
| | | | | | There is no "10" key on most keyboards. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Correct package for Yesod scaffolder.aszlig2014-07-161-1/+1
| | | | | | | The scaffolder is now in yesod-bin, so we don't need all that cruft hanging around anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Add nix-prefetch-scripts.aszlig2014-07-161-0/+1
| | | | | | | I'm using these quite frequently, so it really makes sense to put it here by default. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Remove most Haskell libraries.aszlig2014-07-161-10/+0
| | | | | | | I'm using nix-build for Haskell development for quite some time and thus do not need to keep around that cruft in my environment. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kconf: Enable multiple devpts instances.aszlig2014-07-162-0/+2
| | | | | | | | | | | This is needed in order to run NixOS VM tests, because within the chroot the test driver starts the VDE switch, which in turn relies on posix_openpt() to function correctly. Which unfortunately doesn't, because CONFIG_DEVPTS_MULTIPLE_INSTANCES was not set so far. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.16-rc5.aszlig2014-07-151-3/+3
| | | | | | | Shame on me for running such an old kernel and thanks to @devhell for making me feel guilty. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Add NixOS options to configure workspaces.aszlig2014-07-145-58/+175
| | | | | | | | | | | This allows for a more dynamic workspace assignments, especially when varying between the number of heads. We now not only can use the NixOS module system to set workspaces but also assign applications to them. And the default workspace layout is to evenly spread out the heads among the available heads. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Move Chromium to workspace 6 on dnyarri.aszlig2014-07-141-2/+2
| | | | | | | This is because I've swapped screens and that wsConfig isn't nice, so we need to refactor it very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Drop package for fish shell.aszlig2014-07-142-44/+0
| | | | | | | This is already included in upstream <nixpkgs>, so we no longer need to let it rot here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add sidplayfp, version 1.1.0.1.aszlig2014-07-142-0/+30
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add some old crap called "twitchstream".aszlig2014-07-142-0/+113
| | | | | | | | | This is basically just a shell script that feeds the right command line switches into ffmpeg. And yes, it is a mess, as I was experimenting with it a bit, so the implementation is more or less just for preserving history ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move new packages from overrides/ into pkgs/.aszlig2014-07-1415-24/+27
| | | | | | | Those packages aren't actually overrides and thus it doesn't make sense to categorize them into "overrides". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3/conky: Auto-detect primary ethernet interface.aszlig2014-07-141-3/+9
| | | | | | | This is done by determining the route to Google's DNS server (8.8.8.8) and if it's not found, we're going to wait until it becomes available. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel source to a v3.16-rc4ish.aszlig2014-07-111-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Update to latest 0.16 mercurial branch.aszlig2014-07-013-0/+110
| | | | | | | This also needs nbxmpp as a dependency, so let's revert this entire commit when the next upstream version is released. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Fix patch agains kernel version 3.16.aszlig2014-07-012-0/+14
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Update patches to version 7r5.aszlig2014-07-011-7/+12
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Make expression for gajim more robust.aszlig2014-06-301-2/+2
| | | | | | | It might be that patches/postPatch will be no longer needed for the upcoming Gajim version, so let's not assume these attributes are there. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel and configurations to v3.16.0-rc3.aszlig2014-06-302-6/+13
| | | | | | | Moving to a new office, of course when i need to reboot anyway it's time for a new kernel, too. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Switch to official patch for v3.15.0.aszlig2014-06-122-90/+7
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel source to v3.15.aszlig2014-06-121-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Add forgotten kernel options.aszlig2014-06-031-3/+9
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Add LM90 sensor for GPU fan/temp.aszlig2014-06-031-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Enable EDAC in kernel config.aszlig2014-06-031-0/+5
| | | | | | Yeah! At least one thing that's better than the previous hardware! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Remove now obsolete kernelParams.aszlig2014-06-031-5/+0
| | | | | | | This was only a cable problem and is fixed now, so we don't need to enforce anything anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Switch to new disk layout.aszlig2014-06-031-5/+8
| | | | | | | | | We now have two disks only and the disk containing the bootloader from the previous layout is now gone so we need to write it to the new disks. Of course, we also need to switch two swap devices as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Correctly pass kernelParams.aszlig2014-06-031-5/+5
| | | | | | | We only defined kernelParams within the body of "let" but didn't actually use the attribute in 2df7ee103a01da34c9c82235bc286dde35e0f1ba. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Make CFQ the default scheduler again.aszlig2014-06-031-2/+2
| | | | | | | | BFQ doesn't seem to play nice with btrfs (deadlocks), so I'm disabling it at boot time for now until the issue is either resolved or I have time to debug this. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update BFQ scheduler patch to v7r4.aszlig2014-06-031-7/+7
| | | | | | | | | | | | | | | Upstream changes: * Modified the code so as to be robust against late detection of NCQ support for a rotational device. * Removed a bug that hindered the correct throughput distribution on flash-based devices when not every process had to receive the same fraction of the throughput. This fix entailed also a little efficiency improvement, because it implied the removal of a short function executed in a hot path. * Removed quoted strings split across lines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.15-rc8.aszlig2014-06-031-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Switch over to "new" (old) hardware.aszlig2014-06-034-26/+36
| | | | | | | | | | | | | | | | | | | | Unfortunately, the main board has died so I needed to quickly assembly a replacement machine. I haven't found a compatible main board for the last set of hardware so the "new" machine is now a Core 2 Duo with only 2 GB of RAM. I'm looking forward to more frustrations during build I already had with the i7 I had previously. Also, all these changes are untested for now, because I'm still shoveling the btrfs filesystems to two new hard disks, because the new mainboard only has 2 SATA ports. At the moment the GRUB bootloader is still on the old disk and as soon as the data is on the new disks, the GRUB install devices will change as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel sources to v3.15.0-rc5.aszlig2014-05-161-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Include manpages in erlang package.aszlig2014-05-061-0/+12
| | | | | | | | These manpages are intentionally _not_ within manpath, because they conflict with other manpages. In order to view those manpages you have to run erl -man instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Remove GCC wrapper.aszlig2014-05-021-1/+0
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Add more commonly used packages.aszlig2014-05-022-1/+15
| | | | | | | This means I can finally wipe out my env with all that crap I played around with but don't actually need. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3/conky: Autodetect CPU load and temperature.aszlig2014-05-021-24/+27
| | | | | | | | Device ordering is something that can vastly differ from system to system, so we're detecting the available CPUs on conky startup and pass the corresponding hwmon/cpu expressions to -t. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Factor out conky configuration for i3bar.aszlig2014-05-023-21/+97
| | | | | | | | Now we're generating full conky config files and we now have a new conky.nix, which generates shell scripts for the left and right screens, that run conky with the right configuration files. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move i3 configuration into its own module.aszlig2014-05-023-54/+58
| | | | | | | We want to keep common.nix nice and clean and in the long term the whole config should be more modular. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Rename fonts.extraFonts to fonts.fonts.aszlig2014-05-021-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move hardware.opengl.videoDrivers back to xserver.aszlig2014-05-022-3/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* chromium: Disable PepperPDF.aszlig2014-05-021-1/+0
| | | | | | I really prefer xpdf to view PDF documents. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Update to v7r3.aszlig2014-05-012-17/+17
| | | | | | This also rebases the patch against latest 3.15-rc3. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel and configs to v3.15-rc3.aszlig2014-05-013-5/+9
| | | | | | This also enables POSIX ACL and extended attributes for tmpfs now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Add patch fixing build for kernel 3.15.aszlig2014-04-222-0/+83
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Enable BFQ scheduler on all machines by default.aszlig2014-04-224-4/+10
| | | | | | | | | This adds the kernel patch to all machines and uses it as the default scheduler. Let's see when I need to scream at the edit of a commit message again, because the disk is busy and the editor is waiting for I/O. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Add kernel patch for BFQ scheduler.aszlig2014-04-222-0/+44
| | | | | | | This contains a small sed "patch" for supporting kernel 3.15, but will be dropped as soon as the new BFQ patches will be released for 3.15. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Disable packet filter for all machines.aszlig2014-04-221-0/+1
| | | | | | | | | | | | Enabling netfilter, especially connection tracking modules add unnecessary complexity to the systems. So I really don't want to increase the attack surface of the machine because of that. Just close the ports you don't need and listen locally for stuff that doesn't need to be public and we don't really need to have netfilter enabled. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel and configs to version 3.15-rc2.aszlig2014-04-223-16/+32
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Don't use NSAPI wrapper for Chromium.aszlig2014-04-211-1/+4
| | | | | | | We're now using the PepperAPI Flash version, which is mainly for testing purposes. In the long run, the goal is to get rid of Flash entirely. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Set allowUnfree for CPU microcode.aszlig2014-04-211-0/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>