diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-07 23:51:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-08 00:25:04 +0000 |
| commit | 096ca241d9505c265fe46cacec7b316eecb401ad (patch) | |
| tree | 1c4f5daadf7a0f2544ef9b1d219ddcca6867df0d /nixos/modules/services/x11/desktop-managers | |
| parent | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (diff) | |
| parent | 5f6df74f66246a2eb198b0bc3fe1f7d2dff57062 (diff) | |
| download | nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.gz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.bz2 nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.lz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.xz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.zst nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/enlightenment.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 04e82599b94..26b662a2a64 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -68,10 +68,7 @@ in security.wrappers = (import "${e.enlightenment}/e-wrappers.nix").security.wrappers; - environment.etc = singleton - { source = xcfg.xkbDir; - target = "X11/xkb"; - }; + environment.etc."X11/xkb".source = xcfg.xkbDir; fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index fce274477b6..2538858ac0f 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -183,10 +183,7 @@ in "/share" ]; - environment.etc = singleton { - source = xcfg.xkbDir; - target = "X11/xkb"; - }; + environment.etc."X11/xkb".source = xcfg.xkbDir; # Enable GTK applications to load SVG icons services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; |