l-x/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some changes to git and fish

Browse source
This commit is contained in:
Alex 2024-03-05 14:33:30 +01:00
parent d8db850031
commit 89165e0809
Signed by: l-x
GPG key ID: 0B7107C9393169F4
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,4 +1,6 @@
```sh ```sh
cargo install topgrade lsd git-delta cargo-update
set -U fish_greeting set -U fish_greeting
fish_config theme choose 'Tomorrow Night Bright' fish_config theme choose 'Tomorrow Night Bright'

5
fish/config.fish
View file

@ -23,6 +23,11 @@ abbr -a -- q pueue
alias j z alias j z
alias jj zz alias jj zz
alias ls lsd
alias l ls
alias ll 'ls -la'
alias llh 'ls -lha'
if test -r ~/.asdf/asdf.fish if test -r ~/.asdf/asdf.fish
source ~/.asdf/asdf.fish source ~/.asdf/asdf.fish
end end

11
git/config
View file

@ -58,6 +58,7 @@
[core] [core]
excludesfile = ~/.config/git/ignore excludesfile = ~/.config/git/ignore
editor = vim editor = vim
pager = delta
[commit] [commit]
verbose = true verbose = true
gpgSign = true gpgSign = true
@ -78,10 +79,11 @@
fsckobjects = true fsckobjects = true
[merge] [merge]
conflictstyle = zdiff3 conflictstyle = diff3
[diff] [diff]
algorithm = histogram algorithm = histogram
colorMoved = default
[rerere] [rerere]
enabled = true enabled = true
@ -91,3 +93,10 @@
[receive] [receive]
fsckObjects = true fsckObjects = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)