diff --git a/flake.lock b/flake.lock index 4a0681f..344d47a 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/home-manager/dotfiles/justfile b/home-manager/dotfiles/justfile new file mode 100644 index 0000000..f020a76 --- /dev/null +++ b/home-manager/dotfiles/justfile @@ -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 \ No newline at end of file diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix index 9adea44..90abc88 100644 --- a/home-manager/modules/machine.nix +++ b/home-manager/modules/machine.nix @@ -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 = [{ diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 348396f..b447e7d 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -100,6 +100,7 @@ in [ (nixGL insomnia) (nixGL comma) + # (nixGL processing) (nixGL scrcpy) ] else diff --git a/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper b/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper index 53ce0d4..4cdee2b 100644 --- a/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper +++ b/home-manager/pkgs/toggl-time-grouper/toggl-time-grouper @@ -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) \ No newline at end of file +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(".",",")) \ No newline at end of file diff --git a/home-manager/programs/kitty.nix b/home-manager/programs/kitty.nix new file mode 100644 index 0000000..ac567ea --- /dev/null +++ b/home-manager/programs/kitty.nix @@ -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 + ''; + }; +} diff --git a/home-manager/programs/ssh.nix b/home-manager/programs/ssh.nix index d536942..dd123cb 100644 --- a/home-manager/programs/ssh.nix +++ b/home-manager/programs/ssh.nix @@ -55,37 +55,46 @@ let PubkeyAcceptedKeyTypes = "+ssh-rsa"; }; }; + "flanders" = { + identityFile = "~/.ssh/id_thilo-billerbeck-com"; + user = "thilo"; + }; }; catchAlls = builtins.listToAttrs ( - builtins.map (host: { - name = "*.${host}"; - value = { - identityFile = "~/.ssh/id_thilo-billerbeck-com"; - user = "root"; - }; - }) ownDomains + builtins.map + (host: { + name = "*.${host}"; + value = { + identityFile = "~/.ssh/id_thilo-billerbeck-com"; + user = "root"; + }; + }) + ownDomains ); hostnameAliasses = builtins.listToAttrs ( - builtins.map (host: { - name = "${host}"; - value = { - hostname = "${host}.thilo-billerbeck.com"; - }; - }) thiloBillerbeckHosts + builtins.map + (host: { + name = "${host}"; + value = { + hostname = "${host}.thilo-billerbeck.com"; + }; + }) + thiloBillerbeckHosts ); buildersCCCDA = builtins.listToAttrs ( - builtins.map (host: { - name = "build${host}.darmstadt.ccc.de"; - value = { - user = "avocadoom"; + 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; }; }