summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-06-04 19:09:19 +0200
committertv <tv@krebsco.de>2016-06-04 19:48:43 +0200
commitfc826f8f7a613c68e595e16fd793b0b318425af8 (patch)
treeacb2172fb23c408f7b42dc821d9425f8dbcbe83c /tv
parented56f41ddc1775ef8938befa88dcb7d029bf6450 (diff)
krebs pkgs.{writeHaskellBin => writeHaskell}
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/xserver/default.nix4
-rw-r--r--tv/5pkgs/xmonad-tv.nix25
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]
-''
+ '';
+ };
+}