diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix index 4e7d9bd..c71d346 100644 --- a/configs/thilo-pc/nixos.nix +++ b/configs/thilo-pc/nixos.nix @@ -149,6 +149,7 @@ time.hardwareClockInLocalTime = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.trusted-users = [ "root" "thilo" ]; nixpkgs.config.permittedInsecurePackages = [ "electron-24.8.6" diff --git a/flake.lock b/flake.lock index 8006602..f635d6e 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1698670511, - "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", + "lastModified": 1698896213, + "narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "8e5416b478e465985eec274bc3a018024435c106", + "rev": "831b4fa31749208e576050c563e9773aafd04941", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1698610559, - "narHash": "sha256-i8vFNXJz9VcH05oNe/3Jm5f+CtE3g5uOUvF/dobTMUQ=", + "lastModified": 1698956996, + "narHash": "sha256-X029F/YpX0HoE5ppGaVWY+arqI2DokggQtJACSl67+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e43dd49630303b00120c11d00d4fb01bb40188d", + "rev": "e8be045c25d93f18f3530ac2dfa264750c6778b7", "type": "github" }, "original": { diff --git a/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper b/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper index 4f8373c..53ce0d4 100644 --- a/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper +++ b/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper @@ -9,7 +9,16 @@ df = pd.read_csv(sys.argv[1]) df = df.drop(columns=['User', 'Email', 'Billable', 'Tags', 'Amount ()', 'Start time', 'End date', 'End time']) df['Duration'] = pd.to_timedelta(df['Duration']) df['Start date'] = pd.to_datetime(df['Start date']) +df['duration_dec'] = df['Duration'].dt.total_seconds() / 3600 +df.rename(columns={ + 'Project': 'project', + 'Description': 'description', + 'Start date': 'day', + 'Duration': 'duration' +}, inplace=True) -df = df.groupby(['Project','Description','Start date'])['Duration'].sum() +df = df.groupby(['project','description','day'], as_index=False).agg({'duration': 'sum'}) +df['duration'] = round(df['duration'].dt.total_seconds() / 60 / 60, 2) +print("Total hours are: ", round(df['duration'].sum(), 2)) -df.to_csv(Path(sys.argv[1]).stem + '-grouped.csv') \ No newline at end of file +df.to_csv(Path(sys.argv[1]).stem + '-grouped.csv', index=False) \ No newline at end of file