diff --git a/flake.lock b/flake.lock index cf1cc2d..67a329f 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1648366999, - "narHash": "sha256-Sdm0lI2ZBc70EnMMmvfDVY7gIM3M4c2L86EdQ9tKRE4=", + "lastModified": 1648751066, + "narHash": "sha256-pYUSID9rSgYnl4PNa45/haCaHUKzY+Ul0fkqqSGflxs=", "owner": "nix-community", "repo": "home-manager", - "rev": "888eac32bd657bfe0d024c8770130d80d1c02cd3", + "rev": "cf62e96bf7c72e6a88e0bd43165110f42e44cdb4", "type": "github" }, "original": { @@ -96,11 +96,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1648420800, - "narHash": "sha256-v94uORfC8q9CGwCwM4UZCo5f8F0cvMyvhMvpPY8wH6U=", + "lastModified": 1648694921, + "narHash": "sha256-qK14o6cgUon8LvmuuAg5MT9jougpkFiaiO6HQF5+Z+E=", "owner": "neovim", "repo": "neovim", - "rev": "79dcd045d3623ff71903e2806be489bd5fe3200d", + "rev": "1184097261260e53519db54548acf2c1e5ab7e68", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1648455466, - "narHash": "sha256-05K7zu1MUMNkDOiserTayFjQqKoXyWKmZ0IZSmTkNDU=", + "lastModified": 1648714786, + "narHash": "sha256-DAgcWFWK6yaAeLJ8XwIJcIvyTzCp3BOrBvdJAFNyBjQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "400d52d370fb9482f426f0c64f60b798cae9b8e0", + "rev": "ab6514c925093164e6161ecde5027fa2ad83742e", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1648427755, - "narHash": "sha256-ASljJgGNt+c3u2uTXxSFA3BFojiWTi+JSBnqWoj2V4Y=", + "lastModified": 1648773669, + "narHash": "sha256-apwKGQ5AqJ6qIX2Qf73evyMWGEiqQvaD2qw42YKg2EY=", "owner": "arqv", "repo": "zig-overlay", - "rev": "dbab10bbd1c0fd779ba09a4c540f9e922e3a186c", + "rev": "75d588726a75c4b98b82c86e51fb7a70a6d3bef8", "type": "github" }, "original": { diff --git a/programs/git.nix b/programs/git.nix index 28025b0..da22b68 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -8,7 +8,6 @@ in programs.git = { enable = true; lfs.enable = true; - delta.enable = true; userName = "Daniel Kempkens"; userEmail = "daniel+git@kempkens.io"; @@ -33,8 +32,7 @@ in }; diff = { - indentheuristic = true; - algorithm = "histogram"; + external = "difft"; }; apply = { @@ -68,10 +66,6 @@ in condition = "gitdir:~/Code/Work/WDW/"; } ]; - - delta.options = { - theme = "Dracula"; - }; }; home.file."${config-work-nedeco}".source = ../config/git/config-work-nedeco;