daniel/dotfiles
1
0
Fork 0
Code Actions Activity

git: Switch to difftastic

Browse source
This commit is contained in:
Daniel Kempkens 2022-04-01 10:12:43 +02:00
parent ef70d8ad31
commit 193952a2df
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1648366999, "lastModified": 1648751066,
"narHash": "sha256-Sdm0lI2ZBc70EnMMmvfDVY7gIM3M4c2L86EdQ9tKRE4=", "narHash": "sha256-pYUSID9rSgYnl4PNa45/haCaHUKzY+Ul0fkqqSGflxs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "888eac32bd657bfe0d024c8770130d80d1c02cd3", "rev": "cf62e96bf7c72e6a88e0bd43165110f42e44cdb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -96,11 +96,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1648420800, "lastModified": 1648694921,
"narHash": "sha256-v94uORfC8q9CGwCwM4UZCo5f8F0cvMyvhMvpPY8wH6U=", "narHash": "sha256-qK14o6cgUon8LvmuuAg5MT9jougpkFiaiO6HQF5+Z+E=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "79dcd045d3623ff71903e2806be489bd5fe3200d", "rev": "1184097261260e53519db54548acf2c1e5ab7e68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1648455466, "lastModified": 1648714786,
"narHash": "sha256-05K7zu1MUMNkDOiserTayFjQqKoXyWKmZ0IZSmTkNDU=", "narHash": "sha256-DAgcWFWK6yaAeLJ8XwIJcIvyTzCp3BOrBvdJAFNyBjQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "400d52d370fb9482f426f0c64f60b798cae9b8e0", "rev": "ab6514c925093164e6161ecde5027fa2ad83742e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1648427755, "lastModified": 1648773669,
"narHash": "sha256-ASljJgGNt+c3u2uTXxSFA3BFojiWTi+JSBnqWoj2V4Y=", "narHash": "sha256-apwKGQ5AqJ6qIX2Qf73evyMWGEiqQvaD2qw42YKg2EY=",
"owner": "arqv", "owner": "arqv",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "dbab10bbd1c0fd779ba09a4c540f9e922e3a186c", "rev": "75d588726a75c4b98b82c86e51fb7a70a6d3bef8",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
programs/git.nix
View file

@ -8,7 +8,6 @@ in
programs.git = { programs.git = {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
delta.enable = true;
userName = "Daniel Kempkens"; userName = "Daniel Kempkens";
userEmail = "daniel+git@kempkens.io"; userEmail = "daniel+git@kempkens.io";
@ -33,8 +32,7 @@ in
}; };
diff = { diff = {
indentheuristic = true; external = "difft";
algorithm = "histogram";
}; };
apply = { apply = {
@ -68,10 +66,6 @@ in
condition = "gitdir:~/Code/Work/WDW/"; condition = "gitdir:~/Code/Work/WDW/";
} }
]; ];
delta.options = {
theme = "Dracula";
};
}; };
home.file."${config-work-nedeco}".source = ../config/git/config-work-nedeco; home.file."${config-work-nedeco}".source = ../config/git/config-work-nedeco;