about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* release: Fix import of nixpkgs.config.aszlig2013-10-301-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Add nixpkgs/config.nix to envs.aszlig2013-10-301-1/+3
| | | | | | | This is to incorporate overrides into the environments, as I'm using some custom packages. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Add environments in addition to machines.aszlig2013-10-301-3/+7
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Switch to Torvalds's Linux repository.aszlig2013-10-291-1/+1
| | | | | | | | This is instead of my local clone, which I used because I don't want to clone that repos over and over again (even if it's a shallow clone) for (re-)building the kernel. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add basic Hydra recipe for prebuilding machines.aszlig2013-10-291-0/+5
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to 3.12.0-rc7.aszlig2013-10-291-3/+3
| | | | | | ... plus two more commits ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Switch displayManager to lightdm.aszlig2013-10-291-4/+2
| | | | | | Just a try as of now, not sure whether I'll get used to it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Rename environment.nix to nix.package.aszlig2013-10-291-1/+1
| | | | | | This is because environment.nix is now obsolete in current <nixpkgs>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Enable S3TC by default in xserver.aszlig2013-10-201-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Fix path to VirtualBox program module.aszlig2013-10-201-1/+1
| | | | | | This is needed to cope with the nixos -> nixpkgs merge. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.12.0-rc6.aszlig2013-10-201-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Use synergy module instead of sessionCommands.aszlig2013-10-202-9/+6
| | | | | | | | Haven't noticed that we already have a service module for synergy, so let's use it instead of just executing the client/server on X session initialization. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.12.0-rc2.aszlig2013-09-251-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update source/config to latest mainline kernel.aszlig2013-09-143-7/+8
| | | | | | This updates the configs of both machines to the latest kernel. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Fix firmware path.aszlig2013-09-061-2/+4
| | | | | | | The firmware is now located within lib/firmware in the firmwareLinuxNonfree output poth. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Add user aszlig to group "video".aszlig2013-09-061-1/+1
| | | | | | This is needed for write access to DRI devices. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel source and configs to pre-3.12.aszlig2013-09-063-25/+21
| | | | | | | | This is within the current 3.12 merge window, so it still says 3.11, even though it already contains the shiny new stuff like lockrefs and more :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Enable audio controls using pvolctrl.aszlig2013-08-292-1/+6
| | | | | | | Since I use the new typematrix keyboard everywhere, which has audio control keys, why not use them? Hereby done :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Use remix packs for UQM.aszlig2013-08-151-0/+1
| | | | | | Hell yes! Of course we want it, don't we? :-D Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Swap heads for workspaces on dnyarri.aszlig2013-08-151-0/+7
| | | | | | | | This is because of the somewhat weird Synergy configuration, which I did because it couldn't map the heads correctly to the configured layout. I haven't checked whether this still is the case, but until that this workaround will do it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Add firmware RV710_smc and RV730_smc.aszlig2013-08-152-6/+14
| | | | | | | This now also makes specification of Radeon firmware way less redundant and adding new firmware will be a change in *one* place. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Allow to specify primary network interface.aszlig2013-08-152-1/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Do workspace assignment based on machine.aszlig2013-08-152-32/+45
| | | | | | | | For example on dnyarri I only have the browser running on workspace 1 and the XMPP client is running on another machine. These names are now generated from a list of workspace names according to the respective machine name. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Update references to firmware packages.aszlig2013-08-151-2/+3
| | | | | | | All firmware packages are now in firmwareLinuxNonfree and we only need to reference that one package. In addition, this adds the UVD firmware as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Update kernel config to version 3.11-rc5.aszlig2013-08-151-14/+30
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Add i3 config to system configuration.aszlig2013-08-142-1/+211
| | | | | | | | | | | This now embeds the i3 configuration file directly into the X session using the new option introduced by NixOS/nixos@9392329. The config file itself is not yet cleaned up and there is still quite a lot of cruft left over from my Debian system, but let's clean it up later. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Add redshift to X session.aszlig2013-08-141-0/+4
| | | | | | | After trying it for some time, I just decided it to be the default from now on, let the world turn RED :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel source and config to v3.11-rc5.aszlig2013-08-142-18/+40
| | | | | | | | | I should commit here more often, because between -rc4 and -rc5 there were changes in the configuration. But skipping the commits of release canidates before -rc5 probably doesn't harm that much, so let's jump into the future... swoooooosh... Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.10.0-rc6.aszlig2013-06-211-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Update changed configuration items.aszlig2013-06-071-2/+2
| | | | | | | | | | | | | | These are the changes I want to make on a permanent basis. The first is to _always_ "pop up" (it won't _really_ pop up because we're using single_roster_window) even when dnd or away. The reason is that urgent notifications aren't very disturbing while "in the zone", but on the other hand if I really _want_ to know, I want it to be seen even when away. In addition, this also sets chat state notifications to "composing_only". I'm sick of messages like "HEY!? Why aren't you paying attention!?" or "Why did you close the window?". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Enable speller and use DE and EN languages.aszlig2013-06-072-2/+4
| | | | | | | | Might get annoying someday, but until this is the case, let's activate it. This of course needs the aspell dictionaries for german and english, so add them to the env collections as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Enable 32 bit DRI modules for X server.aszlig2013-06-071-0/+2
| | | | | | Some proprietary vendors still don't provide amd64 versions for their software. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel to version 3.10.0-rc4.aszlig2013-06-071-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Remove pkgs already in common.nix.aszlig2013-06-071-3/+1
| | | | | | | It doesn't really make sense to put them in two environments, so let's remove them from aszlig-env. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim.nix: Change version to 0.15.4.aszlig2013-05-271-1/+1
| | | | | | We don't want to re-trigger the configuration file updater, do we? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Don't close (group)chat windows on ESC.aszlig2013-05-271-1/+1
| | | | | | | I'm a Vim user, so I tend to hit the escape key more often than people using other text editors ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim.nix: Don't confirm meta contacts.aszlig2013-05-271-1/+1
| | | | | | | I have lot's of those and I don't want to confirm them, because it's possible to separate them later if it was by accident. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Adjust styles of roster and emoticons.aszlig2013-05-272-8/+10
| | | | | | | | | | | | | | | | | For the emoticons, let's just turn them off. They're annoying as hell! The rest are just cosmetic changes to get closer to the UI I was familiar with TKabber. And well, I had nickname colors in chat windows mixed up so it was a bit hard for me to follow along (I always had cyan for my own nick and coral for other nick) because the own vs. other nick colors were swapped. One particularly annoying thing were those creepy animations of GTK+, so I'm turning them off. There is still the "smooth scrolling" in chat windows left, but that's a topic for a commit in the (hopefully not so) distant future :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim.nix: Always ask for offline status.aszlig2013-05-271-1/+1
| | | | | | I prefer to always specify a reason on why I'm going offline. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Disable Google Talk plugin.aszlig2013-05-271-2/+0
| | | | | | I'm switching away from G+ and Hangouts, so I'm not going to need it anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Convert gajim.config into a Nix attrset.aszlig2013-05-253-660/+824
| | | | | | | This should bring us to the point where it's easy to kill off some repetition in the config file by defining functions for those repetitive values. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move over from TKabber to Gajim.aszlig2013-05-254-22/+782
| | | | | | | | | | | | | | This not only patches the desired configuration into Gajim itself but also enforces a specific GTK+ theme to be used for Gajim only. The main reason for that is to mimic the look of my previos TKabber theme and configuration. For the gory details, have a look at the patch. Basically we just use the config from the nix store as a default configuration file and only add changed lines to the configuration in the home directory. That way we can still play around with options while not killing our base configuration. If we want to make something permanent, we can just move it into the nix config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* fish: Correctly wrap Python tools.aszlig2013-05-201-7/+19
| | | | | | | | This inserts pythonPath directly into the corresponding script file instead of using wrapPythonPrograms or wrapProgram. It doesn't make sense to use a sh/bash script in order to load a fish tool, right? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Add fish version 2.0.0.aszlig2013-05-192-0/+32
| | | | | | Now let's try another shell, shall we? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* rxtx: Use prerelease version.aszlig2013-05-191-2/+2
| | | | | | | | | The stable version cases segfaults and other issues with 64 bit, so let's move over to the prelease version. Please have a look at: http://rxtx.qbang.org/wiki/index.php/Talk:Download#Linux.2CAMD_64.2C_.26_2.2 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* rxtx: Add lockdev library to dependencies.aszlig2013-05-193-2/+28
| | | | | | | This is primarily to ensure that the lock files reside in /tmp/ but I wonder if /run/lock should be set sticky on NixOS by default? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Add fixed axbo SPAC udev device name rule.aszlig2013-05-191-0/+5
| | | | | | | | This is useful in order to set the device symlink to /dev/axbo and to ensure that the owner is user "aszlig" (maybe this should be a group called axbo? but we can change that later) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Enable virtualbox extension pack.aszlig2013-05-171-2/+6
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Use 3DO videos for uqm by default.aszlig2013-05-171-0/+1
| | | | | | Of course we want the 3DO videos, just because the slides are boring :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* axbo: Fix package and get program to work.aszlig2013-05-171-11/+12
| | | | | | | This involves a bit more hackery, especially we need to use Java 6 in order to run, because the bundled Synthetica version is too old to support Java 7. Signed-off-by: aszlig <aszlig@redmoonstudios.org>