about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Move zsh override into my zsh module.aszlig2015-03-182-6/+8
| | | | | | | | Unfortunately, we can't just explicitely override the zsh package and refer to it in systemPackages, so we need to override it using nixpkgs.config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge labernix packages into vuizvui pkgs.aszlig2015-03-185-13/+4
| | | | | | | | | | | | It's currently only BeeHive, but our goal is to dissolve labernix step by step until nothing is left. Also, we're now no longer namespace the pkgs with vuizvui directly in the package list. Before it wasn't even namespaced correctly (except for inside pkgs/ directly) and we did override the packages using the dirty approach in overrides/. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests: Refactor to something similar as machines/.aszlig2015-03-184-7/+23
| | | | | | | | | Similar to callMachine, we now have callTest. The latter uses make-test.nix, so we don't need to import the file explicitly anymore and can just write our VM test by using either an attrset or a lambda function which also gets our own packages in a vuizvui namespace. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests: Properly namespace the VM tests.aszlig2015-03-183-4/+4
| | | | | | | We're going to write much more tests and don't want to clutter up the tests/ directory. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Move zsh config into "base".aszlig2015-03-182-2/+1
| | | | | | | | | | I want to have a useful zsh configuration on all of my machines, so let's not only enable it for the workstation profile. Also, this removes a redundant zsh reference in the systemPackages of the base profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Refactor own Vim version into its own module.aszlig2015-03-184-37/+48
| | | | | | | | | | Gets rid of my own crap in the vuizvui pkgs namespace and makes it easier for other users to selectively use my Vim configuration. It's still not as fleshed out as I wish it would be, but let's do that later if needed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib: Refactor kernel configuration into a module.aszlig2015-03-186-102/+111
| | | | | | | | | | | | | | This means, we don't have that lib directory anymore and also we're not doing text substitution on the kernel config but instead override the original attributes. However, this needs to be refactored even further, so we can use the NixOS kernel system, which allows for certain modules to require specific kernel features. That way we can automatically create a kernel config from the list of required features and we only need to set a specific base config instead of specifying the *full* kernel config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Introduce a new "system" category.aszlig2015-03-181-0/+4
| | | | | | | | On upstream nixpkgs we have "system" and "hardware" but in our case the amount of modules should be rather small, so it doesn't make sense to separate those categories. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Inline synergy.conf into machine "mmrnmhrm".aszlig2015-03-182-19/+20
| | | | | | | | Thus we now got rid of the cfgfiles directory, especially because the Synergy server config file is rather small, so inlining makes sense here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Refactor Gajim config + patches into a module.aszlig2015-03-187-47/+62
| | | | | | | | Now we no longer pollute the repository root with Gajim (for example in cfgfiles/) and it's also easier to enable/disable my personal Gajim config among my own machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests: Integrate heinrich VM test from labernix.aszlig2015-03-182-1/+2
| | | | | | | | Using "import ../machines" is a bit ugly here, so we might want to integrate this into make-test.nix, but other than that it should work nevertheless. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Integrate heinrich+labtop from labernix.aszlig2015-03-183-3/+5
| | | | | | | | | | | So far I'm not quite sure whether mailserver really belongs to labnet, so I'm leaving it at the labernix subtree. Maybe it even makes sense to just make it a profile until we have it on a real machine. We no longer need common.nix for these machines, because it is already done via callMachine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/workstation: Use package.nix as a list.aszlig2015-03-182-101/+95
| | | | | | | | | Using package.nix as a module would mean that we would need to check for the workstation profile in there again, so let's just make it a list and import it from the default.nix where we only once check whether the profile is enabled. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests: Integrate make-test.nix from labernix.aszlig2015-03-182-10/+8
| | | | | | | We already have abstracted the injection of the module list in labernix, so we can reuse this with only minor changes. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* packages.nix: Move into the workstation profile.aszlig2015-03-183-2/+2
| | | | | | | | The profile is now a directory with a default.nix, which makes it more managable without shovelling the whole packages.nix into the profile module. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move common{-workstation}.nix into profiles.aszlig2015-03-1811-212/+226
| | | | | | | | | | | | Both files are specific to my machines only and need to be generalized in order to be useful for anyone else. Moving these files has a few other censequences, such that we now need to automatically import the module-list.nix in callMachine. Speaking of module-list.nix, the file is now alphabetically sorted. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Move my modules into category dirs.aszlig2015-03-1811-5/+5
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Properly namespace module attributes.aszlig2015-03-188-26/+38
| | | | | | | | So far the modules were still using the old naming scheme of vuizvui.name where name is the corresponding module name directly instead of the category. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Move own stuff into modules/user/aszlig.aszlig2015-03-1811-5/+5
| | | | | | | Some modules might be generic enough to be included in modules/ directly, but for now, let's just get them out of the way. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* README: Update links to the Hydra builds.aszlig2015-03-181-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* README: Depersonalize the description.aszlig2015-03-181-5/+4
| | | | | | They're no longer just my own configs, so let's state that accordingly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add a small README about contribution.aszlig2015-03-181-0/+34
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add a small README about contribution.aszlig2015-03-181-0/+4
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/mmrnmhrm: Fix reference to cfgfiles/.aszlig2015-03-181-1/+1
| | | | | | Whoops, forgot about this one in 2b8256b. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Move own machines into machines/aszlig.aszlig2015-03-1810-17/+30
| | | | | | | | | | | Introduces callMachine in machines/default.nix, which returns an attribute set containing the (input) configuration and also a build attribute containing the output configuration and thus also the builds. However, we still have references to ../../common-workstation.nix which we need to refactor very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Inherit license from labernix.aszlig2015-03-184-235/+13
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Subtree-merge labernix into vuizvui.aszlig2015-03-1818-0/+1615
|\ | | | | | | | | | | | | | | | | | | | | | | This is the first step of generalizing the configurations into a big repository where people can track their NixOS configurations and write modules. In the next few steps I'm going to gradually refactor everything in labernix/ into the main tree and factor out personal stuff into separate namespaces. Also, this will involve a license change from APACHE-2.0 to GPL-3.0.
| * Integrate Postfix config into module-list.nix.aszlig2015-03-184-7/+6
| | | | | | | | | | | | | | | | This currently is just a dummy module for now with a big fat TODO, but at least we now have a homogenous module namespace starting with "labernix." and categorized by services/config/tasks/whatnot. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * tests/make-test: Actually use testArgsWithCommon.aszlig2015-03-181-6/+8
| | | | | | | | | | | | | | | | I shouldn't be wondering why it doesn't find the module options if we prepare the override but don't actually use it. So this also fixes a few other errors related to that we're now actually using our own modules. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * modules/labernix-pkgs: Fix stupid typo.aszlig2015-03-181-1/+1
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * tests: Add make-test.nix with labernix packages.aszlig2015-03-172-1/+27
| | | | | | | | | | | | | | | | We're going not only to modify all VM test nodes, but also inject the updated pkgs into the tests own arguments, so we can refer to them even outside of testing machine configuration modules. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Add common.nix and use it for all machines.aszlig2015-03-174-2/+12
| | | | | | | | | | | | | | | | We now have "pkgs.labernix" available for every machine. Also, we're deactivating the packet filter by default, so we can use it whenever we _really_ need it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * modules: Add module-list with labernix packages.aszlig2015-03-172-0/+10
| | | | | | | | | | | | | | | | | | | | We're going to add this as common modules for all machines in the repository, so we can define own options easily and without the need to refer to the modules directly. Also, we can easily create a manual for labernix specific modules. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * pkgs/beehive: Update to latest upstream master.aszlig2015-03-171-2/+2
| | | | | | | | | | | | This includes pull request muesli/beehive#49 from @Profpatsch. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * release.nix: Add pkgs to the Hydra jobs.aszlig2015-03-171-0/+6
| | | | | | | | | | | | | | We want to be easily able to fetch the store paths and to monitor build results. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Add package beehive and dependencies.aszlig2015-03-173-0/+403
| | | | | | | | | | | | | | | | | | Roughly generated using go2nix, but patched a few of the examples out and cleaned up the dependencies expression. Somehowe go2nix fetched appstats, which did not build but somehow wasn't required in order to build beehive. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * README: Add URL to the continuous builds.aszlig2015-03-171-0/+1
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * release.nix: Include VM test for heinrich.aszlig2015-03-171-1/+6
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/labtop: Fix evaluation of systemPackages.aszlig2015-03-171-1/+4
| | | | | | | | | | | | | | | | We don't have a Nix package for pronterface yet and slic3r is broken right now, so we need to investigate it after the first build from Hydra. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * default.nix: Simplify/split up into release.nix.aszlig2015-03-172-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, using builtins.readDir isn't very good idea here, because all file references from expression files found via readDir will have imports relative to the Nix store. We can only work around it if we copy the whole source tree into the store, but for the sake of simplicity it's also better if we use explicit imports. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines: Add dummy boot/fileSystems attributes.aszlig2015-03-173-0/+12
| | | | | | | | | | | | | | | | As these machines are not deployed yet, we need to put in dummy values, because if we're not building VMs those attributes are expected to be set and end up with an evaluation error. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Add a default.nix for referencing machines.aszlig2015-03-171-0/+17
| | | | | | | | | | | | | | | | | | At the moment this is also the release Nix expression we're going to use for Hydra. Right now, the machine expressions don't evaluate because they're lacking hardware information. But apart from that we should get out full system builds afterwards. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * labtop: Add some commonly needed packages.aszlig2015-03-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | At least, this is after I asked around who wanted to have which software on the LabTop by default. For repetierhost, we don't have a package yet and we're going to package it first. Unfortunately it's proprietary software, so we may need to patchelf :-/ Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * labtop: Switch to US keyboard layout.aszlig2015-03-141-2/+2
| | | | | | | | | | | | | | The hardware has a US keyboard layout, so let's match it with the configuration. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Add rudimentary mail server config.aszlig2015-03-112-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | A still unfinished version of @waaaaargh's ansible deployment: https://github.com/waaaaargh/mailserver-ansible The idea here is to create a NixOS profile specific to large-scole mail server deployments. All with a 100% fleshed out Postfix configuration of course :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * COPYING: Default to GPLv3 even for non-Nix files.aszlig2015-03-111-0/+3
| | | | | | | | | | | | | | | | I found this to be a better idea rather than leaving them unlicensed, so in the event someone likes to distribute the repository it shouldn't raise questions about whether it's legal. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Release the sources under the terms of the GPLv3.aszlig2015-03-112-0/+688
| | | | | | | | | | | | | | | | Right now, the license is only for all Nix expression files, which means, that patches and other files are unlicensed for now. If someone would like to redistribute them, feel free to open an issue. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Add preliminary VM test for heinrich.aszlig2015-03-111-0/+51
| | | | | | | | | | | | | | | | | | | | Currently, this one is unfinished and I was working on it while I've been at the Lab and don't have a clue right now where I left off. But it's still a good idea to add it here, so someone[TM] can finish it someday. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Move heinrich and labtop into machines/.aszlig2015-03-112-0/+0
| | | | | | | | | | | | | | If we want to make tests or modules for those machines, it makes sense to properly namespace them. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Add machine expression for heinrich.aszlig2015-03-111-0/+139
| | | | | | | | | | | | | | | | Posted this at openlab-aux/labnetz-doku#2 already, so it's more or less the same but with minor enhancements. For example the routes are now specified using an attribute set and we have option declarations now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-10-20 21:05:41 +0000