Remove minimap from nvim, fix mergetool config for git
This commit is contained in:
parent
e84fb19a20
commit
65c8894f47
|
@ -70,7 +70,6 @@ in
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
ccls
|
ccls
|
||||||
code-minimap
|
|
||||||
gopls
|
gopls
|
||||||
nodejs
|
nodejs
|
||||||
nodePackages.bash-language-server
|
nodePackages.bash-language-server
|
||||||
|
@ -101,7 +100,6 @@ in
|
||||||
ack-vim
|
ack-vim
|
||||||
airline
|
airline
|
||||||
editorconfig-vim
|
editorconfig-vim
|
||||||
minimap-vim
|
|
||||||
nnn-vim
|
nnn-vim
|
||||||
suda
|
suda
|
||||||
syntastic
|
syntastic
|
||||||
|
@ -112,6 +110,7 @@ in
|
||||||
sonokai
|
sonokai
|
||||||
|
|
||||||
fugitive
|
fugitive
|
||||||
|
diffview-nvim
|
||||||
vim-gitgutter
|
vim-gitgutter
|
||||||
vim-rhubarb
|
vim-rhubarb
|
||||||
vimagit
|
vimagit
|
||||||
|
|
|
@ -13,14 +13,14 @@ in
|
||||||
pol = pull
|
pol = pull
|
||||||
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number
|
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number
|
||||||
# define command which will be used when "nvim"is set as a merge tool
|
# define command which will be used when "nvim"is set as a merge tool
|
||||||
[mergetool "nvim"]
|
|
||||||
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
|
||||||
# set "nvim" as tool for merging
|
|
||||||
[merge]
|
|
||||||
tool = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
|
|
||||||
# automatically launch merge tool without displaying a prompt
|
|
||||||
[mergetool]
|
[mergetool]
|
||||||
prompt = false
|
prompt = false
|
||||||
|
[merge]
|
||||||
|
tool = nvim
|
||||||
|
[mergetool "nvim"]
|
||||||
|
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[tag]
|
[tag]
|
||||||
|
|
Loading…
Reference in a new issue