diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-30 15:46:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-30 15:46:09 -0400 |
commit | b64b2b57f0aac928b27d6d47fdbdaf307e879517 (patch) | |
tree | 48db38589b664620b21d8a9184cd4f8010fe812b /nixos | |
parent | f093847dd4ae09d8e74b2c3721eeb712ccabff11 (diff) | |
parent | b51aae10e0b3d75e272c92ffeb55988f71c02461 (diff) | |
download | nixlib-b64b2b57f0aac928b27d6d47fdbdaf307e879517.tar nixlib-b64b2b57f0aac928b27d6d47fdbdaf307e879517.tar.gz nixlib-b64b2b57f0aac928b27d6d47fdbdaf307e879517.tar.bz2 nixlib-b64b2b57f0aac928b27d6d47fdbdaf307e879517.tar.lz nixlib-b64b2b57f0aac928b27d6d47fdbdaf307e879517.tar.xz nixlib-b64b2b57f0aac928b27d6d47fdbdaf307e879517.tar.zst nixlib-b64b2b57f0aac928b27d6d47fdbdaf307e879517.zip |
Merge pull request #61423 from volth/de-xrdp
nixos/desktop-managers: let them work when 'services.xserver.enable = false'
Diffstat (limited to 'nixos')
8 files changed, 12 insertions, 13 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 04e380b61530..4da146940648 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -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" ]; diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index 957b6ab63bb9..2224bcd5a2a5 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -21,7 +21,7 @@ in }; - config = mkIf (xcfg.enable && cfg.enable) { + config = mkIf cfg.enable { services.xserver.desktopManager.session = singleton { name = "lumina"; diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 686bbd0dcf98..4368adedb34b 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -26,7 +26,7 @@ in }; - config = mkIf (xcfg.enable && cfg.enable) { + config = mkIf cfg.enable { services.xserver.desktopManager.session = singleton { name = "lxqt"; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index bf6685ff7eac..a2d0810f90df 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -42,7 +42,7 @@ in }; - config = mkIf (xcfg.enable && cfg.enable) { + config = mkIf cfg.enable { services.xserver.desktopManager.session = singleton { name = "mate"; diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix index 6a698658bdd6..1c04104df41e 100644 --- a/nixos/modules/services/x11/desktop-managers/maxx.nix +++ b/nixos/modules/services/x11/desktop-managers/maxx.nix @@ -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 diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index a9e55eb846ca..b424ae64760a 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -36,7 +36,7 @@ in config = mkMerge [ - (mkIf (xcfg.enable && cfg.enable) { + (mkIf cfg.enable { services.xserver.desktopManager.session = singleton { name = "plasma5"; bgSupport = true; diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 6ff1ef0e4c9a..f386ebc4d3c1 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -19,7 +19,7 @@ in }; - config = mkIf (config.services.xserver.enable && cfg.enable) { + config = mkIf cfg.enable { services.xserver.desktopManager.session = singleton { name = "xterm"; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e767b0eda312..0f057c4ab730 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -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 ]; |