From 4ac323d9247924415b60f4c74d59fa43299fdee0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 7 Apr 2016 07:44:26 -0500
Subject: kde5: enable libmtp udev rules

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'nixos/modules/services/x11')

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 9891da2169ea..71361bae82dc 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";
-- 
cgit 1.4.1


From 98d9bbaec2317101f452151b8a8e844b4140e806 Mon Sep 17 00:00:00 2001
From: Brandon Edens <brandonedens@gmail.com>
Date: Fri, 8 Apr 2016 18:53:42 -0700
Subject: Add DPI option to xserver invocation.

---
 nixos/modules/services/x11/xserver.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'nixos/modules/services/x11')

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 76431f211243..c3cd550e8385 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";
 
-- 
cgit 1.4.1