kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-19 11:31:09 +01:00
Code Releases Activity

feat(maakaron): make hora tools more robust

Browse Source
This commit is contained in:
Kierán Meinhardt
2024-04-02 14:27:44 +02:00
parent 6ec31211d9
commit 0abebcced3
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
systems/maakaron/home.nix
View File

@@ -31,24 +31,28 @@ in {
(pkgs.writers.writeDashBin "hora-edit" '' (pkgs.writers.writeDashBin "hora-edit" ''
nvim + "${timeLedger}" nvim + "${timeLedger}"
'') '')
(pkgs.writers.writeDashBin "hora-status" ''
${pkgs.coreutils}/bin/tac "${timeLedger}" | ${pkgs.gnugrep}/bin/grep -m 1 .
'')
(pkgs.writers.writeDashBin "hora-start" '' (pkgs.writers.writeDashBin "hora-start" ''
[ -w "${timeLedger}" ] || { [ -w "${timeLedger}" ] || {
echo "${timeLedger}" is not a writable file >/dev/stderr echo "${timeLedger}" is not a writable file >/dev/stderr
exit 1 exit 1
} }
(${pkgs.coreutils}/bin/tail -n 1 "${timeLedger}" | ${pkgs.gnugrep}/bin/grep -q "^o") || { last_nonempty_line=$(hora-status)
echo "Last activity must be closed: $(${pkgs.coreutils}/bin/tail -n 1 "${timeLedger}")" >/dev/stderr (echo $last_nonempty_line | ${pkgs.gnugrep}/bin/grep -q "^o") || {
echo "Last activity must be closed: $last_nonempty_line" >/dev/stderr
exit 1 exit 1
} }
account=$1 account=$1
(${pkgs.hledger}/bin/hledger -f "${timeLedger}" accounts | ${pkgs.gnugrep}/bin/grep -q "^$account\$") || { (hora accounts | ${pkgs.gnugrep}/bin/grep -q "^$account\$") || {
echo "The account '$account' is not known. Please add manually." echo "The account '$account' is not known. Please add manually."
exit 1 exit 1
} }
message=$2 message=$2
date=$(${pkgs.coreutils}/bin/date +"%Y-%m-%d %H:%M:%S") date=$(${pkgs.coreutils}/bin/date +"%Y-%m-%d %H:%M:%S")
echo "i $date $account $message" >> "${timeLedger}" echo "i $date $account $message\n" >> "${timeLedger}"
echo Started $account at $date >/dev/stderr echo Started $account at $date >/dev/stderr
'') '')
(pkgs.writers.writeDashBin "hora-stop" '' (pkgs.writers.writeDashBin "hora-stop" ''
@@ -56,15 +60,17 @@ in {
echo "${timeLedger}" is not a writable file >/dev/stderr echo "${timeLedger}" is not a writable file >/dev/stderr
exit 1 exit 1
} }
(${pkgs.coreutils}/bin/tail -n 1 "${timeLedger}" | ${pkgs.gnugrep}/bin/grep "^i") || { last_nonempty_line=$(hora-status)
echo "Last activity cannot be closed: $(${pkgs.coreutils}/bin/tail -n 1 "${timeLedger}")" >/dev/stderr (echo $last_nonempty_line | ${pkgs.gnugrep}/bin/grep "^i") || {
echo "Last activity cannot be closed: $last_nonempty_line" >/dev/stderr
exit 1 exit 1
} }
last_activity=$(${pkgs.coreutils}/bin/tail -n 1 ${timeLedger} | ${pkgs.coreutils}/bin/cut -d' ' -f 3) last_activity=$(${pkgs.coreutils}/bin/tail -n 1 ${timeLedger} | ${pkgs.coreutils}/bin/cut -d' ' -f 4)
date=$(${pkgs.coreutils}/bin/date +"%Y-%m-%d %H:%M:%S")
echo "o $(${pkgs.coreutils}/bin/date +"%Y-%m-%d %H:%M:%S")" >> ${timeLedger} echo "o $date\n" >> ${timeLedger}
echo Stopped $last_activity >/dev/stderr echo Stopped $last_activity at $date >/dev/stderr
'') '')
niveumPackages.vim niveumPackages.vim
pkgs.ghc pkgs.ghc