about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* lib/get-test: Fix collecting upstream NixOS tests.aszlig2015-12-111-2/+3
| | | | | | | | | | The upstream tests all have their attributes cleaned up by the "hydraJob" function, so we can't check for the "test" attribute. Luckily this isn't a problem, because we're only searching for "anything not plain attribute namespacing" anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Only import machines once.aszlig2015-12-111-4/+6
| | | | | | | | This removes a bit of redundant code and also makes instantiation with --eval-only a bit more convenient, because we're testing whether we have vuizvuiSrc and if not we're importing a plain path directly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Move gathering tests to lib/.aszlig2015-12-112-13/+20
| | | | | | | | | | So my gut feeling in 90c080e was't wrong after all, so we need to create jobs for all the tests the machines include. In order to make this easier, we're going to re-use the collection of all test attributes from release.nix so putting it in lib/ makes sense. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* services/i3: Add i3 test to requiresTests.aszlig2015-12-111-20/+24
| | | | | | | | We have that i3 dummy test in here for quite a long time, so it's actually time that the test will mean anything (even though the test really isn't doing anything right now). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add a few basic NixOS networking tests.aszlig2015-12-112-0/+16
| | | | | | | | This is basically just to get started and for testing whether our idea will actually work out as planned. My gut feeling is that Hydra explicitly needs jobs for these tests, but we'll see. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Pass tests attribute to modules.aszlig2015-12-111-2/+20
| | | | | | | | | | | | | | | | | | | | | | | This is going to be used in modules or configurations to include tests specific to the module, for example let's say you have a foo.nix module that defines a foo service and you have a test named "foo" in the tests.vuizvui namespace. You can use it like this: { config, tests, lib, ... }: { ... other options of the foo service module ... config = lib.mkIf config.foo.enable { vuizvui.requiresTests = [ tests.vuizvui.foo ]; }; } If a machine config enables the module foo (foo.enable = true) then the "foo" test is also a constituent of the machine channel for the machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Add a new requiresTests option.aszlig2015-12-112-1/+11
| | | | | | | | | | The idea is that modules can define a list of test jobs which need to succeed whenever the module is used. In the end this should make channel updates a bit less frightening for people not already confident in using NixOS. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* README: Replace content with a link to the manual.aszlig2015-12-111-31/+7
| | | | | | | | We don't want to have duplicate and different versions of documentation laying around, so let's just provide a link to the latest Hydra build of the manual. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Remove patch for nixUnstable.aszlig2015-12-111-9/+2
| | | | | | | | | This reverts commit c4915296f064587b7ead2c8ddb7bf42aeca522dc. We no longer need this because the nixUnstable version has been updated in NixOS/nixpkgs@2de76b275366a700f7f79709bf30d67358f2838a. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* doc: Add preliminary installation instructions.aszlig2015-12-112-0/+73
| | | | | | | | | | This pretty much resembles what we already have in README.md but will be extended by an improved bootstrap process. Because right now bootstrapping is a pain in the ass mainly because we need to include the binary cache public key and the correct NIX_PATH. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* doc: Add entities file and use it in index.xml.aszlig2015-12-112-7/+32
| | | | | | | | | This makes re-use of URL fragments or repeated links a lot easier. Unfortunately we need to declare the XML namespace for every entity that uses <link/> and xlink which is a bit ugly. :-/ Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Indent docbook files with 2 spaces.aszlig2015-12-111-0/+1
| | | | | | | Having 4 spaces indentation for docbook files is going to get a bit too far to the right. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* doc: Add an introduction to vuizvui.aszlig2015-12-112-5/+38
| | | | | | | | This should now be on the first page along with the TOC and the subsequent chapters/parts. All options are in a separate page so that the user isn't smacked in the face by a list of vuizvui options. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Turn manual into serveral chunks.aszlig2015-12-111-5/+23
| | | | | | | | | | | This allows us to write separate chapters/parts of documentation without getting one big HTML page with everything at once. Now the chunk.xsl by default chunks of <preface/> elements, so we'd like to control this by patching docbook5_xsl directly and prevent it from doing that. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Update vim-nix to latest master.aszlig2015-12-111-2/+2
| | | | | | | This includes a merge of my additional syntax file improvements as well as the addition of a license. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Factor out manual into doc/ directory.aszlig2015-12-102-14/+13
| | | | | | | | So far this has been inlined in release.nix, but if we want to have more documentation, we should modularize it into subdirectories. As an additional benefit we get better syntax highlighting for docbook files. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Move callMachine function to lib/.aszlig2015-12-102-63/+66
| | | | | | | | The function is gettin rather large, so it makes sense to move it into another file so that the default.nix in machines/ won't be cluttered up with all the implementation-specific details. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add attribute to build a VM.aszlig2015-12-101-0/+4
| | | | | | | | | | | | | | This is to make it easier testing various vuizvui machine configurations for example with my machine "mmrnmhrm" by using the following command: nix-build machines -A aszlig.mmrnmhrm The build product is a VM that can be started using: ./result/bin/run-*-vm Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* managed/notsure: Add kwallet to systemPackages.aszlig2015-12-101-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* managed/notsure: Enable pulseaudio for packages.aszlig2015-12-101-0/+1
| | | | | | | This should build all packages in systemPackages with PulseAudio support. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add a new managed machine "notsure".aszlig2015-12-102-0/+91
| | | | | | | I've added a "managed" namespace here, which should include all machines that are not my own but I manage for other people. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Update vim-nix to latest master.aszlig2015-12-081-2/+2
| | | | | | | | | This contains both (LnL7/vim-nix#1 and LnL7/vim-nix#3) of my syntax-related pull requests. Thanks to @LnL7 for merging. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Add DiffOrig command.aszlig2015-12-081-0/+3
| | | | | | | | Especially useful if you get a kernel panic and have swapfiles laying around. This command is actually from the Vim example config file and is documented in the diff-original-file help of Vim. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* services/vlock: Fix evaluation error.aszlig2015-12-081-1/+1
| | | | | | | | Regression introduced by 5e1ad35657c05f409a29ddc7a29501fc611111b0. Geesh, that's what happens if you're already tired out. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* services/vlock: Only include socket when enabled.aszlig2015-12-081-21/+23
| | | | | | | | Just stumbled over this... even systems that do not define vuizvui.user.aszlig.services.vlock.enable accidentally got the socket file, which now is no longer the case. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/packages: Add mumble.aszlig2015-12-081-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/grandpa: Update to latest upstream master.aszlig2015-12-081-2/+2
| | | | | | Contains a fix for the stage setup (bar 9 flipped upside down). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to version 4.4.0-rc4.aszlig2015-12-081-3/+3
| | | | | | This is -rc4 plus 16 commits ahead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Fix ftdetect support for plugins.aszlig2015-12-071-0/+1
| | | | | | | | Because I'm not using plugin managers and do things manually, I have missed to source all ftdetect files in order to correctly recognize the filetypes that are coming with plugins by its suffix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Add vader plugin.aszlig2015-12-071-0/+7
| | | | | | | For tests I'm using a separate Nix expression, but it's quite useful to have syntax highlighting for .vader files. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Combine vim-addon-nix with vim-nix.aszlig2015-12-071-5/+33
| | | | | | | | | | | | I want to have the syntax highlighting and indentation rules of @LnL7's vim-nix (https://github.com/LnL7/vim-nix) - or more exactly my pull request overhauling the syntax highlighting file (LnL7/vim-nix#1) - while having everything else from @MarcWeber's vim-addon-nix (https://github.com/MarcWeber/vim-addon-nix). At least until both projects hopefully merge :-D Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Patch "nomodeset" out of iso-image.nix.aszlig2015-12-051-1/+6
| | | | | | | | | | | | | | | | | | | | | This is a very hacky approach, because patching that file also requires us to patch the imports it's referencing. The first reason why I needed to patch is that there is no "modeset" you can add to kernelParams and re-enable modesetting that way. And the second reason is because we don't have something like mkRemove or mkFilter in the module system, so we could filter out items from a list. Another option here would be to mkForce-override the kernelParams, which would imply that we'd need to duplicate a lot of these options (for example init=...). So in the long run we surely need to have a better way to override lists, but until that I'm leaving it with the patched approach. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/grandpa: Update to latest upstream master.aszlig2015-12-051-2/+2
| | | | | | | Contains a few fixes/changes needed to make stage lighting operation a bit of a more "smooth" experience :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* packages: Remove miro and add gpodder.aszlig2015-12-051-1/+1
| | | | | | | | Finally finished switching to gpodder, because it's less buggy than Miro (for example it's without that whole gconf mess) and also it's maintained. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Add NIXPKGS_CONFIG env variable.aszlig2015-12-051-0/+8
| | | | | | | | | | | | | Having <nixpkgs-config> in PATH doesn't help in anything if we actually forget to add the right environment variable where we import the <nixpkgs-config> from NIX_PATH. The reason why I choose to use <nixpkgs-config> instead of directly specifying the config in NIXPKGS_CONFIG is that we now have _one_ environment variable (NIX_PATH) to override everything from the <nixpkgs> version to its config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Update Nix addon to latest upstream.aszlig2015-12-031-2/+2
| | | | | | | Among other fixes, this contains a small fix for multiline statements by @domenkozar, thanks a lot :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Fix execution of flake8 command.aszlig2015-12-031-0/+1
| | | | | | | Got a bit annoying over time to constantly get command-not-found errors, so it's time to fix it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Enable global nixpkgs config.aszlig2015-12-011-0/+1
| | | | | | | | | | | | | | Until now I had a ~/.nixpkgs/config.nix with content like this: (import <vuizvui/machines> {}).aszlig.mmrnmhrm.build.config.nixpkgs.config Unfortunately, this has side-effects on a lot of things, essentially whenever I import <nixpkgs> without a config attribute, so I'd like to disable this by just modifying NIX_PATH instead of either moving ~/.nixpkgs/config.nix out of place or replace all imports of nixpkgs with an empty config attribute. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Add option for global nixpkgs config.aszlig2015-12-011-7/+26
| | | | | | | | | | | | This should make creating ~/.nixpkgs/config.nix obsolete and we can solely decide whether we actually want these overrides by modifying NIX_PATH alone. The option isn't enabled by default, because this doesn't work if for example /etc/nixos/configuration.nix is not readable by the user using nix-env or importing <nixpkgs> by other means. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Use overrides for nixUnstable.aszlig2015-12-011-2/+2
| | | | | | | | Setting nix.package uses nixUnstable for the deamon but not for packages depending on Nix, so instead of setting nix.package, let's just override the "nix" attribute directly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Don't require libSystem in Nix.aszlig2015-12-011-0/+7
| | | | | | | | | | | | I'm using nixUnstable and without fiddling around, updating the channel or installing anything into a user environment is going to fail with a request of the impure paths /usr/lib/libSystem.dylib and /usr/lib/system. This patch is from NixOS/nix#688 and I'll keep it until the Nix tests on Hydra are succeeding and we can update nixUnstable in <nixpkgs>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Keep journal entries for 3 months.aszlig2015-12-011-0/+4
| | | | | | | | So far I tried to keep logs as long as possible, but in practice it turns out that I'm not really interested in logs that are a few years old. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Update kernel src/cfg to 4.4rc3.aszlig2015-12-013-25/+23
| | | | | | | | | | | | | Version 4.3-rc5 is from the stone age and we really want to have the latest and greatest :-) The kernel is actually not -rc3 directly but 5 commits ahead (current upstream master). I've cleaned up the config for mmrnmhrm a bit, though it is still quite messy and I might do it fully from scratch very soon[TM]. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* services/i3/conky: Use new config file format.aszlig2015-12-011-14/+17
| | | | | | | | | Since Conky 1.10.x there is a new LUA-based configuration file format. The old config file format is still supported and converted on-the-fly, but it might be removed in future versions, so let's move ahead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/bfqsched: Add patch for kernel 4.4.aszlig2015-12-012-0/+23
| | | | | | | | The __GFP_WAIT macro has been renamed in torvalds/linux@71baba4 and torvalds/linux@d0164ad introduced the gfpflags_allow_blocking() helper, which we're going to use to avoid false positives. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/bfqsched: Update to version 4.3.0-v7r8.aszlig2015-12-011-5/+5
| | | | | | | | | | I have no idea why the upstream patch went from v7r9 to v7r8 now, essentially reverting the changes described in a8b6eeb. But after checking the patch against kernel 4.4, there is quite a lot more to fix up in r9 rather than r8, so I'm crossing fingers and go with this instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Move bfqsched patch to its own directory.aszlig2015-12-012-1/+1
| | | | | | | We need to add our own patch and don't want to clutter up the kpatches directory. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge pull request #8 from Profpatsch/master.aszlig2015-11-162-1/+24
|\ | | | | | | | | | | | | | | | | Documents the setup procedure a bit. While I don't like it being in README.md and would rather have it in the manual, it's better to have *anything* rather than nothing at all. Thanks @Profpatsch.
| * vuizvui: set-up documentationProfpatsch2015-11-092-1/+24
| |
* | tishtushi: Revert patching Dragonfly quirk.aszlig2015-11-166-195/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f9f88e90b8ab41a97a86fa4ff8a501e0e0eea27. The reason why I'm reverting this is because while it indeed fixes the volume mapping, it doesn't fix my main problem that it takes a few seconds to go from 100% volume to the desired volume level that's currently set. So instead of applying this patch and maintaining it until it may eventually hit mainline, it's better to debug the original issue rather than applying a patch that _may_ fix an unrelated issue. Signed-off-by: aszlig <aszlig@redmoonstudios.org>