Compare commits
3 Commits
bcce589cc1
...
14cee7d351
Author | SHA1 | Date | |
---|---|---|---|
14cee7d351 | |||
8dd7fe61fc | |||
c33133f7c9 |
|
@ -1,2 +1,3 @@
|
|||
gitignore
|
||||
profiles
|
||||
configs
|
||||
|
|
54
git/configs/delta.gitconfig
Normal file
54
git/configs/delta.gitconfig
Normal file
|
@ -0,0 +1,54 @@
|
|||
[delta "gruvmax-fang"]
|
||||
# author: https://github.com/maxfangx
|
||||
# Modified by: Dreaded_X
|
||||
# General appearance
|
||||
dark = true
|
||||
syntax-theme = gruvbox-dark
|
||||
# File
|
||||
file-style = "#FFFFFF" bold
|
||||
file-added-label = [+]
|
||||
file-copied-label = [==]
|
||||
file-modified-label = [*]
|
||||
file-removed-label = [-]
|
||||
file-renamed-label = [->]
|
||||
file-decoration-style = "#434C5E" ul
|
||||
file-decoration-style = "#84786A" ul
|
||||
# No hunk headers
|
||||
hunk-header-style = omit
|
||||
# Line numbers
|
||||
line-numbers = true
|
||||
line-numbers-left-style = "#84786A"
|
||||
line-numbers-right-style = "#84786A"
|
||||
line-numbers-minus-style = "#A02A11"
|
||||
line-numbers-plus-style = "#479B36"
|
||||
line-numbers-zero-style = "#84786A"
|
||||
line-numbers-left-format = " {nm:>3} │"
|
||||
line-numbers-right-format = " {np:>3} │"
|
||||
# Diff contents
|
||||
inline-hint-style = syntax
|
||||
minus-non-emph-style = syntax auto
|
||||
plus-non-emph-style = syntax auto
|
||||
whitespace-error-style = "#FB4934" reverse
|
||||
# Blame
|
||||
blame-code-style = syntax
|
||||
# Merge conflicts
|
||||
merge-conflict-begin-symbol = ⌃
|
||||
merge-conflict-end-symbol = ⌄
|
||||
merge-conflict-ours-diff-header-style = "#FABD2F" bold
|
||||
merge-conflict-theirs-diff-header-style = "#FABD2F" bold overline
|
||||
merge-conflict-ours-diff-header-decoration-style = ''
|
||||
merge-conflict-theirs-diff-header-decoration-style = ''
|
||||
|
||||
[core]
|
||||
pager = delta
|
||||
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
|
||||
[delta]
|
||||
features = gruvmax-fang
|
||||
navigate = true
|
||||
side-by-side = true
|
||||
|
||||
[merge]
|
||||
conflictstyle = zdiff3
|
5
git/configs/lfs.gitconfig
Normal file
5
git/configs/lfs.gitconfig
Normal file
|
@ -0,0 +1,5 @@
|
|||
[filter "lfs"]
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
|
@ -1,11 +1,9 @@
|
|||
[include]
|
||||
path = ~/.dotfiles/git/profiles/common
|
||||
path = ~/.dotfiles/git/profiles/Dreaded_X
|
||||
path = ~/.dotfiles/git/configs/common.gitconfig
|
||||
path = ~/.dotfiles/git/configs/lfs.gitconfig
|
||||
path = ~/.dotfiles/git/configs/delta.gitconfig
|
||||
|
||||
path = ~/.dotfiles/git/profiles/ALTEN.gitconfig
|
||||
|
||||
[includeIf "gitdir:~/Projects/ALTEN/"]
|
||||
path = ~/.dotfiles/git/profiles/ALTEN
|
||||
[filter "lfs"]
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
path = ~/.dotfiles/git/profiles/ALTEN.gitconfig
|
||||
|
|
|
@ -55,6 +55,11 @@ export EDITOR=nvim
|
|||
|
||||
alias cl="clear"
|
||||
|
||||
if hash bat 2>/dev/null; then
|
||||
export BAT_THEME="gruvbox-dark"
|
||||
alias cat=bat
|
||||
fi
|
||||
|
||||
if hash devcontainer 2>/dev/null; then
|
||||
dc() {
|
||||
ORIG_DIR="$PWD"
|
||||
|
|
Loading…
Reference in New Issue
Block a user