More ndiff changes

arran4 · Jul 20, 2024 · fb67e1e · fb67e1e
1 parent 97a0f68
commit fb67e1e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
@@ -62,10 +62,12 @@
 
 {{- $gitCredentialManagerLocation := findExecutable "bin/git-credential-manager" $binroots -}}
 {{- $vimdiffLocation := findExecutable "bin/vimdiff" $binroots -}}
+{{- $nvimdiffLocation := findExecutable "bin/nvimdiff" $binroots -}}
 {{- $kdiff3Location := findExecutable "bin/kdiff3" $binroots -}}
 {{- $vimLocation := findExecutable "bin/vim" $binroots -}}
 {{- $neovimLocation := findExecutable "bin/nvim" $binroots -}}
 {{- $vimpagerLocation := findExecutable "bin/vimpager" $binroots -}}
+{{- $nvimpagerLocation := findExecutable "bin/nvimpager" $binroots -}}
 {{- $zshLocation := findExecutable "bin/zsh" $binroots -}}
 {{- $lessLocation := findExecutable "bin/less" $binroots -}}
 {{- $mvnLocation := findExecutable "bin/mvn" $binroots -}}
@@ -132,10 +134,12 @@
         isGnome={{ $isGnome }}
         gitCredentialManagerLocation="{{ $gitCredentialManagerLocation }}"
         vimdiffLocation="{{ $vimdiffLocation }}"
+        nvimdiffLocation="{{ $nvimdiffLocation }}"
         kdiff3Location="{{ $kdiff3Location }}"
         vimLocation="{{ $vimLocation }}"
         neovimLocation="{{ $neovimLocation }}"
         vimpagerLocation="{{ $vimpagerLocation }}"
+        nvimpagerLocation="{{ $nvimpagerLocation }}"
         gpgLocation="{{$gpgLocation}}"
         zshLocation="{{$zshLocation}}"
         lessLocation="{{$lessLocation}}"
@@ -148,14 +152,10 @@
         terminfosearch = [{{range $each := $terminfosearch}}"{{$each}}", {{end}}]
         termfallback = [{{range $each := $termfallback}}"{{$each}}", {{end}}]
 
-#[diff]
-#{{ if and (index . "headless") (lookPath "vimdiff") }}
-#	command = "vimdiff"
-#{{ else if and (eq .chezmoi.os "linux") (lookPath "kdiff3") }}
-#	command = "kdiff3"
-#{{ else if lookPath "vimdiff" }}
-#	command = "vimdiff"
-#{{ end }}
-
-#[merge]
-#	command = "vimdiff"
+{{if stat $nvimdiffLocation -}}
+[diff]
+	command = "$nvimdiffLocation -dm"
+
+[merge]
+	command = "$nvimdiffLocation -d"
+{{end -}}
diff --git a/.chezmoitemplates/common-misc-env.tmpl b/.chezmoitemplates/common-misc-env.tmpl
@@ -15,7 +15,10 @@ export WATCH=root
 	# No vim found!
 {{- end }}
 
-{{ if stat (index . "vimpagerLocation") -}}
+{{ if stat (index . "nvimpagerLocation") -}}
+	# Pager IS less
+	export PAGER={{(index . "nvimpagerLocation")}}
+{{ else if stat (index . "vimpagerLocation") -}}
 	# Pager IS less
 	export PAGER={{(index . "vimpagerLocation")}}
 {{ else if stat (index . "lessLocation") -}}