Separate taskwarrior config in three files
This commit is contained in:
Malte Brandy
parent
4b1854c352
commit
29e24184a0
|
|
@ -79,6 +79,9 @@ in {
|
|||
./roles/vdirsyncer.nix
|
||||
./roles/khard.nix
|
||||
./roles/khal.nix
|
||||
./roles/taskwarrior.nix
|
||||
./roles/taskwarrior-git.nix
|
||||
./roles/taskwarrior-notify.nix
|
||||
(makeAutostart "unlock-ssh")
|
||||
]);
|
||||
unrestricted = [
|
||||
|
|
@ -118,6 +121,7 @@ in {
|
|||
./roles/headless-mpd.nix
|
||||
./roles/mail.nix
|
||||
./roles/mail2rss.nix
|
||||
./roles/taskwarrior.nix
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
imports = [
|
||||
./zsh
|
||||
./taskwarrior.nix
|
||||
./home-options.nix
|
||||
../../common
|
||||
./unlock.nix
|
||||
|
|
|
|||
19
home-manager/roles/taskwarrior-git.nix
Normal file
19
home-manager/roles/taskwarrior-git.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, pkgs, config, ... }: {
|
||||
home.packages = [ pkgs.taskwarrior-git ];
|
||||
home.file = {
|
||||
"add-git" = {
|
||||
target = ".task/hooks/on-add.git";
|
||||
text = ''
|
||||
export PATH=${pkgs.git}/bin:$PATH
|
||||
exec ${pkgs.taskwarrior-git}/bin/taskwarrior-git on-add'';
|
||||
executable = true;
|
||||
};
|
||||
"modify-git" = {
|
||||
target = ".task/hooks/on-modify.git";
|
||||
text = ''
|
||||
export PATH=${pkgs.git}/bin:$PATH
|
||||
exec ${pkgs.taskwarrior-git}/bin/taskwarrior-git on-modify'';
|
||||
executable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
94
home-manager/roles/taskwarrior-notify.nix
Normal file
94
home-manager/roles/taskwarrior-notify.nix
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
{ lib, pkgs, config, ... }: {
|
||||
home.file = let
|
||||
functions = ''
|
||||
printMap :: HashMap Text (These Value Value) -> String
|
||||
printMap = intercalate "\n" . fmap printPair . filter filterPairs . HM.toList
|
||||
filterPairs = \(k,_) -> k `notElem` ["uuid","entry","modified"]
|
||||
printPair = \(k,v) -> case v of
|
||||
This old -> [i|#{k}: -#{printValue old}|]
|
||||
That new -> [i|#{k}: +#{printValue new}|]
|
||||
These old new -> printDiff k old new
|
||||
printDiff :: Text -> Value -> Value -> String
|
||||
printDiff k (Array before) (Array after) = let
|
||||
old = (V.toList before) List.\\ (V.toList after)
|
||||
new = (V.toList after) List.\\ (V.toList before)
|
||||
in
|
||||
[i|#{k}: #{intercalate ", " ((('-':) . printValue <$> old) ++ (('+':) . printValue <$> new))}|]
|
||||
printDiff k old new = [i|#{k}: +#{printValue new} -#{printValue old}|]
|
||||
printValue = \case
|
||||
String (toString -> a) -> if | Just (d :: UTCTime) <- parseTimeM False defaultTimeLocale "%Y%m%dT%H%M%SZ" a -> show d
|
||||
| otherwise -> a
|
||||
Number a -> show a
|
||||
Array (fmap printValue -> a) -> intercalate "\n" (toList a)
|
||||
Object a -> show $ toList a
|
||||
Bool a -> show a
|
||||
Null -> "null"
|
||||
'';
|
||||
inherit (pkgs) writeHaskellScript;
|
||||
imports = [
|
||||
"DBus.Notify"
|
||||
"DBus.Client (clientErrorMessage)"
|
||||
"System.IO"
|
||||
"Data.Aeson"
|
||||
"Control.Monad"
|
||||
"Data.These"
|
||||
"qualified Data.HashMap.Strict as HM"
|
||||
"Data.Time"
|
||||
"qualified Data.Vector as V"
|
||||
"qualified Data.List as List"
|
||||
];
|
||||
on-modify = writeHaskellScript {
|
||||
name = "on-modify";
|
||||
inherit imports;
|
||||
} ''
|
||||
${functions}
|
||||
main = do
|
||||
input1 <- BS.hGetLine stdin
|
||||
input2 <- BS.hGetLine stdin
|
||||
let description = do
|
||||
Object task1 <- decode $ toLazy input1 :: Maybe Value
|
||||
Object task2 <- decode $ toLazy input2 :: Maybe Value
|
||||
let diff = HM.unions [
|
||||
fmap This (HM.difference task1 task2),
|
||||
fmap That (HM.difference task2 task1),
|
||||
(HM.mapMaybe (\x->x) $ HM.intersectionWith (\old new -> if old /= new then Just $ These old new else Nothing) task1 task2)
|
||||
]
|
||||
String description2 <- HM.lookup "description" task2
|
||||
pure (description2, printMap diff)
|
||||
Control.Monad.forM_ description $ \(d,b) -> do
|
||||
client <- try connectSession
|
||||
either
|
||||
(BS.hPut stderr . encodeUtf8 . (++ "\n") . clientErrorMessage)
|
||||
(\c -> void $ notify c blankNote { summary = [i|Modified task #{d}|], body = Just $ Text b, expiry = Milliseconds 15000 })
|
||||
client
|
||||
BS.hPut stdout input2
|
||||
'';
|
||||
on-add = writeHaskellScript {
|
||||
name = "on-add";
|
||||
inherit imports;
|
||||
} ''
|
||||
${functions}
|
||||
main = do
|
||||
input <- BS.hGetContents stdin
|
||||
let description = do
|
||||
Object task <- decode $ toLazy input :: Maybe Value
|
||||
pure . printMap . fmap That $ task
|
||||
whenJust description $ \d -> do
|
||||
client <- try connectSession
|
||||
either
|
||||
(BS.hPut stderr . encodeUtf8 . clientErrorMessage)
|
||||
(\c -> void $ notify c blankNote { summary = "New Task", body = Just $ Text d, expiry = Milliseconds 15000 })
|
||||
client
|
||||
BS.hPut stdout input
|
||||
'';
|
||||
in {
|
||||
"add-notification" = {
|
||||
target = ".task/hooks/on-add.notification";
|
||||
source = "${on-add}/bin/on-add";
|
||||
};
|
||||
"modify-notification" = {
|
||||
target = ".task/hooks/on-modify.notification";
|
||||
source = "${on-modify}/bin/on-modify";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -4,111 +4,7 @@
|
|||
enable = true;
|
||||
frequency = "*:0/1";
|
||||
};
|
||||
home.file = let
|
||||
functions = ''
|
||||
printMap :: HashMap Text (These Value Value) -> String
|
||||
printMap = intercalate "\n" . fmap printPair . filter filterPairs . HM.toList
|
||||
filterPairs = \(k,_) -> k `notElem` ["uuid","entry","modified"]
|
||||
printPair = \(k,v) -> case v of
|
||||
This old -> [i|#{k}: -#{printValue old}|]
|
||||
That new -> [i|#{k}: +#{printValue new}|]
|
||||
These old new -> printDiff k old new
|
||||
printDiff :: Text -> Value -> Value -> String
|
||||
printDiff k (Array before) (Array after) = let
|
||||
old = (V.toList before) List.\\ (V.toList after)
|
||||
new = (V.toList after) List.\\ (V.toList before)
|
||||
in
|
||||
[i|#{k}: #{intercalate ", " ((('-':) . printValue <$> old) ++ (('+':) . printValue <$> new))}|]
|
||||
printDiff k old new = [i|#{k}: +#{printValue new} -#{printValue old}|]
|
||||
printValue = \case
|
||||
String (toString -> a) -> if | Just (d :: UTCTime) <- parseTimeM False defaultTimeLocale "%Y%m%dT%H%M%SZ" a -> show d
|
||||
| otherwise -> a
|
||||
Number a -> show a
|
||||
Array (fmap printValue -> a) -> intercalate "\n" (toList a)
|
||||
Object a -> show $ toList a
|
||||
Bool a -> show a
|
||||
Null -> "null"
|
||||
'';
|
||||
inherit (pkgs) writeHaskellScript;
|
||||
imports = [
|
||||
"DBus.Notify"
|
||||
"DBus.Client (clientErrorMessage)"
|
||||
"System.IO"
|
||||
"Data.Aeson"
|
||||
"Control.Monad"
|
||||
"Data.These"
|
||||
"qualified Data.HashMap.Strict as HM"
|
||||
"Data.Time"
|
||||
"qualified Data.Vector as V"
|
||||
"qualified Data.List as List"
|
||||
];
|
||||
on-modify = writeHaskellScript {
|
||||
name = "on-modify";
|
||||
inherit imports;
|
||||
} ''
|
||||
${functions}
|
||||
main = do
|
||||
input1 <- BS.hGetLine stdin
|
||||
input2 <- BS.hGetLine stdin
|
||||
let description = do
|
||||
Object task1 <- decode $ toLazy input1 :: Maybe Value
|
||||
Object task2 <- decode $ toLazy input2 :: Maybe Value
|
||||
let diff = HM.unions [
|
||||
fmap This (HM.difference task1 task2),
|
||||
fmap That (HM.difference task2 task1),
|
||||
(HM.mapMaybe (\x->x) $ HM.intersectionWith (\old new -> if old /= new then Just $ These old new else Nothing) task1 task2)
|
||||
]
|
||||
String description2 <- HM.lookup "description" task2
|
||||
pure (description2, printMap diff)
|
||||
Control.Monad.forM_ description $ \(d,b) -> do
|
||||
client <- try connectSession
|
||||
either
|
||||
(BS.hPut stderr . encodeUtf8 . (++ "\n") . clientErrorMessage)
|
||||
(\c -> void $ notify c blankNote { summary = [i|Modified task #{d}|], body = Just $ Text b, expiry = Milliseconds 15000 })
|
||||
client
|
||||
BS.hPut stdout input2
|
||||
'';
|
||||
on-add = writeHaskellScript {
|
||||
name = "on-add";
|
||||
inherit imports;
|
||||
} ''
|
||||
${functions}
|
||||
main = do
|
||||
input <- BS.hGetContents stdin
|
||||
let description = do
|
||||
Object task <- decode $ toLazy input :: Maybe Value
|
||||
pure . printMap . fmap That $ task
|
||||
whenJust description $ \d -> do
|
||||
client <- try connectSession
|
||||
either
|
||||
(BS.hPut stderr . encodeUtf8 . clientErrorMessage)
|
||||
(\c -> void $ notify c blankNote { summary = "New Task", body = Just $ Text d, expiry = Milliseconds 15000 })
|
||||
client
|
||||
BS.hPut stdout input
|
||||
'';
|
||||
in {
|
||||
"add-git" = {
|
||||
target = ".task/hooks/on-add.git";
|
||||
text = ''
|
||||
export PATH=${pkgs.git}/bin:$PATH
|
||||
exec ${pkgs.taskwarrior-git}/bin/taskwarrior-git on-add'';
|
||||
executable = true;
|
||||
};
|
||||
"modify-git" = {
|
||||
target = ".task/hooks/on-modify.git";
|
||||
text = ''
|
||||
export PATH=${pkgs.git}/bin:$PATH
|
||||
exec ${pkgs.taskwarrior-git}/bin/taskwarrior-git on-modify'';
|
||||
executable = true;
|
||||
};
|
||||
"add-notification" = {
|
||||
target = ".task/hooks/on-add.notification";
|
||||
source = "${on-add}/bin/on-add";
|
||||
};
|
||||
"modify-notification" = {
|
||||
target = ".task/hooks/on-modify.notification";
|
||||
source = "${on-modify}/bin/on-modify";
|
||||
};
|
||||
home.file = {
|
||||
"add-kassandra-notification" = {
|
||||
target = ".task/hooks/on-add.kassandra-notification";
|
||||
executable = true;
|
||||
|
|
@ -126,8 +22,7 @@
|
|||
'';
|
||||
};
|
||||
};
|
||||
programs.taskwarrior = let cfg = config.m-0.private.taskwarrior;
|
||||
in {
|
||||
programs.taskwarrior = {
|
||||
enable = true;
|
||||
dataLocation = "${config.home.homeDirectory}/.task";
|
||||
config = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue