delta settings

* assets/binary-installers/excite_cymbal_pro-v1.0
This commit is contained in:
Matt Nish-Lapidus 2025-07-13 16:12:17 -04:00
parent 5b79d2daac
commit 761813550c
2 changed files with 13 additions and 37 deletions

View file

@ -17,6 +17,15 @@
ignores = [ ignores = [
".DS_Store" ".DS_Store"
]; ];
delta = {
enable = true;
options = {
navigate = true;
dark = true;
line-numbers = true;
side-by-side = false;
};
};
extraConfig = { extraConfig = {
core = { core = {
editor = "$EDITOR"; editor = "$EDITOR";
@ -25,14 +34,9 @@
interactive = { interactive = {
diffFilter = "${pkgs.delta}/bin/delta --color-only"; diffFilter = "${pkgs.delta}/bin/delta --color-only";
}; };
delta = {
navigate = true;
dark = true;
line-numbers = true;
side-by-side = true;
};
merge = { merge = {
conflictstyle = "zdiff3"; conflictstyle = "zdiff3";
}; };
init = { init = {
defaultBranch = "main"; defaultBranch = "main";

View file

@ -174,9 +174,9 @@
enable = true; enable = true;
settings = { settings = {
nerdFontsVersion = "3"; nerdFontsVersion = "3";
# git = { git = {
# paging.pager = "delta --paging=never"; paging.pager = "delta --paging=never";
# }; };
}; };
}; };
jq.enable = true; jq.enable = true;
@ -184,34 +184,6 @@
enable = true; enable = true;
package = pkgs.rbw; package = pkgs.rbw;
}; };
gitui = {
enable = true;
theme = ''
(
selected_tab: Reset,
command_fg: Black,
selection_bg: Blue,
selection_fg: White,
cmdbar_bg: Blue,
cmdbar_extra_lines_bg: Blue,
disabled_fg: DarkGray,
diff_line_add: Green,
diff_line_delete: Red,
diff_file_added: LightGreen,
diff_file_removed: LightRed,
diff_file_moved: LightMagenta,
diff_file_modified: Yellow,
commit_hash: Magenta,
commit_time: LightCyan,
commit_author: Green,
danger_fg: Red,
push_gauge_bg: Blue,
push_gauge_fg: Reset,
tag_fg: LightMagenta,
branch_fg: LightYellow,
)
'';
};
}; };
xdg.configFile."starship.toml".source = ./shell-conf/starship/starship.toml; xdg.configFile."starship.toml".source = ./shell-conf/starship/starship.toml;