yoshie
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: sync upstream and add delta

main
sudo pacman -Syu 2024-03-08 23:03:12 +07:00
parent 997e05f140
commit 5bac921d9c
4 changed files with 1931 additions and 860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2741
data/bat/themes/Catppuccin-mocha.tmTheme
View File

File diff suppressed because it is too large Load Diff

10
data/data.toml
View File

@ -52,12 +52,20 @@ external = "~/.config/bat"
[[apps.bat.paths]]
internal = "data/bat/themes/Catppuccin-mocha.tmTheme"
url = "https://raw.githubusercontent.com/catppuccin/bat/main/Catppuccin-mocha.tmTheme"
url = "https://raw.githubusercontent.com/catppuccin/bat/main/themes/Catppuccin%20Mocha.tmTheme"
[[apps.ripgrep.paths]]
internal = "data/ripgrep"
external = "~/.config/ripgrep"
[[apps.delta.paths]]
internal = "data/delta/mocha.gitconfig"
url = "https://raw.githubusercontent.com/catppuccin/delta/main/themes/mocha.gitconfig"
[[apps.delta.paths]]
internal = "data/delta/mocha.gitconfig"
external = "~/.config/delta/mocha.gitconfig"
[[apps.tmux.paths]]
internal = "data/tmux"
external = "~/.config/tmux"

26
data/delta/mocha.gitconfig Normal file
View File

@ -0,0 +1,26 @@
[delta "catppuccin-mocha"]
blame-palette = "#1e1e2e #181825 #11111b #313244 #45475a"
commit-decoration-style = "box ul"
dark = true
file-decoration-style = "#cdd6f4"
file-style = "#cdd6f4"
hunk-header-decoration-style = "box ul"
hunk-header-file-style = "bold"
hunk-header-line-number-style = "bold #a6adc8"
hunk-header-style = "file line-number syntax"
line-numbers = true
line-numbers-left-style = "#6c7086"
line-numbers-minus-style = "bold #f38ba8"
line-numbers-plus-style = "bold #a6e3a1"
line-numbers-right-style = "#6c7086"
line-numbers-zero-style = "#6c7086"
# 25% red 75% base
minus-emph-style = "bold syntax #53394c"
# 10% red 90% base
minus-style = "syntax #35293b"
# 25% green 75% base
plus-emph-style = "bold syntax #40504b"
# 10% green 90% base
plus-style = "syntax #2c333a"
# Should match the name of the bat theme
syntax-theme = "Catppuccin-mocha"

14
scripts/git.sh
View File

@ -45,14 +45,16 @@ git config --global submodule.recurse true
# https://github.com/dandavison/delta
git config --global core.pager delta
git config --global delta.navigate true
git config --global delta.features catppuccin-mocha
git config --global delta.file-decoration-style none
git config --global delta.hunk-header-decoration-style none
git config --global delta.navigate true
git config --global include.path "~/.config/delta/mocha.gitconfig"
# https://github.com/Wilfred/difftastic
git config --global diff.tool difftastic
git config --global difftool.prompt false
git config --global difftool.difftastic.cmd 'difft "$LOCAL" "$REMOTE"'
git config --global pager.difftool true
git config --global alias.dft "difftool"
git config --global alias.dfct "difftool --cached"
git config --global alias.dft "difftool"
git config --global diff.tool difftastic
git config --global difftool.difftastic.cmd 'difft "$LOCAL" "$REMOTE"'
git config --global difftool.prompt false
git config --global pager.difftool true