diff options
| -rw-r--r-- | .gitconfig | 26 | ||||
| -rw-r--r-- | config/fish/config.fish | 21 | ||||
| -rw-r--r-- | config/fish/delta.toml | 4 |
3 files changed, 50 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..fdbaf13 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,26 @@ +[core] + pager = delta +[interactive] + diffFilter = delta --color-only +[commit] + gpgsign = true +[gpg] + format = ssh +[advice] + addIgnoredFile = false +[init] + defaultBranch = main +[push] + autoSetupRemote = true +[merge] + conflictStyle = zdiff3 +[filter "lfs"] + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f +[delta] + navigate = true # use n and N to move between diff sections + line-numbers = true + hyperlinks = true + features = diff-so-fancy diff --git a/config/fish/config.fish b/config/fish/config.fish index 68be7a8..0556e7a 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -44,6 +44,25 @@ export GPG_TTY=$(tty) # other set -gx EDITOR "nvim" +# fzf + +## open in nvim with <C-o> +set -x fzf_directory_opts --bind "ctrl-o:execute($EDITOR {} &> /dev/tty)" + +## fix theme +function apply_theme --on-variable fish_terminal_color_theme + switch $fish_terminal_color_theme + case "light" + set -gx BAT_THEME "Catppuccin Latte" + case "dark" + set -gx BAT_THEME "Catppuccin Macchiato" + end +end + +## fix display +set -x fzf_diff_highlighter delta --config "$HOME/.config/fish/delta.toml" + +## custom bindings fzf_configure_bindings --directory=\cf --git_log=\cg --git_status=\cs # yazi @@ -58,5 +77,5 @@ end # alias alias ll "eza -lh --icons=auto --sort=name --group-directories-first" -alias lla "ll -a" +alias lla "eza -lha --icons=auto --sort=name --group-directories-first" alias rg "rg -C 3" diff --git a/config/fish/delta.toml b/config/fish/delta.toml new file mode 100644 index 0000000..d7311f5 --- /dev/null +++ b/config/fish/delta.toml @@ -0,0 +1,4 @@ +[delta] + width = 20 + paging = never + features = diff-so-fancy |