colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/desktop-managers: let them work when 'services.xserver.enable = false'

Browse Source 
they can be used by remote desktop software, without X11 running locally
This commit is contained in:
volth 2019-05-13 04:12:00 +00:00
parent 1df1834dd1
commit ac6875d294
7 changed files with 11 additions and 12 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 = [ environment.systemPackages = [
e.efl e.enlightenment e.efl e.enlightenment
@ -38,10 +38,10 @@ in
pkgs.xorg.xcursorthemes pkgs.xorg.xcursorthemes
]; ];
environment.pathsToLink = [ environment.pathsToLink = [
"/etc/enlightenment" "/etc/enlightenment"
"/share/enlightenment" "/share/enlightenment"
"/share/elementary" "/share/elementary"
"/share/locale" "/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 { services.xserver.desktopManager.session = singleton {
name = "lumina"; 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 { services.xserver.desktopManager.session = singleton {
name = "lxqt"; 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 { services.xserver.desktopManager.session = singleton {
name = "mate"; name = "mate";

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

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

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

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

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

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