WIP: Switch to NixOS #5

Draft
FunctionalHacker wants to merge 1349 commits from nix into main
3 changed files with 8 additions and 3 deletions
Showing only changes of commit 845f4024df - Show all commits

View file

@ -28,7 +28,7 @@ keepBackup = false
prompt = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
cmd = nvim +DiffviewOpen
[diff]
tool = nvim
@ -37,7 +37,7 @@ tool = nvim
prompt = false
[difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE
cmd = nvim +DiffviewOpen
[pull]
rebase = merges

View file

@ -4,5 +4,7 @@ return {
enabled = vim.g.neovide == not nil,
"yutkat/confirm-quit.nvim",
event = "CmdlineEnter",
config = true,
opts = {
quit_message = "You are in Neovide, are you sure you want to quit?",
},
}

View file

@ -0,0 +1,3 @@
-- Improved diffs
--- @type LazyPluginSpec
return { "sindrets/diffview.nvim" }