about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* modules/gpg-agent: Hide internals of preloaderaszlig2016-04-041-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* modules/gpg-agent: Remove unused debug/test codeaszlig2016-04-041-11/+0
| | | | | | | | 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>
* machines/katara: kernel usb-failure patchProfpatsch2016-04-033-0/+18
| | | | | grabbed from https://www.spinics.net/lists/linux-usb/msg137228.html, because it could still take a while until it arrives in upstream.
* machines/katara: misc stuffProfpatsch2016-04-032-7/+11
|
* machines/katara: refactor a bitProfpatsch2016-04-031-16/+16
|
* machines/katara: fix gpg-agentProfpatsch2016-04-031-5/+13
|
* profiles/workstation: Move to new gpg-agent moduleaszlig2016-04-021-2/+3
| | | | | | | | | 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>
* Add a new module and test for gpg-agentaszlig2016-04-028-0/+860
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since NixOS/nixpkgs@5391882 there no longer is the option to start the agent during X session startup, which prompted me to write this module. I was unhappy how GnuPG is handled in NixOS since a long time and wanted to OCD all the configuration files directly into the module. Unfortunately, this is something I eventually gave up because GnuPG's design makes it very hard to preseed configuration. My first attempt was to provide default configuration files in /etc/gnupg, but that wasn't properly picked up by GnuPG. Another way would have been to change the default configuration files, but that would have the downside that we could only override those configurations using command line options for each individual GnuPG component. The approach I tried to go for was to patch GnuPG so that all the defaults are directly set in the source code using a giant sed expression. It turned out that this approach doesn't work very well, because every component has implemented its own ways how to handle commandline arguments versus (default) configuration files. In the end I gave up trying to OCD anything related to GnuPG configuration and concentrated just on the agent. And that's another beast, which unfortunately doesn't work very well with systemd. While searching the net for existing patches I stumbled upon one done by @shlevy: https://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029092.html Unfortunately, the upstream author seems to be quite anti-systemd and didn't want to accept that into the upstream project. Because of this I went for using LD_PRELOAD to pick up the file descriptors provided by the systemd sockets, because in the end I don't want to constantly catch up with upstream and rebase the patch on every new release. Apart from just wrapping the agent to be socket activated, we also wrap the pinentry program, so that we can inject a _CLIENT_PID environment variable from the LD_PRELOAD wrapper that is picked up by the pinentry wrapper to determine the TTY and/or display of the client communicating with the agent. The wrapper uses the proc filesystem to get all the relevant information and passes it to the real pinentry. The advantage of this is that we don't need to do things such as "gpg-connect-agent updatestartuptty /bye" or any other workarounds and even if we connect via SSH the agent should be able to correctly pick up the TTY and/or display. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Move VirtualBox to dnyarri onlyaszlig2016-03-212-2/+1
| | | | | | | Actually this is the *only* machine where I actually use VirtualBox, on every other machine I'm fine with qemu/KVM. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Use full source info for nix-replaszlig2016-03-211-2/+4
| | | | | | | | Using overrideDerivation on fetchFromGitHub is going to only override the attributes from fetchzip, because fetchFromGitHub isn't directly overridable. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Fix build of nix-replaszlig2016-03-211-0/+8
| | | | | | | | As of edolstra/nix-repl@8a2f5f0, this won't build with current nixUnstable (version 1.12pre4509_69f28eb) and it already has been fixed upstream (edolstra/nix-repl#25 and edolstra/nix-repl@ff8d069). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add "wine" to systemPackagesaszlig2016-03-211-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* fliewatuet: bumlebee, unison, gimplukasepple2016-03-201-0/+4
|
* machines/katara: myPkgs improvementsProfpatsch2016-03-182-3/+47
| | | | | python runtime dependencies a new patch for taffybar
* machines/katara: misc programsProfpatsch2016-03-182-3/+4
|
* machines/katara: remove temporary libreofficeProfpatsch2016-03-181-13/+2
|
* machines/katara: keybase & miscProfpatsch2016-03-181-4/+4
|
* machines/katara: remove obsolete optionProfpatsch2016-03-181-1/+0
|
* machines/katara: finally add cabal to envProfpatsch2016-03-181-0/+2
|
* modules/starbound: Fix setting serverUsersaszlig2016-03-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | Not a big deal because Starbound ignores unknown nodes, but having something like this in the resulting config file is a bit ugly: { "serverUsers" : { "user1" : { "_module" : { "args" : { "name" : "user1" }, "check" : true }, "admin" : false, "password" : "passwd1" } } } Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Fix non-existing <value/> tagaszlig2016-03-151-2/+3
| | | | | | | Docbook XSL doesn't have such a tag and it really should be <literal/> instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Exclude game tests from Hydra jobsaszlig2016-03-152-2/+4
| | | | | | | We can't possibly test those on Hydra, so let's exclude them from the release.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Provide description for usersaszlig2016-03-151-0/+4
| | | | | | Geesh, forgot to add it in b5ef6a6f32ebed51255918ed100c12e8dfa165c6. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Provide defaultText for packageaszlig2016-03-151-0/+1
| | | | | | | We don't want to evaluate the package while building the manual, so let's provide a defaultText instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Avoid trying to build games on Hydraaszlig2016-03-151-1/+2
| | | | | | | | | | The packages in vuizvui.games use the NixOS module system for configuration and provides the particular game derivations based on that. As the configuration is all about Steam/Humblebundle account credentials we obviously can't build it on Hydra and it thus fails with an evaluation error. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add new Starbound service and testaszlig2016-03-154-0/+439
| | | | | | | | | | | | | | | | | | | | | Very preliminary and doesn't have all the option descriptions right, nor does it have convenience features such as setting allowAdminCommands based on whether any users are defined with admin privileges. Of course the latter needs to undergo the decision on how to handle RCON connections, because the latter *might* need that option. But apart from that single option, there are a lot more options we need to flesh out. Also, the test currently is very limited and only spins up a client, connects to the server and does a movement (just walk to the right). Needless to say, it's even quite fragile and relies on OCR to properly detect the custom pixel fonts from Starbound. Which unfortunately fails most of the time. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* games/starbound: Properly handle -bootconfig argaszlig2016-03-151-25/+64
| | | | | | | | | | | | | | | First of all, we need to create another wrapper around the command line arguments, because Starbound will bail out whenever there is more than one -bootconfig argument. In addition, we are now putting in build time information into $out/etc/sbboot.config so we can easily re-use them, for example for a NixOS service module. Also, the hasBootconfigArg is now used for all flavors, because even the stable version supports that argument already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Hook in games into vuizvui package setaszlig2016-03-153-5/+9
| | | | | | | | | | New we can reference the games using pkgs.vuizvui.games.*, although game configuration currently still resorts to using ~/.config/nixgames.nix if there is no nixpkgs.config.vuizvui.games set. In this vein, this should also avoid Hydra to try to build those games, because those aren't publicly available for free. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* games/starbound: Add desktop itemaszlig2016-03-151-1/+19
| | | | | | Makes it easier for DE users not used to a terminal to start the game. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-30 14:55:20 +0000