FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

WIP: Switch to NixOS #5

Draft
FunctionalHacker wants to merge 1349 commits from nix into main
pull from: nix
merge into: FunctionalHacker:main
Conversation 0 Commits 1349 Files changed 333 +5 -9
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e3e9848d0e - Show all commits

9
home/.config/git/config
View file

@ -30,15 +30,6 @@ prompt = false
[mergetool "nvim"] [mergetool "nvim"]
cmd = nvim +DiffviewOpen cmd = nvim +DiffviewOpen
[diff]
tool = nvim
[difftool]
prompt = false
[difftool "nvim"]
cmd = nvim +DiffviewOpen
[pull] [pull]
rebase = merges rebase = merges

5
home/.config/zsh/04-aliases.zsh
View file

@ -10,6 +10,11 @@ alias gs='git status'
alias gpull='git pull' alias gpull='git pull'
alias gpush='git push' alias gpush='git push'
# Open nvim with diffview
# Handy plugin for viewing git diffs
# and handling merges
alias diffview='nvim +DiffviewOpen'
# Rename grc alias from forgit since it # Rename grc alias from forgit since it
# collides with the grc colorizer # collides with the grc colorizer
forgit_revert_commit=fgrc forgit_revert_commit=fgrc