summaryrefslogtreecommitdiffstats
path: root/tv/2configs/xserver/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-13 00:49:59 +0200
committerlassulus <lassulus@lassul.us>2017-07-13 00:49:59 +0200
commit772f8dd3efca3a1a966c6fb9abbc72063124fe9d (patch)
treef6eae67ef2df2fe520b6acd8a05e1c684fe03174 /tv/2configs/xserver/default.nix
parentad419018004b7da735e6d001f4b7bf89bca7e528 (diff)
parentbc6c6a3164d31141f39333914c1b15ff261e7859 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs/xserver/default.nix')
-rw-r--r--tv/2configs/xserver/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index deb929c34..8f3ee5966 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
];
@@ -29,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;
@@ -51,7 +57,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
'';