diff options
author | tv <tv@shackspace.de> | 2015-10-29 01:49:27 +0100 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-10-29 01:49:27 +0100 |
commit | bcaf3771d9503f1b0d01a2c15ca0712ee454342f (patch) | |
tree | f5827da74911ccbe14ab5c24d1ca2aea5dcb0df1 /tv/2configs/xserver/default.nix | |
parent | 43d3116dc08aefd2ce008b9905811b8d92d88fac (diff) |
tv: {2configs/xserver => 5pkgs}/xmonad-tv
Diffstat (limited to 'tv/2configs/xserver/default.nix')
-rw-r--r-- | tv/2configs/xserver/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 388a33bbe..4d2fe9e45 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -80,9 +80,6 @@ let ''; }; - xmonad-pkg = pkgs.haskellPackages.callPackage xmonad-src {}; - xmonad-src = pkgs.writeNixFromCabal "xmonad.nix" ./xmonad; - xmonad-environment = { DISPLAY = ":${toString config.services.xserver.display}"; XMONAD_STATE = "/tmp/xmonad.state"; @@ -119,12 +116,12 @@ let settle ${pkgs.xorg.xhost}/bin/xhost +LOCAL: settle ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args} settle ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' - exec ${xmonad-pkg}/bin/xmonad + exec ${pkgs.xmonad-tv}/bin/xmonad ''; xmonad-stop = pkgs.writeScriptBin "xmonad-stop" '' #! /bin/sh - exec ${xmonad-pkg}/bin/xmonad --shutdown + exec ${pkgs.xmonad-tv}/bin/xmonad --shutdown ''; xserver-environment = { |