Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 0107ee8c322e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c8c04bc96ce7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Sep 8, 2019

  1. nixos/xserver: export configuration with startx and extra layouts 

    If the X server is run manually it must be started with an `-xkbdir` argument
pointing to the custom xkb directory. So we export it to /etc/X11/xkb.
    @rnhmjoj
    rnhmjoj committed Sep 8, 2019
    Copy the full SHA
    e57c0f3 View commit details
    Browse the repository at this point in the history

  2. nixos/doc: inform users of startx about -xkbdir argument needed

    @rnhmjoj
    rnhmjoj committed Sep 8, 2019
    Copy the full SHA
    7468809 View commit details
    Browse the repository at this point in the history

  3. nixos/xserver: refactor/fix xml tags for keyboard layout overrides 

    With the current XML tags there is an issue when building with a custom keyboard.
The description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst
    @dasj19 @rnhmjoj
    dasj19 authored and rnhmjoj committed Sep 8, 2019
    Copy the full SHA
    e2fca8b View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. Merge pull request #68310 from rnhmjoj/xkb 

    services.xserver.extraLayouts fixes
    @lheckemann
    lheckemann committed Sep 9, 2019
    Copy the full SHA
    c8c04bc View commit details
    Browse the repository at this point in the history