mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity

Merge pull request #61423 from volth/de-xrdp

Browse source 
nixos/desktop-managers: let them work when 'services.xserver.enable = false'
This commit is contained in:
Matthew Bauer 2019-05-30 15:46:09 -04:00 committed by GitHub
parent f093847dd4 b51aae10e0
commit b64b2b57f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View file

@ -25,7 +25,7 @@ in
};
config = mkIf (xcfg.enable && cfg.enable) {
config = mkIf cfg.enable {
environment.systemPackages = [
e.efl e.enlightenment
@ -38,10 +38,10 @@ in
pkgs.xorg.xcursorthemes
];
environment.pathsToLink = [
"/etc/enlightenment"
"/share/enlightenment"
"/share/elementary"
environment.pathsToLink = [
"/etc/enlightenment"
"/share/enlightenment"
"/share/elementary"
"/share/locale"
];

2
nixos/modules/services/x11/desktop-managers/lumina.nix
View file

@ -21,7 +21,7 @@ in
};
config = mkIf (xcfg.enable && cfg.enable) {
config = mkIf cfg.enable {
services.xserver.desktopManager.session = singleton {
name = "lumina";

2
nixos/modules/services/x11/desktop-managers/lxqt.nix
View file

@ -26,7 +26,7 @@ in
};
config = mkIf (xcfg.enable && cfg.enable) {
config = mkIf cfg.enable {
services.xserver.desktopManager.session = singleton {
name = "lxqt";

2
nixos/modules/services/x11/desktop-managers/mate.nix
View file

@ -42,7 +42,7 @@ in
};
config = mkIf (xcfg.enable && cfg.enable) {
config = mkIf cfg.enable {
services.xserver.desktopManager.session = singleton {
name = "mate";

2
nixos/modules/services/x11/desktop-managers/maxx.nix
View file

@ -10,7 +10,7 @@ in {
enable = mkEnableOption "MaXX desktop environment";
};
config = mkIf (xcfg.enable && cfg.enable) {
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.maxx ];
# there is hardcoded path in binaries

2
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -36,7 +36,7 @@ in
config = mkMerge [
(mkIf (xcfg.enable && cfg.enable) {
(mkIf cfg.enable {
services.xserver.desktopManager.session = singleton {
name = "plasma5";
bgSupport = true;

2
nixos/modules/services/x11/desktop-managers/xterm.nix
View file

@ -19,7 +19,7 @@ in
};
config = mkIf (config.services.xserver.enable && cfg.enable) {
config = mkIf cfg.enable {
services.xserver.desktopManager.session = singleton
{ name = "xterm";

3
nixos/modules/services/x11/xserver.nix
View file

@ -347,6 +347,7 @@ in
xkbDir = mkOption {
type = types.path;
default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
description = ''
Path used for -xkbdir xserver parameter.
'';
@ -708,8 +709,6 @@ in
xorg.xf86inputevdev.out
];
services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
inherit (cfg) xkbModel layout xkbVariant xkbOptions;
nativeBuildInputs = [ pkgs.xkbvalidate ];