diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix index ed5cc08..17fdf47 100644 --- a/roles/common/programs/git.nix +++ b/roles/common/programs/git.nix @@ -1,14 +1,31 @@ { config, pkgs, ... }: +let + catppuccinDelta = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "delta"; + rev = "main"; + hash = "sha256-0QQLkfLBVuB2re6tjtPNuOQZNK0MDBAIFgNGHZM8afs="; + }; +in + { home-manager.users.toast = { programs.git = { enable = true; userName = "Toast"; userEmail = "toast003@tutamail.com"; - delta.enable = true; + delta = { + enable = true; + options = { + syntax-theme = "catppuccin-mocha"; + features = "catppuccin-mocha"; + }; + }; + includes = [{ path = "${catppuccinDelta}/themes/mocha.gitconfig"; }]; extraConfig = { init.defaultBranch = "main"; + diff.colorMoved = "default"; commit.verbose = "true"; }; };