mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
nixos/desktop-managers: let them work when 'services.xserver.enable = false'
they can be used by remote desktop software, without X11 running locally
This commit is contained in:
parent
1df1834dd1
commit
ac6875d294
|
@ -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"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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 ];
|
||||||
|
|
Loading…
Reference in a new issue