Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make services.xserver.xkbDir conflict free when overriden. #21888

Merged
merged 1 commit into from Jan 29, 2017
Merged

Make services.xserver.xkbDir conflict free when overriden. #21888

merged 1 commit into from Jan 29, 2017

Conversation

nbp
Copy link
Member

@nbp nbp commented Jan 14, 2017

Motivation for this change

I was looking into adding extra symbol maps to the xkb directory, and wanted to override the services.xserver.xkbDir option. Unfortunately, the enlightment, kde4 and kde5 desktop manager are also defining environment.etc.*.target = "X11/xkb".

Lists are not modular, which implies that one cannot prevent the error to happen unless the exact same source is used, which implies to override xkbeyboard_config to make it work.

Things done
  • Built on platform(s)
    • NixOS

@nbp nbp self-assigned this Jan 14, 2017
@mention-bot
Copy link

@nbp, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @abbradar and @vcunat to be potential reviewers.

@nbp nbp requested a review from globin January 15, 2017 16:23
@nbp
Copy link
Member Author

nbp commented Jan 29, 2017

I am unable to reproduce travis failures while on this branch. Checking with nox and the maintainers script did not revealed anything locally.

I will cherry-pick this change on top of master. Feel free to revert in case of issues.

@nbp nbp merged commit 82bcfef into NixOS:master Jan 29, 2017
@nbp nbp added this to the 17.03 milestone Jan 29, 2017
@ikervagyok
Copy link
Contributor

please revert, as it breaks my config (mentioned in #22290)
both the keyboard and the mouse are connected over the usb-hub of my screen, which is a dell u2715h to my pc, which is a lenovo thinkcentre

relevant part of my (broken) config:

  services.xserver.desktopManager.gnome3.enable = true;
  services.xserver.displayManager.lightdm.enable = true;
  services.xserver.enable = true;
  services.xserver.layout = "us";
  services.xserver.libinput.enable = true;
  services.xserver.videoDrivers = [ "intel" ];
  services.xserver.desktopManager.xterm.enable = false;
  services.xserver.windowManager.default = "xmonad";
  services.xserver.windowManager.xmonad.enable = true;
  services.xserver.windowManager.xmonad.enableContribAndExtras = true;
  services.xserver.xkbOptions = "eurosign:e";

  boot.kernelPackages = pkgs.linuxPackages_latest;

@nbp
Copy link
Member Author

nbp commented Feb 1, 2017 •
edited

@ikervagyok this got reverted in commit 24f3abd

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

@globin globin globin approved these changes

Assignees

@nbp nbp

Labels
0.kind: bug 6.topic: nixos 8.has: clean-up 8.has: module (update)
Projects
None yet
Milestone
17.03
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nbp @mention-bot @ikervagyok @fpletz @globin