about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix references to pulseaudio.aszlig2015-05-304-8/+8
| | | | | | | | In NixOS/nixpkgs@be5f408, the "pulseaudio" attribute has been removed to prevent accidentally using it if we just want to have the library, so let's fix this on our side. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: xmonadProfpatsch2015-05-281-2/+2
|
* katara: get locate workingProfpatsch2015-05-281-1/+1
|
* katara: fontconfigProfpatsch2015-05-281-0/+13
|
* katara: restructureProfpatsch2015-05-281-17/+34
|
* Config changes vor kataraProfpatsch2015-05-281-10/+45
|
* Merge pull request #5 (fix-typos) from devhell.aszlig2015-05-161-4/+4
|\ | | | | | | | | | | | | Fixes typos in the README for the modules subdirectory. I have a long track record of bad grammar and spelling, so thanks a lot to @devhell for the corrections.
| * README.md: Fix typosdevhell2015-05-151-4/+4
|/ | | | | We have a seriously good looking `README.md` here. Let's try to make it sound good too. ;-)
* modules/README: Fix "also is" vs. "is also".aszlig2015-05-151-1/+1
| | | | | | It's my not day for spulling and gremmar. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Fix typo for "listed".aszlig2015-05-151-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Add URL for the option reference.aszlig2015-05-151-0/+7
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Fix typos for module-list.nix.aszlig2015-05-151-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to v4.1-rc3-165-g110bc76.aszlig2015-05-151-2/+2
| | | | | | | Oh noes... we're too old, no particular reason for updating the kernel rather than the consistent urge to stay on mainline master. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Update to latest upstream master.aszlig2015-05-121-6/+2
| | | | | | Drop patch for NixOS/nixops#280 because it has been applied upstream. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Enable preferLocalBuild for mkChannel.aszlig2015-05-121-0/+1
| | | | | | | | It's kinda pointless to shovel the whole source to a remote machine and then shovel the whole source back to the Hydra master without doing any real compiling or other CPU-intensive processing. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Temporarily disable HDMI xrandr head.aszlig2015-05-121-1/+1
| | | | | | | That monitor died a few days ago (probably blown capacitor), so let's disable it until I got time to fix that monitor. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/bfqsched: Update to version 4.0.0v7r7.aszlig2015-05-121-4/+4
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Update kernel/config to 4.1-rc3.aszlig2015-05-123-17/+37
| | | | | | | | | It's about time I update these machines to the latest and greatest kernel. Not much to say about the config as it's mostly catching up with new options, although I'm still not happy to do configuration manually without generalizing common options. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/zsh: Add bell character at reset-title.aszlig2015-05-121-1/+1
| | | | | | | | This is useful to get an urgency hint as soon as for example a long running command completes while we're on another terminal and/or workspace. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Use new taskwarrior module.aszlig2015-05-092-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/programs: Add module for taskwarrior.aszlig2015-05-093-0/+85
| | | | | | | | | | | | | This comes with a patch to chainload taskwarrior configs and defaults to the config supplied by the module. So if we want to play around with different configuration values, it's easy to do by just adding a ~/.taskrc. Note that the patch uses nestlevel 2 for ~/.taskrc, because if we would use the default (1), the default configuration would be applied prior to parsing ~/.taskrc, which of course would balk our plan. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Preserve modes in <nixpkgs>.aszlig2015-05-081-1/+2
| | | | | | | | | | | This is cruicial for scripts such as nix-prefetch-git, which have the executable bit set and a builder is trying to call it. Instead, we're now preserving mode and set it writable for the current user directly afterwards, which essentially was my original motivation to not preserve modes. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Fix evaluation error with mkChannel.aszlig2015-05-071-1/+1
| | | | | | | | Since we now have everything within the vuizvui namespace at the top- level Nix expression we also need to reference mkChannel from within that namespace. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Don't build upstream nixpkgs.aszlig2015-05-051-1/+1
| | | | | | | | We don't want to build the whole <nixpkgs> package set, which I accidentally introduced when rewriting the package namespacing in 6ffc2e86150e625266e6836a1404a3e79fc74d49. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-05-041-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Properly namespace package under "vuizvui".aszlig2015-05-042-5/+5
| | | | | | | | | | | | | | | | For packageOverrides, we only want to return the vuizvui attribute set and nothing more. But if we want to import <vuizvui/pkgs>, we want to have access to <nixpkgs> as well, which is especially useful when using the <vuizvui> channel. However, in callPackageWith we're explicitely using the vuizvui attribute which should override the whole set of <nixpkgs>, so that references to vuizvui packages don't need to be explicitly namespaced within vuizvui itself and we can easily override existing packages with this method as well (like just define a vuizvui package and it overrides the dependency for all of vuizvui's packages). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Add Synaptics configuration.aszlig2015-05-041-0/+5
| | | | | | | | | | Not really optimized to what I would like it to, but much better than with the default setup and it's annoying tap buttons. Odds are greater that I might switch back to keynav instead of investing more time in configuring a pointing device. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Fix get-version-suffix in tarball.aszlig2015-05-041-0/+2
| | | | | | | | | | | | | | This gets rid of an ugly error message during nixos-rebuild, because the stock get-version-suffix tries to find <nixpkgs>, which will either lead to the wrong channel (if it even exists at all) or an ugly error. In both cases however, it doesn't have an effect, because the channel expression store path is read-only and ships with a .version-suffix already. It really only gets rid of ugly error messages. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Patch --find-file in nixos-rebuild.aszlig2015-05-041-1/+3
| | | | | | | We only did simple substitutions of <path/references/like/this/one> but completely ignored the --find-file argument of nix-instantiate. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Integrate machine into vuizvui.Profpatsch2015-04-301-0/+3
|
* Initial config for katara.Profpatsch2015-04-301-0/+126
|
* nixops: Fix nixpkgs reference in manual/resource.aszlig2015-04-291-1/+1
| | | | | | | | | The reason why the manual is needed is that we implicitly rely on the tarball job of the upstream project's release.nix. Let's fix that at some later point if we really need to (because it might become quite tricky). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Patch manual expression file as well.aszlig2015-04-291-1/+1
| | | | | | | | We could use find to recursively replace all references, but let's just do it one-by-one, because NixOps still has a few references that cannot be changed right now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Patch release.nix to use nixpkgs-path.nix.aszlig2015-04-291-0/+5
| | | | | | | So now we're seeing exactly the right thing happen: Builds breaking on Hydra when they *should* break. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Also patch vuizvui itself.aszlig2015-04-291-16/+29
| | | | | | | | | | | | | This is needed because we're relying on nixpkgs-path.nix to point to a valid nixpkgs tree, which we deliberately don't have anymore because we wanted to avoid references to <nixpkgs>. So providing vuizvuiSrc instead of vuizvui has another advantage that we now are no longer dependant on the channel name and also have a safety net (Hydra) to inform us of references to <vuizvui> in the form of failed builds and/or evaluations. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Provide a name to patchedNixpkgs.aszlig2015-04-291-2/+4
| | | | | | Yeah, probably will work a bit better without evaluation errors ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Work around NixOS/nixpkgs#7272.aszlig2015-04-292-2/+6
| | | | | | | | This causes an infinite recursion on evaluation if we import something from a module argument. So until we have an importsArgs module attribute we're going to refer to ../../nixpkgs-path.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Refactor to use patched nixpkgs.aszlig2015-04-291-13/+20
| | | | | | | | | | | | | | We now use nixpkgsSrc to make sure that Hydra builds will fail as soon as we hit a reference of <nixpkgs> in either vuizvui of nixpkgs. This also means, that we don't rewrite all of vuizvui and nixpkgs anymore and we only really need to rewrite nixos-rebuild.sh. Although we're using patched nixpkgs for Hydra builds, the release.nix still has a fallback to <nixpkgs> to make development easier (patching nixpkgs on every tiny change will take a long time otherwise). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Handle all <nixpkgs> paths with nixpkgs-path.nix.aszlig2015-04-2910-21/+36
| | | | | | | | | This file is just defaulting to <nixpkgs>, but we're going to substitue it by the channel generator. We also need to make sure that we don't have any other references to <nixpkgs>, but the latter can best be done on Hydra's side if we don't make <nixpkgs> available to vuizvui builds. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/gajim: Get rid of <nixpkgs>.aszlig2015-04-292-2/+2
| | | | | | | We want to ensure that we possibly have only *one* point where we decide on the path of nixpkgs, so it's easier to switch. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Add ".update-on-nixos-rebuild".aszlig2015-04-281-0/+1
| | | | | | | | | | We want to update the vuizvui channel alongside of the nixos channel in "nixos-rebuild subcommand --upgrade", because we include machines and NixOS modules. Might be splitted off into the machine-specific channels later. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Include nixpkgs tarball in channel.aszlig2015-04-281-19/+8
| | | | | | | | | | | | | | | Symlinking is actually a pretty bad idea, because we can only have one channel expression tarball. Evaluation however doesn't realize the referenced store paths, so we need to include them directly in the channel tarball. This also simplifies rewriting of the NIX_PATH references, because we need to recurse the directory structure only once. In order to be correctly recognized by nixos-rebuild and display useful version info, we generate .git-version and .version-suffix now as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Use vuizvui/nixpkgs in nixos-rebuild.aszlig2015-04-281-2/+7
| | | | | | | | | | We're now symlinking the nixpkgs store path into vuizvui/nixpkgs and reference it from within nixos-rebuild. Unfortunately we can't simply patch it with the hardcoded store path because we'll end up having the *previous* version on every nixos-rebuild instead of the new version delivered by the channel. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Fix passing attributes to mkChannel.aszlig2015-04-281-2/+2
| | | | | | | The problem here was that the attributes were added to the resulting derivation of mkDerivation instead of the input attribute set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Provide src attr to patchedNixpkgs.aszlig2015-04-281-0/+1
| | | | | | Well, it won't work without it, duh! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Tie nixpkgs to channel tarball.aszlig2015-04-281-0/+15
| | | | | | | | | | | Right now, this is done by replacing all NIX_PATH references with <nixpkgs...> by the path from Hydra input and silently hope that we won't replace the wrong reference ;-) Of course we're only replacing it in files that end with a .nix suffix, so we shouldn't accidentally replace documentation. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* channel: Add patchPhase to phases.aszlig2015-04-281-1/+1
| | | | | | Should make it easier to patch the channel expressions. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Remove pulseaudio override.aszlig2015-04-271-3/+0
| | | | | | It was redundant anyway, see previous commit (e08f399). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Remove obsolete attr useSystemd.aszlig2015-04-271-3/+0
| | | | | | | | No longer necessary since NixOS/nixpkgs@a2a3508. Now overriding with `systemd = null` should be enough to disable support for systemd (which we don't want anyway). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest upstream master.aszlig2015-04-211-2/+2
| | | | | | | | Yes, I know that it's only two more commits we don't really care about, but I needed my Hydra to evaluatio the jobset again in order to test channels. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-16 23:10:24 +0000