thilobillerbeck/dotfiles
1
0
Fork 0
mirror of https://github.com/thilobillerbeck/dotfiles.git synced 2024-11-22 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles

Browse source
This commit is contained in:
Thilo Billerbeck 2024-10-08 22:41:12 +02:00
commit 8e392148bb
7 changed files with 93 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1726867173,
"narHash": "sha256-jPKALMGCCwuCRWWTygVePJZb4VB4XV/aAtZRwPYzehw=",
"lastModified": 1728287529,
"narHash": "sha256-CgS9mFl4FudVF2PR3fzK+6pTXWqge4HrP04TgeEvKAM=",
"owner": "dagger",
"repo": "nix",
"rev": "a46ddf2e3f69a62f49cea83e8f7a66979197eff4",
"rev": "45b1f49cee26b3514d975f6b461500ec051f0674",
"type": "github"
},
"original": {
@ -93,11 +93,11 @@
]
},
"locked": {
"lastModified": 1727383923,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"lastModified": 1728337164,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
"type": "github"
},
"original": {
@ -213,11 +213,11 @@
]
},
"locked": {
"lastModified": 1727580512,
"narHash": "sha256-gEWoJ+027OwsNs6f1GkDPrCxBFr5Vky7vWKjHRJi60s=",
"lastModified": 1728263287,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "a2ab1588541ae442bd3a682f8f6bbcbca2672f10",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
"type": "github"
},
"original": {
@ -271,11 +271,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1726268095,
"narHash": "sha256-wBd1hcz4wSZYP0+TveNqKYQrdI6ZKMo2FxDluUiI8kc=",
"lastModified": 1727910488,
"narHash": "sha256-2wU4hcFOdqWLqVjUib5ffZMRDagXxsrD5puXugubon8=",
"owner": "ryantm",
"repo": "nixpkgs-update",
"rev": "d55f27272f33975d67b13be9fa241cdea297dfb1",
"rev": "2625c4cffc6053ae368741b0da69a3f329f6e735",
"type": "github"
},
"original": {
@ -286,11 +286,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"lastModified": 1728241625,
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
"type": "github"
},
"original": {

15
home-manager/dotfiles/justfile Normal file
View file

@ -0,0 +1,15 @@
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

3
home-manager/modules/machine.nix
View file

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

1
home-manager/modules/packages.nix
View file

@ -100,6 +100,7 @@ in
[
(nixGL insomnia)
(nixGL comma)
# (nixGL processing)
(nixGL scrcpy)
]
else

12
home-manager/pkgs/toggl-time-grouper/toggl-time-grouper
View file

@ -17,8 +17,12 @@ df.rename(columns={
'Duration': 'duration'
}, inplace=True)
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))
dfg = df.groupby(['project','description','day'], as_index=False).agg({'duration': 'sum'})
dfg['duration'] = round(dfg['duration'].dt.total_seconds() / 60 / 60, 2)
print("Total hours are: ", round(dfg['duration'].sum(), 2))
df.to_csv(Path(sys.argv[1]).stem + '-grouped.csv', index=False)
dfg.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(".",","))

23
home-manager/programs/kitty.nix Normal file
View file

@ -0,0 +1,23 @@
{
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
'';
};
}

23
home-manager/programs/ssh.nix
View file

@ -55,37 +55,46 @@ let
PubkeyAcceptedKeyTypes = "+ssh-rsa";
};
};
"flanders" = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "thilo";
};
};
catchAlls = builtins.listToAttrs (
builtins.map (host: {
builtins.map
(host: {
name = "*.${host}";
value = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "root";
};
}) ownDomains
})
ownDomains
);
hostnameAliasses = builtins.listToAttrs (
builtins.map (host: {
builtins.map
(host: {
name = "${host}";
value = {
hostname = "${host}.thilo-billerbeck.com";
};
}) thiloBillerbeckHosts
})
thiloBillerbeckHosts
);
buildersCCCDA = builtins.listToAttrs (
builtins.map (host: {
builtins.map
(host: {
name = "build${host}.darmstadt.ccc.de";
value = {
user = "avocadoom";
identityFile = "~/.ssh/id_darmstadt-ccc-de";
};
}) ["1" "2" "3" "4"]
}) [ "1" "2" "3" "4" ]
);
in
{
programs.ssh = {
enable = true;
matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses // buildersCCCDA;
matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses;
};
}