| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
It's only for consistency and so has no real feature changes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Commit I forgot; there was a change in the gpg-agent behavior and this
sets it up correctly again.
|
|
|
|
|
| |
Slides with white background are an insult to the viewers.
Also adjusts some other sizing stuff.
|
|
|
|
|
| |
Quick & dirty writeup on how to set up a labtop, not yet integrated in
the “normal” vuizvui documentation.
|
|
|
|
|
| |
Otherwise the `rebuild switch` to vuizvui won’t work, it would use the
channel `<nixpkgs>` instead of the vuizvui one.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
I'd prefer to use kdepim, but that apparently doesn't seem to be
packaged yet.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Requested by the user, although I personally prefer receiving English
error messages whenever something goes wrong ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
|
|
|
| |
Seems like it went upstream.
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
| |
Draws out the general config for all Labtops in its own module and
creates a structure to specify the setting which are different.
|
|
|
|
|
|
| |
Add simple fasd integration for fish.
A command `z` directly jumps to the most “frecent” folder fitting its
argument.
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
This is to not clutter up the hardware/ namespace with patches (we're
going to add one).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
First of all, let's inline the first_fork variable, because we don't
want this variable to be exposed as a symbol, even though it doesn't
hurt (except maybe for a very very very tiny improvement in RTLD lookup
performance).
And apart from the first_fork variable, there were a few other symbols
we don't want to propagate to the RTLD chain as well:
0000000000001465 T accept
000000000000130b T bind
000000000000153e T execv
0000000000001610 T _fini
00000000000013b8 T fork
0000000000000fe0 T get_sd_fd_for
0000000000001420 T get_socket_pid
0000000000000d80 T _init
00000000000012fa T listen
00000000000012b8 T record_sockfd
So in the end we're down to:
00000000000011fb T accept
00000000000010a1 T bind
00000000000012c8 T execv
0000000000001390 T _fini
000000000000114e T fork
0000000000000b68 T _init
0000000000001090 T listen
... which is a lot more clean and even though our staff doesn't collide
with existing libraries in the chain it's better to be safe than sorry.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
I've used this to test compilation of the agent wrapper at an early
state of development and I've accidentally committed this along with
8db1803b5d9865b2355fabdb6bb974d879ce57cc.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
| |
grabbed from https://www.spinics.net/lists/linux-usb/msg137228.html,
because it could still take a while until it arrives in upstream.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
The obsolete option services.xserver.startGnuPGAgent is now no longer
available and we have our own module now, so let's bite the dust and
enable it, especially because I haven't tested it outside of the scope
of the VM test.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|