From d36fc685fb3b63e18b9ccc03be6b941425fca0e9 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@Kateryna)" Date: Tue, 1 Apr 2025 22:24:56 -0400 Subject: [PATCH] Generalize .chemoi.... Move .chezmoi.toml.tmpl to _src.all Generalize .chezmoiexternal.yaml --- {_src.posix => _src.all}/.chezmoi.toml.tmpl | 39 +++++-- _src.posix/.chezmoiexternal.yaml | 118 +++++++++++++++----- 2 files changed, 118 insertions(+), 39 deletions(-) rename {_src.posix => _src.all}/.chezmoi.toml.tmpl (72%) diff --git a/_src.posix/.chezmoi.toml.tmpl b/_src.all/.chezmoi.toml.tmpl similarity index 72% rename from _src.posix/.chezmoi.toml.tmpl rename to _src.all/.chezmoi.toml.tmpl index bd15507..67db791 100644 --- a/_src.posix/.chezmoi.toml.tmpl +++ b/_src.all/.chezmoi.toml.tmpl @@ -9,9 +9,13 @@ {{- $gitName := promptStringOnce . "gitName" "Full name (for git commits)" }} {{- $chassisType := "desktop" }} {{- $sysType := "posix" }} -{{- $altArch := "aarch64" }} +{{- $arch_alt := "x86_64" }} +{{- $arch_alt_dash := "x86-64" }} {{- $sysVendor := "unknown" }} +{{- $clib_flavor := "" }} {{- if eq .chezmoi.os "darwin" }} +{{- $arch_alt := "aarch64" }} +{{- $arch_alt_dash := $arch_alt }} {{- $sysType = "macos" }} {{- $sysVendor = "apple" }} {{- if contains "BatteryData" (output "ioreg" "-c" "AppleSmartBattery") }} @@ -20,9 +24,11 @@ {{- $chassisType = "desktop" }} {{- end }} {{- else if eq .chezmoi.os "linux" }} +{{- $clib_flavor = "-musl" }} # $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }} {{- $chassisType = "server" }} {{- else if eq .chezmoi.os "windows" }} +{{- $clib_flavor = "-msvc" }} {{- $sysType = "windows" }} {{- $sysVendor = "pc" }} {{- $chassisType = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "if ((Get-CimInstance -Class Win32_Battery | Measure-Object).Count -gt 0) { Write-Output 'laptop' } else { Write-Output 'desktop' }") | trim }} @@ -31,18 +37,29 @@ {{- $scriptTempDir := "~/.cache/chezmoi/tmp" }} scriptTempDir={{- $scriptTempDir | quote }} -[data] -{{- if ($altArch) }} - altArch={{- $altArch | quote }} +[data.sz.os] +{{- if eq .chezmoi.os "linux" }} + short={{- .chezmoi.os | quote }} +{{- else }} + short={{- substr 0 3 (.chezmoi.os) | quote }} +{{- end }} + rust_rel_target={{- printf "%s-%s%s" $sysVendor .chezmoi.os $clib_flavor | quote }} +{{- if ($arch_alt) }} + arch_alt={{- $arch_alt | quote }} +{{- end }} +{{- if ($arch_alt_dash) }} + arch_alt_dash={{- $arch_alt_dash | quote }} {{- end }} {{- if ($chassisType) }} - chassisType={{- $chassisType | quote }} + chassisType={{- $chassisType | quote }} {{- end }} {{- if ($sysType) }} - sysType={{- $sysType | quote }} + sysType={{- $sysType | quote }} {{- end }} + +[data] {{- if ($githubToken) }} - githubToken={{- $githubToken | quote }} + githubToken={{- $githubToken | quote }} {{- end }} {{- if ($sysname) }} sysname = {{ $sysname | quote }} @@ -54,19 +71,19 @@ scriptTempDir={{- $scriptTempDir | quote }} sysarea = {{ $sysarea | quote }} {{ end }} -{{ if ($gitEmail) }} +{{- if ($gitEmail) }} gitEmail = {{ $gitEmail | quote }} {{- end }} {{- if ($gitName) }} gitName = {{ $gitName | quote }} {{- end }} {{- if not ($githubToken) }} - githubToken={{- $githubToken | quote }} + githubToken={{- $githubToken | quote }} {{- end }} [scriptEnv] - GITHUB_ACCESS_TOKEN={{- $githubToken | quote }} - GITHUB_TOKEN={{- $githubToken | quote }} + GITHUB_ACCESS_TOKEN={{- $githubToken | quote }} + GITHUB_TOKEN={{- $githubToken | quote }} [diff] # command = "nvim" diff --git a/_src.posix/.chezmoiexternal.yaml b/_src.posix/.chezmoiexternal.yaml index ec0bbda..62caaa2 100644 --- a/_src.posix/.chezmoiexternal.yaml +++ b/_src.posix/.chezmoiexternal.yaml @@ -1,25 +1,37 @@ # https://www.chezmoi.io/reference/special-files-and-directories/chezmoiexternal-format/ +# The file will be empty (except for this comment) unless CZ_EXTR env variable exists. # # The externals are checked based on the refreshPeriod whenever an `apply` (or `update`) operations run # -# The simplest form to update all externals: +# The syntax to update all externals (and nothing else): # ```sh -# chezmoi apply --include externals +# CZ_EXTR=1 chezmoi apply --include externals # ``` # +{{/* +# # Variable Type Default Description # type string none External type (file, archive, archive-file, or git-repo) # url string none URL # refreshPeriod duration 0 Refresh period (Examples: one day (24h), one week (168h), or four weeks (672h)) # executable bool false Add executable_ attribute to file # path string none Path to file in archive - -{{- if not (env "OFFLINE") -}} - -{{ $defaultRefresh := "168h" -}} +*/}} +{{- if (env "CZ_EXTR") -}} +{{/* Initialize template variables */}} +{{- $myArch := "" -}} +{{- $defaultRefresh := "168h" -}} {{- $externals := dict -}} -{{ $myArch := "x86_64-unknown-linux-musl" }} +{{/* +# valid arch strings: +# aarch64-apple-darwin +# x86_64-apple-darwin +# aarch64-unknown-linux-musl +# x86_64-unknown-linux-musl +*/}} + +{{ $myArch = (printf "%s-%s" .sz.os.arch_alt .sz.os.rust_rel_target )}} {{- with $repo := "zellij-org/zellij" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} @@ -31,7 +43,7 @@ "refreshPeriod" $defaultRefresh ) -}} {{- end -}} -{{- end }} +{{- end -}} {{- with $repo := "dandavison/delta" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} @@ -44,7 +56,18 @@ {{- end -}} {{- end -}} -{{ $myArch = "linux_amd64" }} +{{/* +# valid arch strings: +# darwin_amd64 +# darwin_arm64 +# linux_386 +# linux_amd64 +# linux_arm64 +# windows_386 +# windows_amd64 +# windows_arm64 +*/}} +{{- $myArch = (printf "%s_%s" .chezmoi.os .chezmoi.arch) -}} {{- with $repo := "hickford/git-credential-oauth" -}} {{- with $version := trimPrefix "v" (gitHubLatestRelease $repo).GetTagName -}} @@ -58,7 +81,21 @@ {{- end -}} {{- end -}} -{{ $myArch = "linux-x86_64" }} +{{/* +# valid arch strings: +# linux-aarch64 +# linux-arm +# linux-armv7 +# linux-x86_64 +# mac-x86 +# mac +# win +*/}} + +{{- $myArch = .sz.os.short -}} +{{- if eq .chezmoi.os "linux" -}} +{{- $myArch = (printf "%s-%s" .chezmoi.os .sz.os.arch_alt) -}} +{{- end -}} {{- with $repo := "extrawurst/gitui" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} @@ -70,9 +107,47 @@ "refreshPeriod" $defaultRefresh ) -}} {{- end -}} -{{- end }} +{{- end -}} -{{ $myArch = "linux_x86_64" }} + +{{/* +# valid arch strings: +# darwin-amd64 +# darwin-arm64 +# freebsd-amd64 +# freebsd-arm64 +# linux-amd64 +# linux-arm64 +# openbsd-amd64 +# openbsd-arm64 +# windows-amd64 +# windows-arm64 +*/}} +{{- $myArch = (print .chezmoi.os "-" .chezmoi.arch) -}} + +{{- with $repo := "Lifailon/lazyjournal" -}} +{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} +{{- $_ := set $externals ".local/bin/lazyjournal" (dict + "type" "file" + "url" (printf "https://github.com/%s/releases/download/%s/lazyjournal-%s-%s" $repo $version $version $myArch) + "executable" true + "refreshPeriod" $defaultRefresh +) -}} +{{- end -}} +{{- end -}} + +{{/* +# valid arch strings: +# Darwin_arm64 +# Darwin_x86_64 +# Linux_arm64 +# Linux_i386 +# Linux_x86_64 +# Windows_arm64 +# Windows_i386 +# Windows_x86_64 +*/}} +{{- $myArch = (printf "%s_%s" ( .chezmoi.os | title ) .sz.os.arch_alt) -}} {{- with $repo := "theimpostor/osc" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} @@ -84,20 +159,7 @@ "refreshPeriod" $defaultRefresh ) -}} {{- end -}} -{{- end }} - -{{ $myArch = "linux-amd64" }} - -{{- with $repo := "Lifailon/lazyjournal" -}} -{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} -{{- $_ := set $externals ".local/bin/lazyjournal" (dict - "type" "file" - "url" (printf "https://github.com/%s/releases/download/%s/lazyjournal-%s-%s" $repo $version $version $myArch) - "executable" true - "refreshPeriod" $defaultRefresh -) -}} -{{- end -}} -{{- end }} +{{- end -}} {{- $externals | toYaml }} ".config/sz.env/lib/ble.sh.curl": @@ -122,5 +184,5 @@ refreshPeriod: "{{ $defaultRefresh }}" {{- else -}} -# .chezmoiexternal is disabled because OFFLINE env is defined -{{- end -}} \ No newline at end of file +# .chezmoiexternal is disabled because CZ_EXTR env is undefined +{{- end -}}