From 9021efe3accce1cb53aef605a4f5d7ec45bade19 Mon Sep 17 00:00:00 2001 From: Gal Szkolnik Date: Thu, 8 May 2025 15:53:53 +0000 Subject: [PATCH 1/3] Fix lnav external --- chezmoi.roots/_home/.chezmoiexternal.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chezmoi.roots/_home/.chezmoiexternal.yaml.tmpl b/chezmoi.roots/_home/.chezmoiexternal.yaml.tmpl index 9e016be..8ce5bda 100644 --- a/chezmoi.roots/_home/.chezmoiexternal.yaml.tmpl +++ b/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 .chezmoi.os .chezmoi.arch | join "-" -}} +{{- $myArch = list "linux-musl" .sz.os.arch_alt | join "-" -}} {{- end -}} {{- with $app_name := "lnav" -}} From c768ee7ad2d6f3bed4e13b7b609cd07844a9c015 Mon Sep 17 00:00:00 2001 From: Gal Szkolnik Date: Thu, 8 May 2025 15:54:30 +0000 Subject: [PATCH 2/3] Make sure delta exists before acutally using it --- chezmoi.roots/_home/dot_gitconfig.tmpl | 2 ++ chezmoi.roots/_src.all/.chezmoi.toml.tmpl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/chezmoi.roots/_home/dot_gitconfig.tmpl b/chezmoi.roots/_home/dot_gitconfig.tmpl index c3756fd..19b21b0 100644 --- a/chezmoi.roots/_home/dot_gitconfig.tmpl +++ b/chezmoi.roots/_home/dot_gitconfig.tmpl @@ -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 diff --git a/chezmoi.roots/_src.all/.chezmoi.toml.tmpl b/chezmoi.roots/_src.all/.chezmoi.toml.tmpl index 7ec4f42..08ec9f3 100644 --- a/chezmoi.roots/_src.all/.chezmoi.toml.tmpl +++ b/chezmoi.roots/_src.all/.chezmoi.toml.tmpl @@ -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: From bc43b9b05ab712aeacc11a96b7f201a1e2eb12cf Mon Sep 17 00:00:00 2001 From: Gal Szkolnik Date: Thu, 8 May 2025 15:55:06 +0000 Subject: [PATCH 3/3] make sure systemctl exists doesn't exist inside docker --- .../_home/private_dot_config/sz.env/555_fix-kubectl.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/555_fix-kubectl.env b/chezmoi.roots/_home/private_dot_config/sz.env/555_fix-kubectl.env index 7a7333a..38a2fd2 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/555_fix-kubectl.env +++ b/chezmoi.roots/_home/private_dot_config/sz.env/555_fix-kubectl.env @@ -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 -}}