Compare commits

...

3 commits

Author SHA1 Message Date
Gal Szkolnik
bc43b9b05a make sure systemctl exists
doesn't exist inside docker
2025-05-08 15:55:06 +00:00
Gal Szkolnik
c768ee7ad2 Make sure delta exists before acutally using it 2025-05-08 15:54:30 +00:00
Gal Szkolnik
9021efe3ac Fix lnav external 2025-05-08 15:53:53 +00:00
4 changed files with 7 additions and 1 deletions

View file

@ -314,7 +314,7 @@
{{- if (eq .chezmoi.os "darwin" ) -}}
{{- $myArch = list .sz.os.arch_alt "macos" | join "-" -}}
{{- else -}}
{{- $myArch = list .chezmoi.os .chezmoi.arch | join "-" -}}
{{- $myArch = list "linux-musl" .sz.os.arch_alt | join "-" -}}
{{- end -}}
{{- with $app_name := "lnav" -}}

View file

@ -39,6 +39,7 @@
# oauthScopes = read_repository
[core]
editor = vim
{{- if lookPath "delta" -}}
# delta will used as the default pager for git
# and ov as the default pager for delta
# the pager will be overloaded via the [pager] section for a few commands
@ -53,6 +54,7 @@
# It allows to maintain a simpler config file and avoid escaping quotes
diff = delta --features ov-diff
log = delta --features ov-log
{{- end -}}
[interactive]
diffFilter = delta --color-only

View file

@ -1,3 +1,4 @@
{{- if lookPath "systemctl" -}}
#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
if is_cmd szetup-kubectl4k3s && [ "$(systemctl is-active k3s.service)" = "active" ]; then
@ -7,3 +8,4 @@ if is_cmd szetup-kubectl4k3s && [ "$(systemctl is-active k3s.service)" = "active
fi
# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
{{- end -}}

View file

@ -157,6 +157,7 @@ scriptTempDir={{ $scriptTempDir | quote }}
leader-key={{- $zellijLeaderKey | quote }}
{{- end }}
{{- if lookPath "delta" }}
[diff]
# command = "nvim"
# args = ["-d", "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"]
@ -164,5 +165,6 @@ scriptTempDir={{ $scriptTempDir | quote }}
command = "delta"
args = ["--paging=never", "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"]
pager = "moar"
{{- end -}}
# vim: set ft=toml expandtab tabstop=2 shiftwidth=2: