diff options
| author | lassulus <lass@aidsballs.de> | 2016-06-05 00:38:00 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-06-05 00:38:00 +0200 |
| commit | baa20586b875e5b6bd600cf731f15d2251d05c95 (patch) | |
| tree | 19ad3210a2b8485ac22d26f75b2e2493d3f61596 /tv | |
| parent | 231eda580b273d630fe10894d4ea46135c1f941d (diff) | |
| parent | c1c645b545b960eb639fc6d41dfa35ee187ae164 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/xserver/default.nix | 4 | ||||
| -rw-r--r-- | tv/5pkgs/xmonad-tv.nix | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 965c3bbe1..c41c0a81e 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -74,8 +74,8 @@ in { }; serviceConfig = { SyslogIdentifier = "xmonad"; - ExecStart = "${pkgs.xmonad-tv}/bin/xmonad-tv"; - ExecStop = "${pkgs.xmonad-tv}/bin/xmonad-tv --shutdown"; + ExecStart = "${pkgs.xmonad-tv}/bin/xmonad"; + ExecStop = "${pkgs.xmonad-tv}/bin/xmonad --shutdown"; User = user.name; WorkingDirectory = user.home; }; diff --git a/tv/5pkgs/xmonad-tv.nix b/tv/5pkgs/xmonad-tv.nix index 74e43dc79..04e7e8359 100644 --- a/tv/5pkgs/xmonad-tv.nix +++ b/tv/5pkgs/xmonad-tv.nix @@ -1,14 +1,15 @@ { pkgs, ... }: -pkgs.writeHaskellBin "xmonad-tv" { - depends = [ - "containers" - "unix" - "X11" - "xmonad" - "xmonad-contrib" - "xmonad-stockholm" - ]; -} '' +pkgs.writeHaskell "xmonad-tv" { + executables.xmonad = { + extra-depends = [ + "containers" + "unix" + "X11" + "xmonad" + "xmonad-contrib" + "xmonad-stockholm" + ]; + text = '' {-# LANGUAGE DeriveDataTypeable #-} -- for XS {-# LANGUAGE FlexibleContexts #-} -- for xmonad' {-# LANGUAGE LambdaCase #-} @@ -299,4 +300,6 @@ wGSConfig = def allWorkspaceNames :: W.StackSet i l a sid sd -> X [i] allWorkspaceNames ws = return $ map W.tag (W.hidden ws) ++ [W.tag $ W.workspace $ W.current ws] -'' + ''; + }; +} |