softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: softinio:main
Branches Tags
softinio:main
softinio:push-rylwpkmrzskw
softinio:cleanup-01042023
softinio:december-2022-1
softinio:nvim-updates-10162022b
softinio:nvim-updates-10162022
softinio:update-nix-neovim-oct-8-2022
softinio:move-diff-tool-to-nvim
softinio:add-latex-support
softinio:add-battery-nvim
softinio:neovim-metals-upgrades
softinio:nvim-cmp-upgrade
softinio:neovim-updates-flakes-cleanup
softinio:temp1
softinio:upgrade-to-flakes
softinio:test
softinio:add-scaladex
softinio:add-tmux
softinio:migrate-to-lua
..
compare: softinio:push-rylwpkmrzskw
Branches Tags
softinio:main
softinio:push-rylwpkmrzskw
softinio:cleanup-01042023
softinio:december-2022-1
softinio:nvim-updates-10162022b
softinio:nvim-updates-10162022
softinio:update-nix-neovim-oct-8-2022
softinio:move-diff-tool-to-nvim
softinio:add-latex-support
softinio:add-battery-nvim
softinio:neovim-metals-upgrades
softinio:nvim-cmp-upgrade
softinio:neovim-updates-flakes-cleanup
softinio:temp1
softinio:upgrade-to-flakes
softinio:test
softinio:add-scaladex
softinio:add-tmux
softinio:migrate-to-lua

No commits in common. "main" and "push-rylwpkmrzskw" have entirely different histories.
main ... push-rylwp

1 changed files with 5 additions and 6 deletions
Show stats Expand all files Collapse all files

11
programs/git/default.nix
View file

@ -20,12 +20,11 @@ let
};
fetch.prune = true;
init.defaultBranch = "main";
merge.tool = "intellij";
mergetool = {
intellij = {
cmd = "'/Applications/IntelliJ IDEA.app/Contents/macOS/idea' merge \“$LOCAL\” \“$REMOTE\” \“$BASE\” \“$MERGED\”";
trustExitCode = true;
};
merge.conflictstyle = "zdiff3";
merge.tool = "nvim";
mergetool.nvim = {
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
prompt = false;
keepBackup = false;
};
pager = {