diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
| commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
| tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /nixos/modules/services/x11 | |
| parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
| parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
| download | nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixlib-30f14243c33f1b386273d08a4776aa679c42143d.zip | |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 1d60637c4ca2..4f74d5732af5 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -183,7 +183,10 @@ in services.upower.enable = config.powerManagement.enable; # Extra UDEV rules used by Solid - services.udev.packages = [ pkgs.media-player-info ]; + services.udev.packages = [ + pkgs.libmtp + pkgs.media-player-info + ]; services.xserver.displayManager.sddm = { theme = "breeze"; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index d5babd5012fa..d03e8ec8b1ba 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -219,6 +219,12 @@ in ''; }; + dpi = mkOption { + type = types.nullOr types.int; + default = 0; + description = "DPI resolution to use for X server."; + }; + startDbusSession = mkOption { type = types.bool; default = true; @@ -513,6 +519,7 @@ in "-xkbdir" "${cfg.xkbDir}" ] ++ optional (cfg.display != null) ":${toString cfg.display}" ++ optional (cfg.tty != null) "vt${toString cfg.tty}" + ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" ++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ] ++ optional (!cfg.enableTCP) "-nolisten tcp"; |