Compare commits

..

No commits in common. "d8dc7bcc21b0d2a73cb12259043f727c357c36ef" and "a508b5d5f4d1518bc44347cbed76d3fecff34534" have entirely different histories.

5 changed files with 57 additions and 99 deletions

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728287529, "lastModified": 1725287832,
"narHash": "sha256-CgS9mFl4FudVF2PR3fzK+6pTXWqge4HrP04TgeEvKAM=", "narHash": "sha256-6R7N2cPvmVhdYLMH3Ae7Qvk+/4nvgvfKytUb9xFD9KU=",
"owner": "dagger", "owner": "dagger",
"repo": "nix", "repo": "nix",
"rev": "45b1f49cee26b3514d975f6b461500ec051f0674", "rev": "818205c13580978e1637089c0fd9c8ef9f773899",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,7 +70,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -93,11 +93,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728296299, "lastModified": 1725948275,
"narHash": "sha256-waPSn8ddmvPJBctQaFmSILtElg/Hd62mQPZcbGAxHCI=", "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fcf5e608ac65f64463bc0ccc5ea86f2170f20689", "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,14 +112,14 @@
"nixpkgs-update", "nixpkgs-update",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2" "nixpkgs-for-manual": "nixpkgs-for-manual"
}, },
"locked": { "locked": {
"lastModified": 1710694589, "lastModified": 1669050835,
"narHash": "sha256-5wa+Jzxr+LygoxSZuZg0YU81jgdnx2IY/CqDIJMOgec=", "narHash": "sha256-4ppYRBBY6lIqwMNYp0XA2mku1lSPyX4JaoTf+gt5NDg=",
"owner": "ryantm", "owner": "ryantm",
"repo": "mmdoc", "repo": "mmdoc",
"rev": "b6ddf748b1d1c01ca582bb1b3dafd6bc3a4c83a6", "rev": "cec02bafac9456bd1ed9b261b8d163a893885e5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +157,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1726398642, "lastModified": 1725216861,
"narHash": "sha256-tBM92BUtvY3vawqzl50VLY/EFhxw9LjuB/QN6QUC4ls=", "narHash": "sha256-GaCobLXfPYBuhxy2TdlEDAfS3PD4mrUj6NQIPOzQq48=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "399c8e50f10d9bace3a024496e5f4dee28bdfdcd", "rev": "f92c20327b240ce2098d227c3674d7c02beea51b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -193,11 +193,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726370017, "lastModified": 1723352546,
"narHash": "sha256-CJOV4JiLhd++w9K+h2z00DiB4R1CCuElWzhldrXSq5w=", "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "0a2fba621b6bbf06be0b4edd974236e3d2fcc1a9", "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +213,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728263287, "lastModified": 1725765290,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "rev": "642275444c5a9defce57219c944b3179bf2adaa9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,11 +249,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726062873, "lastModified": 1723362943,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,6 +263,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-for-manual": {
"locked": {
"lastModified": 1663819393,
"narHash": "sha256-SMWfyAOKRPBC95M8dhZJTlb0kHyilr2lKEAfQSHlM7I=",
"owner": "ryantm",
"repo": "nixpkgs",
"rev": "6a6caacfdd079a0fa249046514480a1c4597d861",
"type": "github"
},
"original": {
"owner": "ryantm",
"ref": "minman",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-update": { "nixpkgs-update": {
"inputs": { "inputs": {
"mmdoc": "mmdoc", "mmdoc": "mmdoc",
@ -271,11 +287,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1727910488, "lastModified": 1724139033,
"narHash": "sha256-2wU4hcFOdqWLqVjUib5ffZMRDagXxsrD5puXugubon8=", "narHash": "sha256-NgeBDVvi9ivqHXpRVK97jcweSnMka5txvhOWakgn//M=",
"owner": "ryantm", "owner": "ryantm",
"repo": "nixpkgs-update", "repo": "nixpkgs-update",
"rev": "2625c4cffc6053ae368741b0da69a3f329f6e735", "rev": "7244473cfe4e4b38ad79ef0657877e62e7c05965",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +302,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1728018373, "lastModified": 1725634671,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -316,11 +332,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1726142289, "lastModified": 1719931832,
"narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=", "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "280db3decab4cbeb22a4599bd472229ab74d25e1", "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +382,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1726259531, "lastModified": 1720024176,
"narHash": "sha256-84sIM3Gd7e6PhjsBT2EiiAInJlKQsb4HpgUPTYr6eg0=", "narHash": "sha256-Dl7yX5bFXGGRcKKqrVwnu7OwblfwuvUz6A/qgyhnjsM=",
"owner": "Noodlez1232", "owner": "Noodlez1232",
"repo": "suyu-flake", "repo": "suyu-flake",
"rev": "e3ea28163248edaf5fe2a65f92e9ef3593bdc20a", "rev": "7ccf50531b7483ed2ec4257c0ba732410ec66481",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,21 +440,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -462,7 +463,7 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1709126324,

View file

@ -1,15 +0,0 @@
flatpak-override: flatpak-override-chrome flatpak-override-steam
flatpak-override-chrome:
flatpak override \
--user \
--filesystem=~/.local/share/applications \
--filesystem=~/.local/share/icons \
--filesystem=~/.pki/nssdb \
com.google.Chrome
flatpak-override-steam:
flatpak override \
--user \
--filesystem=~/mnt \
com.valvesoftware.Steam

View file

@ -8,6 +8,7 @@ with lib;
{ {
imports = [ imports = [
./../programs/atuin.nix ./../programs/atuin.nix
./../programs/alacritty.nix
./../programs/bat.nix ./../programs/bat.nix
./../programs/beets.nix ./../programs/beets.nix
./../programs/command-not-found.nix ./../programs/command-not-found.nix
@ -16,7 +17,6 @@ with lib;
./../programs/fzf.nix ./../programs/fzf.nix
./../programs/git.nix ./../programs/git.nix
./../programs/htop.nix ./../programs/htop.nix
./../programs/kitty.nix
./../programs/neovim.nix ./../programs/neovim.nix
./../programs/starship.nix ./../programs/starship.nix
./../programs/topgrade.nix ./../programs/topgrade.nix
@ -89,7 +89,6 @@ with lib;
".config/nano/nanorc".text = '' ".config/nano/nanorc".text = ''
set linenumbers set linenumbers
''; '';
"justfile".source = ./../dotfiles/justfile;
".gitignore".source = ./../dotfiles/.gitignore; ".gitignore".source = ./../dotfiles/.gitignore;
".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = '' ".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = ''
context.modules = [{ context.modules = [{

View file

@ -17,12 +17,8 @@ df.rename(columns={
'Duration': 'duration' 'Duration': 'duration'
}, inplace=True) }, inplace=True)
dfg = df.groupby(['project','description','day'], as_index=False).agg({'duration': 'sum'}) df = df.groupby(['project','description','day'], as_index=False).agg({'duration': 'sum'})
dfg['duration'] = round(dfg['duration'].dt.total_seconds() / 60 / 60, 2) df['duration'] = round(df['duration'].dt.total_seconds() / 60 / 60, 2)
print("Total hours are: ", round(dfg['duration'].sum(), 2)) print("Total hours are: ", round(df['duration'].sum(), 2))
dfg.to_csv(Path(sys.argv[1]).stem + '-grouped.csv', index=False) df.to_csv(Path(sys.argv[1]).stem + '-grouped.csv', index=False)
dfc = dfg.groupby(['project'] , as_index=False).agg({'duration': 'sum'})
for index, row in dfc.iterrows():
print(row['project'], str(row['duration']).replace(".",","))

View file

@ -1,23 +0,0 @@
{
config,
pkgs,
...
}:
let
nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
in
{
programs.kitty = {
enable = true;
package = (nixGL pkgs.kitty);
font = {
name = "JetbrainsMono NFM";
size = 14;
};
themeFile = "Dracula";
extraConfig = ''
background_opacity 0.9
'';
};
}