gaiety/dotfiles
1
1
Fork 0
Code Activity

difftastic, not on debian yet though

Browse source
This commit is contained in:
Ava Gaiety W 2024-03-21 22:20:41 -05:00
parent cd32287b8f
commit fc388e3195
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -7,6 +7,7 @@ Designed for Unix Systems.
* iterm2 for MacOS (via [brew](https://docs.brew.sh/Installation)) `brew install iterm2` (a color theme is in the root directory, feel free to import it in preferences) * iterm2 for MacOS (via [brew](https://docs.brew.sh/Installation)) `brew install iterm2` (a color theme is in the root directory, feel free to import it in preferences)
* [Terminology for Linux](https://www.enlightenment.org/about-terminology.md) * [Terminology for Linux](https://www.enlightenment.org/about-terminology.md)
* [Install asdf](https://asdf-vm.com/#/core-manage-asdf) version manager, configure with tools you'll need * [Install asdf](https://asdf-vm.com/#/core-manage-asdf) version manager, configure with tools you'll need
* Install [Difftastic](https://difftastic.wilfred.me.uk/installation.html)
* Install [NeoVim](https://neovim.io/) * Install [NeoVim](https://neovim.io/)
* Install [LunarVim](https://www.lunarvim.org/) * Install [LunarVim](https://www.lunarvim.org/)
`lvim` to run `lvim` to run

13
git/.gitconfig
View file

@ -2,16 +2,16 @@
name = Ava Gaiety W. name = Ava Gaiety W.
email = ava@wroten.me email = ava@wroten.me
[core] [core]
editor = nvim editor = lvim
pager = delta pager = delta
[pager]
difftool = true
[config] [config]
name = Ava Gaiety Wroten name = Ava Gaiety Wroten
email = ava@wroten.me email = ava@wroten.me
[push] [push]
default = current default = current
followtags = true followtags = true
[merge]
conflictstyle = zdiff3
[init] [init]
defaultBranch = main defaultBranch = main
[help] [help]
@ -26,7 +26,12 @@
theme = Nord theme = Nord
features = decorations features = decorations
[diff] [diff]
algorithm = histogram tool = difftastic
external = difft
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[branch] [branch]
sort = -committerdate sort = -committerdate
[tag] [tag]