feat: use delta instead of difftastic
This commit is contained in:
parent
41fc5bb328
commit
022abfffc5
2 changed files with 26 additions and 6 deletions
|
@ -24,8 +24,21 @@
|
|||
signByDefault = true;
|
||||
};
|
||||
|
||||
difftastic = {
|
||||
delta = {
|
||||
enable = true;
|
||||
options = {
|
||||
dark = true;
|
||||
theme = "Solarized (dark)";
|
||||
side-by-side = true;
|
||||
line-numbers = true;
|
||||
true-color = "always";
|
||||
plus-style = "syntax \"#003800\"";
|
||||
minus-style = "syntax \"#380000\"";
|
||||
};
|
||||
};
|
||||
|
||||
difftastic = {
|
||||
enable = false;
|
||||
background = "light";
|
||||
display = "side-by-side-show-both";
|
||||
enableAsDifftool = true;
|
||||
|
@ -41,7 +54,6 @@
|
|||
core = {
|
||||
editor = "nvim";
|
||||
fsmonitor = true;
|
||||
pager = "less -FX";
|
||||
untrackedCache = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,10 +1,17 @@
|
|||
{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"gh-copilot"
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
delta
|
||||
];
|
||||
|
||||
programs = {
|
||||
gh = {
|
||||
enable = true;
|
||||
|
@ -29,6 +36,7 @@
|
|||
width = 64;
|
||||
};
|
||||
};
|
||||
pager.diff = "delta";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue