From 638f8152c786ed8b72978333bc13967a1cade1fd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 21:18:19 +0200
Subject: tv xserver: systemPackages += xdotool

---
 tv/2configs/xserver/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index deb929c34..1d9c19b3b 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -9,6 +9,7 @@ in {
     pkgs.gitAndTools.qgit
     pkgs.mpv
     pkgs.sxiv
+    pkgs.xdotool
     pkgs.xsel
     pkgs.zathura
   ];
-- 
cgit v1.2.3


From 28aa41768a05e74d04fc70af2e511b08a6085533 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 21:18:45 +0200
Subject: tv xserver: xrdb without -merge

---
 tv/2configs/xserver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 1d9c19b3b..30afe20c1 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -52,7 +52,7 @@ in {
       XMONAD_STARTUP_HOOK = pkgs.writeDash "xmonad-startup-hook" ''
         ${pkgs.xorg.xhost}/bin/xhost +LOCAL: &
         ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
-        ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args} &
+        ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
         ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
         wait
       '';
-- 
cgit v1.2.3


From e692f327739ecfbeadd8d8309f2031a5ebec676a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 22:26:26 +0200
Subject: tv xserver: stop feh leaking into systemPackages

---
 tv/2configs/xserver/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 30afe20c1..8f3ee5966 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -30,6 +30,11 @@ in {
   };
 
   services.xserver = {
+
+    # Don't install feh into systemPackages
+    # refs <nixpkgs/nixos/modules/services/x11/desktop-managers>
+    desktopManager.session = mkForce [];
+
     enable = true;
     display = 11;
     tty = 11;
-- 
cgit v1.2.3