about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* default.nix: Hook in functions from lib/aszlig2016-05-031-2/+1
| | | | | | | | | | | | | | We now have a common library for Vuizvui functions, so we can expose it using the default.nix to make them accessible via (import <vuizvui> {}).lib ... very similar to (import <nixpkgs> {}).lib in addition to the shorter form (which is also possible for <nixpkgs/lib>): import <vuizvui/lib> Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-machine: Shorten line lengthsaszlig2016-05-031-3/+3
| | | | | | | No changes of functionality, but having paths with a common ancestor that flood the horizontal space isn't really nice to view side-by-side. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-machine: Get rid of extraConfig attributeaszlig2016-05-033-17/+8
| | | | | | | | | | | | Right now we're not using the system attribute at all and we can still use nixpkgs.system to set the attribute for a particular machine. So we now can pass configuration attributes to the second argument of callMachine *directly* instead of using specific subattributes, which I think feels is a more natural way so users don't need to look up that "extraConfig" is for adding configuration values. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-machine: Fix passing extraConfig in mkIsoaszlig2016-05-031-2/+2
| | | | | | | | | | Commit 31809189d5126979e51b4fb4cf0fa7a35a401e53 introduced this. Unfortunately using extraConfig as a fallback isn't really how this was intended to work, so let's make sure we _always_ supply the extraConfig to the module. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-network: Pass nodes attribute to modulesaszlig2016-05-031-11/+17
| | | | | | | | | | | On NixOps as well as for NixOS test networks, there is a nodes attribute which allows to reference configuration definitions from other modules. Currently this isn't used at all but might come in handy if we want to cross-reference machine configurations (for example referencing IP addresses in a static network configuration). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib: Move callNetwork into its own fileaszlig2016-05-032-13/+16
| | | | | | Just to keep the default.nix clean and easy to read. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib: Rename callMachines to callNetworkaszlig2016-05-032-2/+2
| | | | | | | | This is to name it closer to what NixOps calls a network expression, so that it's clear that there is more abstraction going on like setting the hostname rather than just being a plain mapAttrs over callMachine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Hook get-tests.nix into <vuizvui/lib> as wellaszlig2016-05-032-1/+3
| | | | | | It's only for consistency and so has no real feature changes. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move callMachines into lib/aszlig2016-05-032-16/+17
| | | | | | | | We now no longer need to import the call-machine.nix directly but now can use import <vuizvui/lib> in order to get *both* the callMachine and the callMachines function. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/labtops: Switch to use callMachinesaszlig2016-05-032-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Should make the configurations much more easy to read. I did a small comparison between the machine derivations of the old Labtop and the Labtop with the new callMachines implementation using: diff -U 0 =(nix-store -qR old_labtop.drv | sort -t- -k 2) \ =(nix-store -qR new_labtop.drv | sort -t- -k 2) The following store paths were different in the output: /nix/store/...-etc.drv /nix/store/...-initrd.drv /nix/store/...-kernel-modules-shrunk.drv /nix/store/...-nixos.conf.drv /nix/store/...-nixos-system-labtop-16.09pre82222.fc92bbf-vuizvui.drv /nix/store/...-stage-1-init.sh.drv /nix/store/...-system-units.drv /nix/store/...-unit-systemd-modules-load.service.drv This is okay and is due to the reversed module evaluation order, because we now have the module definition enabling the Labtop profile in extraConfig instead of in the root config. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* machines: Add a new callMachines functionaszlig2016-05-031-0/+11
| | | | | | | | | | | | This is particularly needed for the Labtops and it allows to call a full attribute set of machines to be incorporated into a single file as one big attribute set. Its functionality is kind of similar to the NixOps network expressions by providing default hostnames (in our case with a priority of 900 to still make it overridable without pain). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-machine: Allow to pass extra configaszlig2016-05-031-3/+7
| | | | | | | | | | | | | | | | | | | | So far callMachine only accepted the system attribute as its sole argument, but especially if there are more machines with common attributes, it makes sense to actually call the machines with option definitions that are for example enabling a specific profile module. For example: let commonAttrs.extraConfig = { common.profile.enable = true; }; in { foo = callMachine ./foo commonAttrs; bar = callMachine ./bar commonAttrs; } Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/katara: fix gpg-agent for the userProfpatsch2016-05-031-1/+3
| | | | | Commit I forgot; there was a change in the gpg-agent behavior and this sets it up correctly again.
* machines/katara: invert coloring of sentProfpatsch2016-05-032-1/+19
| | | | | Slides with white background are an insult to the viewers. Also adjusts some other sizing stuff.
* machines/labtops: document a manual setupProfpatsch2016-05-031-0/+24
| | | | | Quick & dirty writeup on how to set up a labtop, not yet integrated in the “normal” vuizvui documentation.
* doc/installation: nixos must not be a channelProfpatsch2016-05-031-0/+1
| | | | | Otherwise the `rebuild switch` to vuizvui won’t work, it would use the channel `<nixpkgs>` instead of the vuizvui one.
* machines/labtops: hannswurst -> hannswurschtProfpatsch2016-04-301-2/+2
|
* machines/katara: remove cabal & stack from envProfpatsch2016-04-301-2/+0
|
* machines/labtops: labhanns -> hannswurstProfpatsch2016-04-301-2/+2
|
* machines/katara: restructure pkgsProfpatsch2016-04-292-12/+31
|
* machines/katara: misc changesProfpatsch2016-04-292-14/+6
|
* machines/katara: networkmanager: use gnutlsProfpatsch2016-04-291-1/+11
| | | | | | Public shaming of University of Augsburg: They VPN is so ancient that openssl dropped the SSL protocols necessary to connect. gnutls still has them, so this patches that in.
* fix evaluation; mpv-scripts not in nixkgs yetProfpatsch2016-04-281-1/+2
|
* fix duplicated optionProfpatsch2016-04-281-1/+0
|
* machines/katara: add/remove a few programsProfpatsch2016-04-282-20/+27
|
* lib/call-machine: add installer imageProfpatsch2016-04-271-19/+23
| | | | | | Factor out the common iso code and use the minimal installer module to create a vuizvui installer for the current config. Add vuizvui to the NIX_PATH in the resulting system.
* machines/tyree: Add Thunderbird to system packagesaszlig2016-04-261-1/+2
| | | | | | | I'd prefer to use kdepim, but that apparently doesn't seem to be packaged yet. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Switch to linux-next-20160426aszlig2016-04-262-12/+31
| | | | | | | | | | | | | | | | This reverts commit 0182e0ca12760da2aecd65de98c85a76ecdcedc6. With the latest testing kernel, the machine still gets random GPU lockups which are already fixed in linux-next, so let's get back to linux-next even though things break from time to time. We can still pin a specific next version to base our patches on once we have a base version that's stable enough. I've also fixed the backlight patch to compile against the latest next version. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Enable printing by defaultaszlig2016-04-261-0/+3
| | | | | | | The local printer is a HP, so it's probably a good idea to add hplip as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Switch default locale to de_DEaszlig2016-04-261-1/+1
| | | | | | | Requested by the user, although I personally prefer receiving English error messages whenever something goes wrong ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/labtop: standartise disk label & diskProfpatsch2016-04-252-12/+5
|
* machines/labtop: fix config merging & devicesProfpatsch2016-04-251-5/+12
|
* machines/profpatsch: remove usb kernel patchProfpatsch2016-04-252-6/+0
| | | | Seems like it went upstream.
* machines/labtop: remove antimony (build fail)Profpatsch2016-04-251-1/+2
|
* modules/labtops: simplify wireless connectionProfpatsch2016-04-252-12/+4
|
* Merge remote-tracking branch 'origin/master'Profpatsch2016-04-255-17/+55
|\
| * modules/programs/mpv: Fix buildaszlig2016-04-151-0/+1
| | | | | | | | | | | | | | | | | | Since the latest upstream version, the directory $out/etc/mpv doesn't seem to get created anymore, but a quick strace shows that mpv still tries to open it upon startup, so let's just create the directories leading to mpv.conf. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * pkgs/nixops: Fix reference to xsltprocaszlig2016-04-151-0/+3
| | | | | | | | | | | | | | | | | | | | Since the closure-size has been merged into nixpkgs master, the xsltproc binary now resides in a separate store path. Ideally we want to fix that in NixOps directly, so I'm marking this as a hack for now until we have upgraded. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * mmrnmhrm/dnyarri: Update kernel src/cfg to 4.6-rc3aszlig2016-04-133-17/+51
| | | | | | | | | | | | | | | | | | | | | | This is -rc3 + 17 commits ahead. Configuration is once again just to get it to compile, the only new configuration option that I really want to consider using is CONFIG_FS_ENCRYPTION, everything else is just "updating config to latest kernel". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | machines/labnet: generic labtop configProfpatsch2016-04-254-93/+161
|/ | | | | Draws out the general config for all Labtops in its own module and creates a structure to specify the setting which are different.
* programs/fish/fasd: fasd integration for fishProfpatsch2016-04-112-0/+31
| | | | | | Add simple fasd integration for fish. A command `z` directly jumps to the most “frecent” folder fitting its argument.
* machines/{notsure,tyree}: Add gwenview to packagesaszlig2016-04-102-2/+3
| | | | | | | Better for DE users in terms of integration, the default (feh) so far isn't very well suited for mouse navigation. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/rtl8192cu: Fix build against 4.x kernelsaszlig2016-04-092-0/+17
| | | | | | | | This fix is more or less because of GCC 5 rather than just against kernel 4.x, because the number of arguments for rtw_select_queue() have been changed since 4.0 already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/rtl8192cu: Move into its own directoryaszlig2016-04-092-1/+1
| | | | | | | This is to not clutter up the hardware/ namespace with patches (we're going to add one). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Switch to latest linux_testingaszlig2016-04-091-28/+4
| | | | | | | | | | | Currently, linux-next-20160408 introduces a few unrelated bugs to the hardware, so instead of updating to the latest -next version, we're going for the latest -rc instead. This should also help a lot in development to focus on the important parts instead of dealing with completely unrelated bugs/issues. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles/chromium: Disable pepper Flashaszlig2016-04-041-1/+0
| | | | | | | | I've disabled Flash support via chrome://plugins since quite a while and I have to say that I'm quite happy without Flash, so let's finally get rid of that proprietary blob for good :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/gnupg: Only set GNUPGHOME if non-defaultaszlig2016-04-041-0/+2
| | | | | | | | It doesn't make sense to pollute the system with additional environment variables if we're using the defaults anyway, so only set it if it's not "~/.gnupg". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests/gnupg: Enable scdaemon supportaszlig2016-04-041-0/+1
| | | | | | | We're not testing this thoroughly though, but this makes sure that we don't accidentally break module support for scdaemon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Rename gpg-agent to gnupgaszlig2016-04-048-37/+49
| | | | | | | | | We do things such as placing gnupg into environment.systemPackages, so calling this just "programs.gpg-agent" doesn't fit that. Especially if we really want to have a way to specify configuration values in case I'm getting masochistic someday ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/gpg-agent: Use dlopen() for libsystemdaszlig2016-04-042-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest <nixpkgs> (NixOS/nixpkgs@e899ffc as of my latest pull) causes our preloader to load fork() from libpthread instead of using the overridden one from the preload wrapper (without store paths to be easier to read): binding file gpg-agent [0] to libpthread.so.0 [0]: normal symbol `fork' [GLIBC_2.2.5] However, at the time I've committed 8db1803, I was testing it on an older version (NixOS/nixpkgs@81af597) and it was bound correctly: binding file gpg-agent [0] to gpg-agent-wrapper [0]: normal symbol `fork' [GLIBC_2.2.5] Now after bisecting this against the latest <nixpkgs> master, it revealed that one of the following commits could be the problem: * NixOS/nixpkgs@559ecc9: stdenv-linux: Avoid building m4/bison twice * NixOS/nixpkgs@817145e: binutils: 2.23.1 -> 2.26 * NixOS/nixpkgs@2040a9a: stdenv-linux: Ensure binutils comes before bootstrapTools in $PATH So my guess was that the binutils update changed that behaviour somehow, so I checked against 2.23.1 (reverted NixOS/nixpkgs@817145e) and 2.25 and it worked correctly. I didn't bisect this against the binutils source tree, but what happens is that because we depend on libsystemd in our wrapper, libsystemd (and thus libpthread) is loaded first and thus we can't override things anymore which get pulled in by RTLD while loading libsystemd. The reason why I now went with dlopen() is that even if the behaviour is back to that of binutils 2.25, we want to make sure that even if something in ld.so should change which affect this as well we're still not tripping into the same problem again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-11 11:05:52 +0000