Merge remote-tracking branch 'prism/staging/jeschli'

This commit is contained in:
lassulus 2018-07-09 19:23:12 +02:00
commit 2f29f28730
2 changed files with 11 additions and 3 deletions

View File

@ -106,6 +106,8 @@
services.printing.enable = true;
services.printing.drivers = [ pkgs.postscript-lexmark ];
services.redis.enable = true;
services.xserver = {
desktopManager.session = lib.mkForce [];

View File

@ -148,9 +148,15 @@ rec {
taskwarrior = buildSimpleReaktorPlugin "task" {
pattern = "^task: (?P<args>.*)$$";
script = pkgs.writeDash "task-wrapper" ''
${pkgs.taskwarrior}/bin/task "$*"
'';
script = let
taskrc = "$HOME/.taskrc";
in
pkgs.writeDash "task-wrapper" ''
if [ -f ${taskrc} ] ; then
touch ${taskrc}
fi
${pkgs.taskwarrior}/bin/task "$*"
'';
};
todo = name: {