Browse Source

Remove minimap from nvim, fix mergetool config for git

feat/hibernate-always
Benjamin Bädorf 2 months ago
parent
commit
65c8894f47
Signed by: b12f GPG Key ID: 4406E80E13CD656C
  1. 3
      modules/terminal-life/nvim/default.nix
  2. 12
      profiles/base-user/.config/git/config.nix

3
modules/terminal-life/nvim/default.nix

@ -70,7 +70,6 @@ in
extraPackages = with pkgs; [
ccls
code-minimap
gopls
nodejs
nodePackages.bash-language-server
@ -101,7 +100,6 @@ in
ack-vim
airline
editorconfig-vim
minimap-vim
nnn-vim
suda
syntastic
@ -112,6 +110,7 @@ in
sonokai
fugitive
diffview-nvim
vim-gitgutter
vim-rhubarb
vimagit

12
profiles/base-user/.config/git/config.nix

@ -13,14 +13,14 @@ in
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
# 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]
prompt = false
[merge]
tool = nvim
[mergetool "nvim"]
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[commit]
gpgsign = true
[tag]

Loading…
Cancel
Save