chezmoi.roots/_home/.chezmoiexternal.yaml.tmpl

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

chezmoi.roots/_home/dot_gitconfig.tmpl

@@ -39,7 +39,6 @@
 # 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
@@ -54,7 +53,6 @@
     # 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

chezmoi.roots/_home/private_dot_config/sz.env/555_fix-kubectl.env

@@ -1,4 +1,3 @@
-{{- 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
@@ -8,4 +7,3 @@ if is_cmd szetup-kubectl4k3s && [ "$(systemctl is-active k3s.service)" = "active
 fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
-{{- end -}}

chezmoi.roots/_src.all/.chezmoi.toml.tmpl

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