Nickiel/nicks_nextcloud_integrations
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

renamed chrono_track in flake.nix; updated cargohashes

Browse source
This commit is contained in:
Nickiel12 2023-09-11 18:10:18 -07:00
parent c728c44521
commit 36a1db441e
3 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Cargo.lock generated
View file

@ -332,6 +332,23 @@ dependencies = [
"phf_codegen", "phf_codegen",
] ]
[[package]]
name = "chrono_track"
version = "0.1.0"
dependencies = [
"chrono",
"chrono-tz",
"clap",
"csv",
"lettre",
"log",
"reqwest",
"serde",
"serde_json",
"simplelog",
"toml",
]
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.4.2" version = "4.4.2"
@ -1555,23 +1572,6 @@ dependencies = [
"time-core", "time-core",
] ]
[[package]]
name = "time_tracker"
version = "0.1.0"
dependencies = [
"chrono",
"chrono-tz",
"clap",
"csv",
"lettre",
"log",
"reqwest",
"serde",
"serde_json",
"simplelog",
"toml",
]
[[package]] [[package]]
name = "tinyvec" name = "tinyvec"
version = "1.6.0" version = "1.6.0"

2
chrono_track/Cargo.toml
View file

@ -1,5 +1,5 @@
[package] [package]
name = "time_tracker" name = "chrono_track"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"

51
flake.nix
View file

@ -62,25 +62,26 @@ rust-project TODO: write shell script for automatically updating `cargoHash`
pname = "status_cloud"; pname = "status_cloud";
version = "0.1.0"; version = "0.1.0";
buildAndTestSubdir = "status_cloud"; buildAndTestSubdir = "status_cloud";
cargoHash = "sha256-XIonh2SQ8EichcZvHErSydt0qtKGodXE0yKz4BsntA8="; cargoHash = "sha256-mXcD/92WJLgN2efX/8EiV3rOqUiNOKGC4puS8DvGFOc=";
preBuild = '' postFixup = ''
sed -i 's/Command::new("hddtemp")/Command::new("${nixpkgs.lib.escape [ "/" ] "${pkgs.hddtemp}"}")/g' status_cloud/src/main.rs wrapProgram $out/bin/status_cloud \
--prefix PATH : "${nixpkgs.lib.makeBinPath [ pkgs.hddtemp ]}"
''; '';
meta = meta // { meta = meta // {
description = "Server status saved to a nextcloud note service."; description = "Server status saved to a nextcloud note service.";
}; };
}); });
time_tracker = pkgs.rustPlatform.buildRustPackage (rustSettings // { chrono_track = pkgs.rustPlatform.buildRustPackage (rustSettings // {
pname = "time_tracker"; pname = "chrono_track";
version = "0.1.0"; version = "0.1.0";
buildAndTestSubdir = "time_tracker"; buildAndTestSubdir = "chrono_track";
cargoHash = "sha256-5Wy2+ef2BriKmvNhllDVh/clAZGV7myDc281ygj05vI="; cargoHash = "sha256-51j5eG2ZBJg2TjbvYSEvvmOM4hhPyNohN+LUmvck88k=";
meta = meta // { meta = meta // {
description = "Using nextcloud notes to track time usage."; description = "Using nextcloud notes to track time usage.";
}; };
postFixup = '' postFixup = ''
wrapProgram $out/bin/time_tracker \ wrapProgram $out/bin/chrono_track \
--prefix PATH : "${nixpkgs.lib.makeBinPath [ pkgs.msmtp ]}" --prefix PATH : "${nixpkgs.lib.makeBinPath [ pkgs.msmtp ]}"
''; '';
}); });
@ -138,14 +139,14 @@ rust-project TODO: write shell script for automatically updating `cargoHash`
# Time Tracker # Time Tracker
options.services.time_tracker = { options.services.chrono_track = {
enable = lib.mkEnableOption (lib.mdDoc "time tracker service"); enable = lib.mkEnableOption (lib.mdDoc "chrono track, time tracking service");
package = lib.mkOption { package = lib.mkOption {
type = lib.types.package; type = lib.types.package;
default = self.packages.${system}.time_tracker; default = self.packages.${system}.chrono_track;
defaultText = "pkgs.time_tracker"; defaultText = "pkgs.chrono_track";
description = lib.mdDoc '' description = lib.mdDoc ''
The time_tracker package that should be used The chrono_track package that should be used
''; '';
}; };
config_path = lib.mkOption { config_path = lib.mkOption {
@ -154,6 +155,12 @@ rust-project TODO: write shell script for automatically updating `cargoHash`
The file path to the toml that contains user information secrets The file path to the toml that contains user information secrets
''; '';
}; };
from_address = lib.mkOption {
type = lib.types.str;
description = lib.mdDoc ''
The from address for the emails. E.g. noreply@example.com
'';
};
frequency = lib.mkOption { frequency = lib.mkOption {
type = lib.types.int; type = lib.types.int;
description = lib.mdDoc '' description = lib.mdDoc ''
@ -162,25 +169,25 @@ rust-project TODO: write shell script for automatically updating `cargoHash`
}; };
}; };
config.systemd.services.time_tracker = let config.systemd.services.chrono_track = let
cfg = config.services.time_tracker; cfg = config.services.chrono_track;
pkg = self.packages.${system}.time_tracker; pkg = self.packages.${system}.chrono_track;
in lib.mkIf cfg.enable { in lib.mkIf cfg.enable {
description = "Nextcloud Time Tracker"; description = "Chrono Track";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = '' ExecStart = ''
${cfg.package}/bin/time_tracker --config-file ${builtins.toString cfg.config_path} ${cfg.package}/bin/chrono_track --config-file ${builtins.toString cfg.config_path} --from_addr ${cfg.from_address}
''; '';
}; };
}; };
config.systemd.timers.time_tracker = let config.systemd.timers.chrono_track = let
cfg = config.services.time_tracker; cfg = config.services.chrono_track;
pkg = self.packages.${system}.time_tracker; pkg = self.packages.${system}.chrono_track;
in lib.mkIf cfg.enable { in lib.mkIf cfg.enable {
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
partOf = [ "time_tracker.service" ]; partOf = [ "chrono_track.service" ];
timerConfig.OnCalendar = [ "*:0/${builtins.toString cfg.frequency}" ]; timerConfig.OnCalendar = [ "*:0/${builtins.toString cfg.frequency}" ];
}; };