diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl index bb0c08c..8bc0c17 100644 --- a/.chezmoi.toml.tmpl +++ b/.chezmoi.toml.tmpl @@ -3,36 +3,28 @@ # which of the _home.* dirs will be set as the .chezmoiroot # -{{- $githubToken := promptStringOnce . "githubToken" "Public GITHUB token (mostly for rate limits - !insecure!)" (or ( - env "CZ_GITHUB_ACCESS_TOKEN" - ) ( env "CHEZMOI_GITHUB_ACCESS_TOKEN" - ) ( env "GITHUB_ACCESS_TOKEN" - ) ( env "GITHUB_TOKEN" - )) -}} +{{- $githubToken := or (env "CHEZMOI_GITHUB_ACCESS_TOKEN") (env "GITHUB_ACCESS_TOKEN") (env "GITHUB_TOKEN") }} +{{- if not ($githubToken) }} +{{- $githubToken = promptStringOnce . "githubToken" "Public GITHUB token (mostly for rate limits - !insecure!)" }} +{{- end }} {{- $scriptTempDir := "~/.cache/chezmoi/tmp" }} - {{- $chassisType := "desktop" }} {{- $sysType := "posix" }} {{- $sysVendor := "unknown" }} {{- if eq .chezmoi.os "darwin" }} {{- $sysType = "macos" }} -{{- $sysVendor = "apple" }} {{- if contains "BatteryData" (output "ioreg" "-c" "AppleSmartBattery") }} {{- $chassisType = "laptop" }} {{- else }} {{- $chassisType = "desktop" }} {{- end }} {{- else if eq .chezmoi.os "linux" }} -{{- $chassisType = or (and - (lookPath "hostnamectl") (output "hostnamectl" "--json=short" | mustFromJson).Chassis - ) - "server" -}} +# $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }} +{{- $chassisType = "server" }} {{- else if eq .chezmoi.os "windows" }} {{- $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 }} -{{- end }} +{{- end -}} scriptTempDir={{- $scriptTempDir | quote }} @@ -42,5 +34,3 @@ scriptTempDir={{- $scriptTempDir | quote }} CZ_SYS={{- $sysType | quote }} CZ_OS={{- .chezmoi.os | quote }} CZ_GITHUB_ACCESS_TOKEN={{- $githubToken | quote }} - CZ_VENDOR={{- $sysVendor | quote }} - diff --git a/.chezmoiscripts/run_init.sh.tmpl b/.chezmoiscripts/run_init.sh.tmpl index 7be5c8d..c43cb41 100755 --- a/.chezmoiscripts/run_init.sh.tmpl +++ b/.chezmoiscripts/run_init.sh.tmpl @@ -2,19 +2,18 @@ set -e -[ -z "$SET_X" ] || env | grep -E 'chezmoi|^CZ' +env | grep -E 'chezmoi|^CZ' cd "$CHEZMOI_SOURCE_DIR" #CZ_MODEL="$(ioreg -l | grep "product-name" | sed -Ee 's/^.*\<"(.*)\"\>.*$/\1/')" -${SET_X:-:} | grep '^CZ_' || true +set | grep '^CZ_' printf 'System detected as %s/%s, setting up .chezmoiroot and initializing...\n' "$CZ_SYS" "$CZ_CHASSIS" -${SET_X:-:} -x -CZROOTLINK=chezmoi.roots/__root_links/base.chezmoiroot -if [ -r "${CZROOTLINK}.$CZ_SYS.$CZ_CHASSIS" ]; then - ln -s "${CZROOTLINK}.$CZ_SYS.$CZ_CHASSIS" .chezmoiroot -elif [ -r "${CZROOTLINK}.$CZ_SYS" ]; then - ln -s "${CZROOTLINK}.$CZ_SYS" .chezmoiroot -elif [ -r "${CZROOTLINK}.$CZ_CHASSIS" ]; then - ln -s "${CZROOTLINK}.$CZ_CHASSIS" .chezmoiroot +set -x +if [ -r "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" ]; then + ln -s "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" .chezmoiroot +elif [ -r "base.chezmoiroot.$CZ_SYS" ]; then + ln -s "base.chezmoiroot.$CZ_SYS" .chezmoiroot +elif [ -r "base.chezmoiroot.$CZ_CHASSIS" ]; then + ln -s "base.chezmoiroot.$CZ_CHASSIS" .chezmoiroot else printf 'Failed to find a matching .chezmoiroot. Aborting!\n' false diff --git a/.init.me.sh b/.init.me.sh index e1505e2..fc85021 100755 --- a/.init.me.sh +++ b/.init.me.sh @@ -1,39 +1,6 @@ #! /usr/bin/env bash -CZ_DEBUG= -while true; do - case "$1" in - --init) break;; - --debug) [[ -z "$SET_X" ]] && export SET_X=set || CZ_DEBUG=--debug;; - *) printf '%s\n' \ - 'Re-initialize chezmoi based environment, reloading it from source' \ - '' \ - 'Usage:' \ - " ${0##*/} [--init]" \ - '' \ - 'Arguments:' \ - ' without any (or unknown) arguments, displays this usage message.' \ - '' \ - ' --init Perform initialization' \ - '' \ - 'Description:' \ - ' Deletes ~/.config/chezmoi and the .chezmoiroot and performs' \ - ' chezmoi init --apply' \ - ' This, in effect, will trigger .chezmoiscripts/run_init.sh template' \ - '' \ - ' the init script template determins the type of OS and hardware we are' \ - ' running on and assigns (creates a symlink) the proper root to' \ - ' .chezmoiroot at which point, it re-initializes the local chezmoi' \ - '' - exit 2 - ;; - esac - shift -done - -set -e -${SET_X:-:} -x +set -ex rm -fR ~/.config/chezmoi ~/.local/share/chezmoi/.chezmoiroot -chezmoi init ${CZ_DEBUG} --apply -unset SET_X +chezmoi init --apply diff --git a/chezmoi.roots/_home.macos/.chezmoi.toml.tmpl b/_home.macos/.chezmoi.toml.tmpl similarity index 100% rename from chezmoi.roots/_home.macos/.chezmoi.toml.tmpl rename to _home.macos/.chezmoi.toml.tmpl diff --git a/chezmoi.roots/_home.macos/.chezmoiexternal.yaml.tmpl b/_home.macos/.chezmoiexternal.yaml.tmpl similarity index 100% rename from chezmoi.roots/_home.macos/.chezmoiexternal.yaml.tmpl rename to _home.macos/.chezmoiexternal.yaml.tmpl diff --git a/chezmoi.roots/_home.macos/.chezmoiignore b/_home.macos/.chezmoiignore similarity index 100% rename from chezmoi.roots/_home.macos/.chezmoiignore rename to _home.macos/.chezmoiignore diff --git a/chezmoi.roots/_home.macos/.chezmoiscripts/run_once_init.sh.tmpl b/_home.macos/.chezmoiscripts/run_once_init.sh.tmpl similarity index 100% rename from chezmoi.roots/_home.macos/.chezmoiscripts/run_once_init.sh.tmpl rename to _home.macos/.chezmoiscripts/run_once_init.sh.tmpl diff --git a/chezmoi.roots/_home.macos/dot_bashrc b/_home.macos/dot_bashrc similarity index 100% rename from chezmoi.roots/_home.macos/dot_bashrc rename to _home.macos/dot_bashrc diff --git a/chezmoi.roots/_home.macos/dot_finicky.js b/_home.macos/dot_finicky.js similarity index 100% rename from chezmoi.roots/_home.macos/dot_finicky.js rename to _home.macos/dot_finicky.js diff --git a/chezmoi.roots/_home.macos/dot_gitconfig.tmpl b/_home.macos/dot_gitconfig.tmpl similarity index 100% rename from chezmoi.roots/_home.macos/dot_gitconfig.tmpl rename to _home.macos/dot_gitconfig.tmpl diff --git a/chezmoi.roots/_home.macos/dot_profile b/_home.macos/dot_profile similarity index 100% rename from chezmoi.roots/_home.macos/dot_profile rename to _home.macos/dot_profile diff --git a/chezmoi.roots/_home.macos/dot_vimrc b/_home.macos/dot_vimrc similarity index 100% rename from chezmoi.roots/_home.macos/dot_vimrc rename to _home.macos/dot_vimrc diff --git a/chezmoi.roots/_home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace b/_home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace similarity index 100% rename from chezmoi.roots/_home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace rename to _home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace diff --git a/chezmoi.roots/_home.macos/dot_zshrc b/_home.macos/dot_zshrc similarity index 100% rename from chezmoi.roots/_home.macos/dot_zshrc rename to _home.macos/dot_zshrc diff --git a/chezmoi.roots/_home.macos/private_dot_config/atuin/config.toml b/_home.macos/private_dot_config/atuin/config.toml similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/atuin/config.toml rename to _home.macos/private_dot_config/atuin/config.toml diff --git a/chezmoi.roots/_home.macos/private_dot_config/pet/config.toml b/_home.macos/private_dot_config/pet/config.toml similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/pet/config.toml rename to _home.macos/private_dot_config/pet/config.toml diff --git a/chezmoi.roots/_home.macos/private_dot_config/pet/snippet.toml b/_home.macos/private_dot_config/pet/snippet.toml similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/pet/snippet.toml rename to _home.macos/private_dot_config/pet/snippet.toml diff --git a/chezmoi.roots/_home.macos/private_dot_config/starship.toml b/_home.macos/private_dot_config/starship.toml similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/starship.toml rename to _home.macos/private_dot_config/starship.toml diff --git a/_home.macos/private_dot_config/sz.env/.aliases.macos.env b/_home.macos/private_dot_config/sz.env/.aliases.macos.env new file mode 120000 index 0000000..5e43498 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/.aliases.macos.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/.aliases.macos.env \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env b/_home.macos/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env rename to _home.macos/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_home_bin.env b/_home.macos/private_dot_config/sz.env/PATH_home_bin.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_home_bin.env rename to _home.macos/private_dot_config/sz.env/PATH_home_bin.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_node.env b/_home.macos/private_dot_config/sz.env/PATH_node.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_node.env rename to _home.macos/private_dot_config/sz.env/PATH_node.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_truestuff.env b/_home.macos/private_dot_config/sz.env/PATH_truestuff.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_truestuff.env rename to _home.macos/private_dot_config/sz.env/PATH_truestuff.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env b/_home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env rename to _home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_000_term.env b/_home.macos/private_dot_config/sz.env/aaa_000_term.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_000_term.env rename to _home.macos/private_dot_config/sz.env/aaa_000_term.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh b/_home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh rename to _home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh b/_home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh rename to _home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh b/_home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh rename to _home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/aab_zellij.env b/_home.macos/private_dot_config/sz.env/aab_zellij.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/aab_zellij.env rename to _home.macos/private_dot_config/sz.env/aab_zellij.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/aliases.env.tmpl b/_home.macos/private_dot_config/sz.env/aliases.env.tmpl similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/aliases.env.tmpl rename to _home.macos/private_dot_config/sz.env/aliases.env.tmpl diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/bbb_bash_preexec.env.bash b/_home.macos/private_dot_config/sz.env/bbb_bash_preexec.env.bash similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/bbb_bash_preexec.env.bash rename to _home.macos/private_dot_config/sz.env/bbb_bash_preexec.env.bash diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/bbb_ble.sh.env.bash b/_home.macos/private_dot_config/sz.env/bbb_ble.sh.env.bash similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/bbb_ble.sh.env.bash rename to _home.macos/private_dot_config/sz.env/bbb_ble.sh.env.bash diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/broot.env b/_home.macos/private_dot_config/sz.env/broot.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/broot.env rename to _home.macos/private_dot_config/sz.env/broot.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/ccc_load_complete-alias.env b/_home.macos/private_dot_config/sz.env/ccc_load_complete-alias.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/ccc_load_complete-alias.env rename to _home.macos/private_dot_config/sz.env/ccc_load_complete-alias.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/envman-and-webi.env b/_home.macos/private_dot_config/sz.env/envman-and-webi.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/envman-and-webi.env rename to _home.macos/private_dot_config/sz.env/envman-and-webi.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/executable__.load.sh b/_home.macos/private_dot_config/sz.env/executable__.load.sh similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/executable__.load.sh rename to _home.macos/private_dot_config/sz.env/executable__.load.sh diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/fix-kubectl.env b/_home.macos/private_dot_config/sz.env/fix-kubectl.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/fix-kubectl.env rename to _home.macos/private_dot_config/sz.env/fix-kubectl.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/fix-nvim.env b/_home.macos/private_dot_config/sz.env/fix-nvim.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/fix-nvim.env rename to _home.macos/private_dot_config/sz.env/fix-nvim.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env b/_home.macos/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env rename to _home.macos/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_ID_truenas_scale.env b/_home.macos/private_dot_config/sz.env/remove_ID_truenas_scale.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_ID_truenas_scale.env rename to _home.macos/private_dot_config/sz.env/remove_ID_truenas_scale.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env b/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env rename to _home.macos/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env b/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env rename to _home.macos/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env b/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env rename to _home.macos/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_truenas-scale.env b/_home.macos/private_dot_config/sz.env/remove_aliases.macos.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_truenas-scale.env rename to _home.macos/private_dot_config/sz.env/remove_aliases.macos.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_bbb_bash_preexec.env b/_home.macos/private_dot_config/sz.env/remove_bbb_bash_preexec.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_bbb_bash_preexec.env rename to _home.macos/private_dot_config/sz.env/remove_bbb_bash_preexec.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_bbb_ble.sh.env b/_home.macos/private_dot_config/sz.env/remove_bbb_ble.sh.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_bbb_ble.sh.env rename to _home.macos/private_dot_config/sz.env/remove_bbb_ble.sh.env diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/remove_nvim b/_home.macos/private_dot_config/sz.env/remove_truenas-scale.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/remove_nvim rename to _home.macos/private_dot_config/sz.env/remove_truenas-scale.env diff --git a/_home.macos/private_dot_config/sz.env/zza_atuin.env b/_home.macos/private_dot_config/sz.env/zza_atuin.env new file mode 120000 index 0000000..12dba93 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/zza_atuin.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zza_atuin.env \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_lsd.env b/_home.macos/private_dot_config/sz.env/zza_lsd.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_lsd.env rename to _home.macos/private_dot_config/sz.env/zza_lsd.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_pet.env b/_home.macos/private_dot_config/sz.env/zza_pet.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_pet.env rename to _home.macos/private_dot_config/sz.env/zza_pet.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_starship.env b/_home.macos/private_dot_config/sz.env/zza_starship.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_starship.env rename to _home.macos/private_dot_config/sz.env/zza_starship.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_vivid.env b/_home.macos/private_dot_config/sz.env/zza_vivid.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zza_vivid.env rename to _home.macos/private_dot_config/sz.env/zza_vivid.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzb_eza.env b/_home.macos/private_dot_config/sz.env/zzb_eza.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zzb_eza.env rename to _home.macos/private_dot_config/sz.env/zzb_eza.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzz_bash_post.env b/_home.macos/private_dot_config/sz.env/zzz_bash_post.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zzz_bash_post.env rename to _home.macos/private_dot_config/sz.env/zzz_bash_post.env diff --git a/_home.macos/private_dot_config/sz.env/zzz_chezmoi.env.tmpl b/_home.macos/private_dot_config/sz.env/zzz_chezmoi.env.tmpl new file mode 120000 index 0000000..51767bd --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/zzz_chezmoi.env.tmpl @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env.tmpl \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/zzz_fzf.env.off b/_home.macos/private_dot_config/sz.env/zzz_fzf.env.off new file mode 120000 index 0000000..1db551d --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/zzz_fzf.env.off @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_fzf.env.off \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzz_homebrew.env b/_home.macos/private_dot_config/sz.env/zzz_homebrew.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zzz_homebrew.env rename to _home.macos/private_dot_config/sz.env/zzz_homebrew.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzz_teleport.env b/_home.macos/private_dot_config/sz.env/zzz_teleport.env similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/sz.env/zzz_teleport.env rename to _home.macos/private_dot_config/sz.env/zzz_teleport.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/vim/_init b/_home.macos/private_dot_config/vim/_init similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_config/vim/_init rename to _home.macos/private_dot_config/vim/_init diff --git a/_home.macos/private_dot_config/wezterm/wezterm.lua b/_home.macos/private_dot_config/wezterm/wezterm.lua new file mode 120000 index 0000000..7cc311d --- /dev/null +++ b/_home.macos/private_dot_config/wezterm/wezterm.lua @@ -0,0 +1 @@ +../../../_src.all/private_dot_config/wezterm/wezterm.lua \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/.keep b/_home.macos/private_dot_local/bin/.keep similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/.keep rename to _home.macos/private_dot_local/bin/.keep diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_auto-copy-ssh-id b/_home.macos/private_dot_local/bin/executable_auto-copy-ssh-id similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_auto-copy-ssh-id rename to _home.macos/private_dot_local/bin/executable_auto-copy-ssh-id diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_get-github-release.sh b/_home.macos/private_dot_local/bin/executable_get-github-release.sh similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_get-github-release.sh rename to _home.macos/private_dot_local/bin/executable_get-github-release.sh diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_load-starship b/_home.macos/private_dot_local/bin/executable_load-starship similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_load-starship rename to _home.macos/private_dot_local/bin/executable_load-starship diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_load-webi b/_home.macos/private_dot_local/bin/executable_load-webi similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_load-webi rename to _home.macos/private_dot_local/bin/executable_load-webi diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_load-zellij b/_home.macos/private_dot_local/bin/executable_load-zellij similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_load-zellij rename to _home.macos/private_dot_local/bin/executable_load-zellij diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_lsip b/_home.macos/private_dot_local/bin/executable_lsip similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_lsip rename to _home.macos/private_dot_local/bin/executable_lsip diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_pull-vast.id_rsa b/_home.macos/private_dot_local/bin/executable_pull-vast.id_rsa similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_pull-vast.id_rsa rename to _home.macos/private_dot_local/bin/executable_pull-vast.id_rsa diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_tsh-get b/_home.macos/private_dot_local/bin/executable_tsh-get similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_tsh-get rename to _home.macos/private_dot_local/bin/executable_tsh-get diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_tssh b/_home.macos/private_dot_local/bin/executable_tssh similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_tssh rename to _home.macos/private_dot_local/bin/executable_tssh diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_tssh-with-tunnel b/_home.macos/private_dot_local/bin/executable_tssh-with-tunnel similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_tssh-with-tunnel rename to _home.macos/private_dot_local/bin/executable_tssh-with-tunnel diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_update-atuin b/_home.macos/private_dot_local/bin/executable_update-atuin similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_update-atuin rename to _home.macos/private_dot_local/bin/executable_update-atuin diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_vast-teleport b/_home.macos/private_dot_local/bin/executable_vast-teleport similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_vast-teleport rename to _home.macos/private_dot_local/bin/executable_vast-teleport diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/executable_vastconnect b/_home.macos/private_dot_local/bin/executable_vastconnect similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/executable_vastconnect rename to _home.macos/private_dot_local/bin/executable_vastconnect diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s b/_home.macos/private_dot_local/bin/remove_nvim similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s rename to _home.macos/private_dot_local/bin/remove_nvim diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/remove_update-nvim b/_home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/remove_update-nvim rename to _home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/remove_vi b/_home.macos/private_dot_local/bin/remove_update-nvim similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/remove_vi rename to _home.macos/private_dot_local/bin/remove_update-nvim diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/remove_vim b/_home.macos/private_dot_local/bin/remove_vi similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/remove_vim rename to _home.macos/private_dot_local/bin/remove_vi diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/remove_vim.tiny b/_home.macos/private_dot_local/bin/remove_vim similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/remove_vim.tiny rename to _home.macos/private_dot_local/bin/remove_vim diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/remove_vimdiff b/_home.macos/private_dot_local/bin/remove_vim.tiny similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_local/bin/remove_vimdiff rename to _home.macos/private_dot_local/bin/remove_vim.tiny diff --git a/chezmoi.roots/_src.all/private_dot_local/bin/.keep b/_home.macos/private_dot_local/bin/remove_vimdiff similarity index 100% rename from chezmoi.roots/_src.all/private_dot_local/bin/.keep rename to _home.macos/private_dot_local/bin/remove_vimdiff diff --git a/chezmoi.roots/_home.macos/private_dot_ssh/config b/_home.macos/private_dot_ssh/config similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_ssh/config rename to _home.macos/private_dot_ssh/config diff --git a/chezmoi.roots/_home.macos/private_dot_ssh/config.d/.keep b/_home.macos/private_dot_ssh/config.d/.keep similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_ssh/config.d/.keep rename to _home.macos/private_dot_ssh/config.d/.keep diff --git a/chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast b/_home.macos/private_dot_ssh/config.d/vast similarity index 100% rename from chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast rename to _home.macos/private_dot_ssh/config.d/vast diff --git a/chezmoi.roots/_home/.chezmoi.toml.tmpl b/_home/.chezmoi.toml.tmpl similarity index 100% rename from chezmoi.roots/_home/.chezmoi.toml.tmpl rename to _home/.chezmoi.toml.tmpl diff --git a/chezmoi.roots/_home/.chezmoiexternal.yaml.tmpl b/_home/.chezmoiexternal.yaml.tmpl similarity index 100% rename from chezmoi.roots/_home/.chezmoiexternal.yaml.tmpl rename to _home/.chezmoiexternal.yaml.tmpl diff --git a/chezmoi.roots/_home/.chezmoiignore b/_home/.chezmoiignore similarity index 100% rename from chezmoi.roots/_home/.chezmoiignore rename to _home/.chezmoiignore diff --git a/chezmoi.roots/_home/.chezmoiscripts/run_once_init.sh.tmpl b/_home/.chezmoiscripts/run_once_init.sh.tmpl similarity index 100% rename from chezmoi.roots/_home/.chezmoiscripts/run_once_init.sh.tmpl rename to _home/.chezmoiscripts/run_once_init.sh.tmpl diff --git a/chezmoi.roots/_home/dot_bashrc b/_home/dot_bashrc similarity index 100% rename from chezmoi.roots/_home/dot_bashrc rename to _home/dot_bashrc diff --git a/chezmoi.roots/_home/dot_gitconfig.tmpl b/_home/dot_gitconfig.tmpl similarity index 100% rename from chezmoi.roots/_home/dot_gitconfig.tmpl rename to _home/dot_gitconfig.tmpl diff --git a/chezmoi.roots/_home/dot_profile b/_home/dot_profile similarity index 100% rename from chezmoi.roots/_home/dot_profile rename to _home/dot_profile diff --git a/chezmoi.roots/_home/dot_vimrc b/_home/dot_vimrc similarity index 100% rename from chezmoi.roots/_home/dot_vimrc rename to _home/dot_vimrc diff --git a/chezmoi.roots/_home/dot_zshrc b/_home/dot_zshrc similarity index 100% rename from chezmoi.roots/_home/dot_zshrc rename to _home/dot_zshrc diff --git a/chezmoi.roots/_home/private_dot_config/atuin/config.toml b/_home/private_dot_config/atuin/config.toml similarity index 100% rename from chezmoi.roots/_home/private_dot_config/atuin/config.toml rename to _home/private_dot_config/atuin/config.toml diff --git a/chezmoi.roots/_home/private_dot_config/pet/config.toml b/_home/private_dot_config/pet/config.toml similarity index 100% rename from chezmoi.roots/_home/private_dot_config/pet/config.toml rename to _home/private_dot_config/pet/config.toml diff --git a/chezmoi.roots/_home/private_dot_config/pet/snippet.toml b/_home/private_dot_config/pet/snippet.toml similarity index 100% rename from chezmoi.roots/_home/private_dot_config/pet/snippet.toml rename to _home/private_dot_config/pet/snippet.toml diff --git a/chezmoi.roots/_home/private_dot_config/starship.toml b/_home/private_dot_config/starship.toml similarity index 100% rename from chezmoi.roots/_home/private_dot_config/starship.toml rename to _home/private_dot_config/starship.toml diff --git a/_home/private_dot_config/sz.env/.aliases.macos.env b/_home/private_dot_config/sz.env/.aliases.macos.env new file mode 120000 index 0000000..5e43498 --- /dev/null +++ b/_home/private_dot_config/sz.env/.aliases.macos.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/.aliases.macos.env \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env b/_home/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env rename to _home/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/ID_truenas_scale.env b/_home/private_dot_config/sz.env/ID_truenas_scale.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/ID_truenas_scale.env rename to _home/private_dot_config/sz.env/ID_truenas_scale.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/PATH_home_bin.env b/_home/private_dot_config/sz.env/PATH_home_bin.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/PATH_home_bin.env rename to _home/private_dot_config/sz.env/PATH_home_bin.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/PATH_node.env b/_home/private_dot_config/sz.env/PATH_node.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/PATH_node.env rename to _home/private_dot_config/sz.env/PATH_node.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/PATH_truestuff.env b/_home/private_dot_config/sz.env/PATH_truestuff.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/PATH_truestuff.env rename to _home/private_dot_config/sz.env/PATH_truestuff.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/PATH_zz_cleanup.env b/_home/private_dot_config/sz.env/PATH_zz_cleanup.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/PATH_zz_cleanup.env rename to _home/private_dot_config/sz.env/PATH_zz_cleanup.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/aaa_000_term.env b/_home/private_dot_config/sz.env/aaa_000_term.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/aaa_000_term.env rename to _home/private_dot_config/sz.env/aaa_000_term.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh b/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh rename to _home/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh b/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh rename to _home/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh b/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh rename to _home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/aab_zellij.env b/_home/private_dot_config/sz.env/aab_zellij.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/aab_zellij.env rename to _home/private_dot_config/sz.env/aab_zellij.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/aliases.env.tmpl b/_home/private_dot_config/sz.env/aliases.env.tmpl similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/aliases.env.tmpl rename to _home/private_dot_config/sz.env/aliases.env.tmpl diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/bbb_bash_preexec.env.bash b/_home/private_dot_config/sz.env/bbb_bash_preexec.env.bash similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/bbb_bash_preexec.env.bash rename to _home/private_dot_config/sz.env/bbb_bash_preexec.env.bash diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/bbb_ble.sh.env.bash b/_home/private_dot_config/sz.env/bbb_ble.sh.env.bash similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/bbb_ble.sh.env.bash rename to _home/private_dot_config/sz.env/bbb_ble.sh.env.bash diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/broot.env b/_home/private_dot_config/sz.env/broot.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/broot.env rename to _home/private_dot_config/sz.env/broot.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/ccc_load_complete-alias.env b/_home/private_dot_config/sz.env/ccc_load_complete-alias.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/ccc_load_complete-alias.env rename to _home/private_dot_config/sz.env/ccc_load_complete-alias.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/envman-and-webi.env b/_home/private_dot_config/sz.env/envman-and-webi.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/envman-and-webi.env rename to _home/private_dot_config/sz.env/envman-and-webi.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/executable__.load.sh b/_home/private_dot_config/sz.env/executable__.load.sh similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/executable__.load.sh rename to _home/private_dot_config/sz.env/executable__.load.sh diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/fix-kubectl.env b/_home/private_dot_config/sz.env/fix-kubectl.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/fix-kubectl.env rename to _home/private_dot_config/sz.env/fix-kubectl.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/fix-nvim.env b/_home/private_dot_config/sz.env/fix-nvim.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/fix-nvim.env rename to _home/private_dot_config/sz.env/fix-nvim.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env b/_home/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env rename to _home/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env b/_home/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env rename to _home/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env b/_home/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env rename to _home/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env b/_home/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env rename to _home/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_bbb_bash_preexec.env b/_home/private_dot_config/sz.env/remove_bbb_bash_preexec.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/remove_bbb_bash_preexec.env rename to _home/private_dot_config/sz.env/remove_bbb_bash_preexec.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_bbb_ble.sh.env b/_home/private_dot_config/sz.env/remove_bbb_ble.sh.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/remove_bbb_ble.sh.env rename to _home/private_dot_config/sz.env/remove_bbb_ble.sh.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/truenas-scale.env b/_home/private_dot_config/sz.env/truenas-scale.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/truenas-scale.env rename to _home/private_dot_config/sz.env/truenas-scale.env diff --git a/_home/private_dot_config/sz.env/zza_atuin.env b/_home/private_dot_config/sz.env/zza_atuin.env new file mode 120000 index 0000000..12dba93 --- /dev/null +++ b/_home/private_dot_config/sz.env/zza_atuin.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zza_atuin.env \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zza_lsd.env b/_home/private_dot_config/sz.env/zza_lsd.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/zza_lsd.env rename to _home/private_dot_config/sz.env/zza_lsd.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zza_pet.env b/_home/private_dot_config/sz.env/zza_pet.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/zza_pet.env rename to _home/private_dot_config/sz.env/zza_pet.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zza_starship.env b/_home/private_dot_config/sz.env/zza_starship.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/zza_starship.env rename to _home/private_dot_config/sz.env/zza_starship.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zza_vivid.env b/_home/private_dot_config/sz.env/zza_vivid.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/zza_vivid.env rename to _home/private_dot_config/sz.env/zza_vivid.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zzb_eza.env b/_home/private_dot_config/sz.env/zzb_eza.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/zzb_eza.env rename to _home/private_dot_config/sz.env/zzb_eza.env diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zzz_bash_post.env b/_home/private_dot_config/sz.env/zzz_bash_post.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/zzz_bash_post.env rename to _home/private_dot_config/sz.env/zzz_bash_post.env diff --git a/_home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl b/_home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl new file mode 120000 index 0000000..51767bd --- /dev/null +++ b/_home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env.tmpl \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/zzz_fzf.env.off b/_home/private_dot_config/sz.env/zzz_fzf.env.off new file mode 120000 index 0000000..1db551d --- /dev/null +++ b/_home/private_dot_config/sz.env/zzz_fzf.env.off @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_fzf.env.off \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zzz_teleport.env b/_home/private_dot_config/sz.env/zzz_teleport.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/zzz_teleport.env rename to _home/private_dot_config/sz.env/zzz_teleport.env diff --git a/chezmoi.roots/_home/private_dot_config/vim/_init b/_home/private_dot_config/vim/_init similarity index 100% rename from chezmoi.roots/_home/private_dot_config/vim/_init rename to _home/private_dot_config/vim/_init diff --git a/_home/private_dot_config/wezterm/wezterm.lua b/_home/private_dot_config/wezterm/wezterm.lua new file mode 120000 index 0000000..7cc311d --- /dev/null +++ b/_home/private_dot_config/wezterm/wezterm.lua @@ -0,0 +1 @@ +../../../_src.all/private_dot_config/wezterm/wezterm.lua \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_local/bin/.keep b/_home/private_dot_local/bin/.keep similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/.keep rename to _home/private_dot_local/bin/.keep diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_auto-copy-ssh-id b/_home/private_dot_local/bin/executable_auto-copy-ssh-id similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_auto-copy-ssh-id rename to _home/private_dot_local/bin/executable_auto-copy-ssh-id diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_fix_chmod b/_home/private_dot_local/bin/executable_fix_chmod similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_fix_chmod rename to _home/private_dot_local/bin/executable_fix_chmod diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_get-github-release.sh b/_home/private_dot_local/bin/executable_get-github-release.sh similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_get-github-release.sh rename to _home/private_dot_local/bin/executable_get-github-release.sh diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_git-l b/_home/private_dot_local/bin/executable_git-l similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_git-l rename to _home/private_dot_local/bin/executable_git-l diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_load-starship b/_home/private_dot_local/bin/executable_load-starship similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_load-starship rename to _home/private_dot_local/bin/executable_load-starship diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_load-webi b/_home/private_dot_local/bin/executable_load-webi similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_load-webi rename to _home/private_dot_local/bin/executable_load-webi diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij b/_home/private_dot_local/bin/executable_load-zellij similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij rename to _home/private_dot_local/bin/executable_load-zellij diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_szetup-kubectl4k3s b/_home/private_dot_local/bin/executable_szetup-kubectl4k3s similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_szetup-kubectl4k3s rename to _home/private_dot_local/bin/executable_szetup-kubectl4k3s diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_tsh-get b/_home/private_dot_local/bin/executable_tsh-get similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_tsh-get rename to _home/private_dot_local/bin/executable_tsh-get diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_tssh b/_home/private_dot_local/bin/executable_tssh similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_tssh rename to _home/private_dot_local/bin/executable_tssh diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_tssh-with-tunnel b/_home/private_dot_local/bin/executable_tssh-with-tunnel similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_tssh-with-tunnel rename to _home/private_dot_local/bin/executable_tssh-with-tunnel diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_update-atuin b/_home/private_dot_local/bin/executable_update-atuin similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_update-atuin rename to _home/private_dot_local/bin/executable_update-atuin diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_update-nvim b/_home/private_dot_local/bin/executable_update-nvim similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/executable_update-nvim rename to _home/private_dot_local/bin/executable_update-nvim diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim b/_home/private_dot_local/bin/symlink_nvim similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/symlink_nvim rename to _home/private_dot_local/bin/symlink_nvim diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_vi b/_home/private_dot_local/bin/symlink_vi similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/symlink_vi rename to _home/private_dot_local/bin/symlink_vi diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_vim b/_home/private_dot_local/bin/symlink_vim similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/symlink_vim rename to _home/private_dot_local/bin/symlink_vim diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_vim.tiny b/_home/private_dot_local/bin/symlink_vim.tiny similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/symlink_vim.tiny rename to _home/private_dot_local/bin/symlink_vim.tiny diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_vimdiff b/_home/private_dot_local/bin/symlink_vimdiff similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/symlink_vimdiff rename to _home/private_dot_local/bin/symlink_vimdiff diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_zfs b/_home/private_dot_local/bin/symlink_zfs similarity index 100% rename from chezmoi.roots/_home/private_dot_local/bin/symlink_zfs rename to _home/private_dot_local/bin/symlink_zfs diff --git a/chezmoi.roots/_home/private_dot_ssh/config b/_home/private_dot_ssh/config similarity index 100% rename from chezmoi.roots/_home/private_dot_ssh/config rename to _home/private_dot_ssh/config diff --git a/chezmoi.roots/_home/private_dot_ssh/config.d/.keep b/_home/private_dot_ssh/config.d/.keep similarity index 100% rename from chezmoi.roots/_home/private_dot_ssh/config.d/.keep rename to _home/private_dot_ssh/config.d/.keep diff --git a/_src.all/.chezmoi.toml.tmpl b/_src.all/.chezmoi.toml.tmpl new file mode 100644 index 0000000..8c778df --- /dev/null +++ b/_src.all/.chezmoi.toml.tmpl @@ -0,0 +1,97 @@ +{{- $githubToken := or (env "CZ_GITHUB_ACCESS_TOKEN") (env "CHEZMOI_GITHUB_ACCESS_TOKEN") (env "GITHUB_ACCESS_TOKEN") (env "GITHUB_TOKEN") }} +{{- if not ($githubToken) }} +{{- $githubToken = promptStringOnce . "githubToken" "Public GITHUB token (mostly for rate limits - !insecure!)" }} +{{- end }} +{{- $sysname := promptStringOnce . "sysname" "System name" }} +{{- $sysgroup := promptStringOnce . "sysgroup" "System group" }} +{{- $sysarea := promptStringOnce . "sysarea" "System area" }} +{{- $gitEmail := promptStringOnce . "gitEmail" "email address (for git commits)" }} +{{- $gitName := promptStringOnce . "gitName" "Full name (for git commits)" }} +{{- $chassisType := "desktop" }} +{{- $sysType := "posix" }} +{{- $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") }} +{{- $chassisType = "laptop" }} +{{- else }} +{{- $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 }} +{{- end }} + +{{- $scriptTempDir := "~/.cache/chezmoi/tmp" }} +scriptTempDir={{- $scriptTempDir | quote }} + +[data.sz.os] +{{- if eq .chezmoi.os "linux" }} + short={{- .chezmoi.os | quote }} +{{- else if eq .chezmoi.os "darwin" }} + short="mac" +{{- 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 }} +{{- end }} +{{- if ($sysType) }} + sysType={{- $sysType | quote }} +{{- end }} + +[data] +{{- if ($githubToken) }} + githubToken={{- $githubToken | quote }} +{{- end }} +{{- if ($sysname) }} + sysname = {{ $sysname | quote }} +{{- end }} +{{- if ($sysgroup) }} + sysgroup = {{ $sysgroup | quote }} +{{- end }} +{{- if ($sysarea) }} + sysarea = {{ $sysarea | quote }} +{{ end }} + +{{- if ($gitEmail) }} + gitEmail = {{ $gitEmail | quote }} +{{- end }} +{{- if ($gitName) }} + gitName = {{ $gitName | quote }} +{{- end }} +{{- if not ($githubToken) }} + githubToken={{- $githubToken | quote }} +{{- end }} + +[scriptEnv] + GITHUB_ACCESS_TOKEN={{- $githubToken | quote }} + GITHUB_TOKEN={{- $githubToken | quote }} + +[diff] +# command = "nvim" +# args = ["-d", "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"] + + command = "delta" + args = ["--paging=never", "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"] + pager = "moar" + diff --git a/chezmoi.roots/_src.all/private_dot_config/vim/_init b/_src.all/private_dot_config/vim/_init similarity index 100% rename from chezmoi.roots/_src.all/private_dot_config/vim/_init rename to _src.all/private_dot_config/vim/_init diff --git a/_src.all/private_dot_config/wezterm/wezterm.lua b/_src.all/private_dot_config/wezterm/wezterm.lua new file mode 100644 index 0000000..7ff5453 --- /dev/null +++ b/_src.all/private_dot_config/wezterm/wezterm.lua @@ -0,0 +1,246 @@ +-- Pull in the wezterm API +local wezterm = require 'wezterm' +local act = wezterm.action + +-- This table will hold the configuration. +local config = {} + +-- In newer versions of wezterm, use the config_builder which will +-- help provide clearer error messages +if wezterm.config_builder then + config = wezterm.config_builder() +end + +config.window_background_opacity = 0.97 +config.text_background_opacity = 0.9 + +-- This is where you actually apply your config choices +config.audible_bell = "Disabled" + +config.visual_bell = { + fade_in_function = 'EaseIn', + fade_in_duration_ms = 50, + fade_out_function = 'Constant', + fade_out_duration_ms = 0, +} +-- config.colors = { +-- visual_bell = '#202020', +-- } + +-- For example, changing the color scheme: +-- config.color_scheme = 'AdventureTime' +-- config.color_scheme = 'Batman' +-- config.color_scheme = 'Apple System Colors' +-- config.color_scheme = 'Azu (Gogh)' +-- config.color_scheme = 'Bim (Gogh)' +-- config.color_scheme = 'Cai (Gogh)' +-- config.color_scheme = 'CGA' +-- config.color_scheme = 'Chalkboard' +-- config.color_scheme = 'Dark Pastel' +-- config.color_scheme = 'Dark Violet (base16)' +-- config.color_scheme = 'Default Dark (base16)' +-- config.color_scheme = 'Dotshare (terminal.sexy)' +-- config.color_scheme = 'Dracula' +-- config.color_scheme = 'Dracula (Official)' +-- config.color_scheme = 'Dracula+' +-- config.color_scheme = 'duckbones' +-- config.color_scheme = 'Floraverse' -- ***** +-- config.color_scheme = 'Galizur' +-- config.color_scheme = 'Github Dark (Gogh)' +-- config.color_scheme = 'Glacier' +-- config.color_scheme = 'Gnometerm (terminal.sexy)' +-- config.color_scheme = 'Gotham (Gogh)' +-- config.color_scheme = 'Grayscale Dark (base16)' +-- config.color_scheme = 'Hardcore (Gogh)' +-- config.color_scheme = 'Highway' +-- config.color_scheme = 'Hybrid (terminal.sexy)' +-- config.color_scheme = 'Ibm3270 (Gogh)' +-- config.color_scheme = 'Iiamblack (terminal.sexy)' +-- config.color_scheme = 'iTerm2 Default' +-- config.color_scheme = 'iTerm2 Smoooooth' +-- config.color_scheme = 'iTerm2 Tango Dark' +-- config.color_scheme = 'Jason Wryan (terminal.sexy)' +-- config.color_scheme = 'Kibble' +-- config.color_scheme = 'Kibble (Gogh)' +-- config.color_scheme = 'Konsolas' +-- config.color_scheme = 'LiquidCarbonTransparent' +-- config.color_scheme = 'MaterialDark' +-- config.color_scheme = 'MaterialDesignColors' +-- config.color_scheme = 'Muse (terminal.sexy)' +-- config.color_scheme = 'niji' +-- config.color_scheme = 'Oceanic Next (Gogh)' +-- config.color_scheme = 'Pasque (base16)' -- Purple/Lavendar hues +config.color_scheme = 'Pencil Dark (Gogh)' -- ****1/2 +-- config.color_scheme = 'PencilDark' +-- config.color_scheme = 'Popping and Locking' +-- config.color_scheme = 'Rasi (terminal.sexy)' +-- config.color_scheme = 'Rezza (terminal.sexy)' +-- config.color_scheme = 'Rosé Pine (Gogh)' +-- config.color_scheme = 'Rouge 2' +-- config.color_scheme = 'Royal' -- ****1/2 +-- config.color_scheme = 'Sea Shells (Gogh)' +-- config.color_scheme = 'Seti' +-- config.color_scheme = 'shades-of-purple' +-- config.color_scheme = 'SpaceGray Eighties' +-- config.color_scheme = 'Tango (terminal.sexy)' +-- config.color_scheme = 'Twilight (dark) (terminal.sexy)' +-- config.color_scheme = 'VibrantInk' +-- config.color_scheme = 'Vice Alt (base16)' +-- config.color_scheme = 'Vice Dark (base16)' + +-- config.font = wezterm.font 'CaskaydiaCove Nerd Font Mono Regular' +config.font = wezterm.font_with_fallback { + 'FiraCode Nerd Font Mono' + , 'FiraCode Nerd Font Mono SemBd' + , 'FiraCode Nerd Font Mono Ret' + , 'FiraMono Nerd Font Mono' + , 'DroidSansM Nerd Font' + , 'DroidSansMono NF' + , 'DroidSansMono' + , 'Consolas' + , 'Courier New' + , 'monospace' +} +--config.default_prog = { 'pwsh' } + +-- config.keys = { +-- { +-- key = ',', +-- mods = 'CMD', +-- action = act.SpawnCommandInNewTab { +-- cwd = os.getenv('WEZTERM_CONFIG_DIR'), +-- set_environment_variables = { +-- TERM = 'screen-256color', +-- }, +-- args = { +-- 'code', +-- os.getenv('WEZTERM_CONFIG_FILE'), +-- }, +-- }, +-- }, +-- { +-- key = 'R', +-- mods = 'CMD|SHIFT', +-- action = act.PromptInputLine { +-- description = 'Enter new name for tab', +-- action = wezterm.action_callback(function(window, _, line) +-- -- line will be `nil` if they hit escape without entering anything +-- -- An empty string if they just hit enter +-- -- Or the actual line of text they wrote +-- if line then +-- window:active_tab():set_title(line) +-- end +-- end), +-- }, +-- }, +-- -- other keys +-- -- { +-- -- key = "n", +-- -- mods = "CTRL", +-- -- action = wezterm.action.SpawnCommandInNewTab({ +-- -- args = {"code ."} +-- -- }) +-- -- }, +-- } + +config.window_background_gradient = { + -- Can be "Vertical" or "Horizontal". Specifies the direction + -- in which the color gradient varies. The default is "Horizontal", + -- with the gradient going from left-to-right. + -- Linear and Radial gradients are also supported; see the other + -- examples below + orientation = 'Vertical', + + -- Specifies the set of colors that are interpolated in the gradient. + -- Accepts CSS style color specs, from named colors, through rgb + -- strings and more + colors = { + '#0f0c29', + '#302b63', + '#24243e', + }, + + -- Instead of specifying `colors`, you can use one of a number of + -- predefined, preset gradients. + -- A list of presets is shown in a section below. + -- preset = "Warm", + + -- Specifies the interpolation style to be used. + -- "Linear", "Basis" and "CatmullRom" as supported. + -- The default is "Linear". + interpolation = 'Linear', + + -- How the colors are blended in the gradient. + -- "Rgb", "LinearRgb", "Hsv" and "Oklab" are supported. + -- The default is "Rgb". + blend = 'Rgb', + + -- To avoid vertical color banding for horizontal gradients, the + -- gradient position is randomly shifted by up to the `noise` value + -- for each pixel. + -- Smaller values, or 0, will make bands more prominent. + -- The default value is 64 which gives decent looking results + -- on a retina macbook pro display. + -- noise = 64, + + -- By default, the gradient smoothly transitions between the colors. + -- You can adjust the sharpness by specifying the segment_size and + -- segment_smoothness parameters. + -- segment_size configures how many segments are present. + -- segment_smoothness is how hard the edge is; 0.0 is a hard edge, + -- 1.0 is a soft edge. + + -- segment_size = 11, + -- segment_smoothness = 0.0, +} +config.window_background_gradient = null +config.prefer_to_spawn_tabs = true + +wezterm.on("format-tab-title", function(tab, tabs, panes, config, hover, max_width) + local pane_title = tab.active_pane.title + local user_title = tab.active_pane.user_vars.panetitle + + if user_title ~= nil and #user_title > 0 then + pane_title = user_title + end + + return { + -- {Background={Color="blue"}}, + -- {Foreground={Color="white"}}, + {Text=" " .. pane_title .. " "}, + } +end) + +-- # First and only argument is the desired term title +-- function rename_wezterm_title { printf "\x1b]1337;SetUserVar=panetitle=%s\x07" "$(echo -n "$*" | base64)"; }; rename_wezterm_title Serial:$(hostname) + +-- wezterm.on("merge_all_windows", function(window, pane) +-- local workspace = wezterm.mux.get_active_workspace() +-- local all_windows = wezterm.mux.all_windows() + +-- -- Find the first window in the workspace to move all tabs into +-- local target_window = nil +-- for _, win in ipairs(all_windows) do +-- if win:get_workspace() == workspace then +-- target_window = win +-- break +-- end +-- end + +-- if not target_window then return end + +-- -- Move all tabs from other windows into target_window +-- for _, win in ipairs(all_windows) do +-- if win ~= target_window and win:get_workspace() == workspace then +-- for _, tab in ipairs(win:tabs()) do +-- tab:move_to_window(target_window) +-- end +-- -- Close the now empty window +-- win:perform_action(wezterm.action.CloseCurrentPane { confirm = false }, win:active_pane()) +-- end +-- end +-- end) + +-- and finally, return the configuration to wezterm +return config + diff --git a/chezmoi.roots/_src.all/private_dot_ssh/config.d/.keep b/_src.all/private_dot_local/bin/.keep similarity index 100% rename from chezmoi.roots/_src.all/private_dot_ssh/config.d/.keep rename to _src.all/private_dot_local/bin/.keep diff --git a/chezmoi.roots/_src.all/private_dot_ssh/config b/_src.all/private_dot_ssh/config similarity index 100% rename from chezmoi.roots/_src.all/private_dot_ssh/config rename to _src.all/private_dot_ssh/config diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env b/_src.all/private_dot_ssh/config.d/.keep similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env rename to _src.all/private_dot_ssh/config.d/.keep diff --git a/chezmoi.roots/_src.posix/.chezmoi.toml.tmpl b/_src.posix/.chezmoi.toml.tmpl similarity index 100% rename from chezmoi.roots/_src.posix/.chezmoi.toml.tmpl rename to _src.posix/.chezmoi.toml.tmpl diff --git a/chezmoi.roots/_src.posix/.chezmoiexternal.yaml.tmpl b/_src.posix/.chezmoiexternal.yaml.tmpl similarity index 92% rename from chezmoi.roots/_src.posix/.chezmoiexternal.yaml.tmpl rename to _src.posix/.chezmoiexternal.yaml.tmpl index 1a878a7..7423f1b 100644 --- a/chezmoi.roots/_src.posix/.chezmoiexternal.yaml.tmpl +++ b/_src.posix/.chezmoiexternal.yaml.tmpl @@ -101,17 +101,6 @@ "refreshPeriod" $defaultRefresh ) -}}{{- end -}}{{- end -}}{{- end -}} -{{- with $app_name := "zoxide" -}} -{{- with $repo := (printf "%s/%s" "ajeetdsouza" $app_name) -}} -{{- with $version := trimPrefix "v" (gitHubLatestRelease $repo).GetTagName -}} -{{- $_ := set $externals (printf ".local/bin/%s" $app_name) (dict - "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/v%s/%s-%s-%s.tar.gz" $repo $version $app_name $version $myArch) - "path" $app_name - "executable" true - "refreshPeriod" $defaultRefresh -) -}}{{- end -}}{{- end -}}{{- end -}} - {{- if lookPath "jq" -}} {{- $path_prefix = or (get (dict "linux" "./") .chezmoi.os) "" -}} {{- with $app_name := "eza" -}} @@ -197,17 +186,6 @@ "refreshPeriod" $defaultRefresh ) -}}{{- end -}}{{- end -}}{{- end -}} -{{- with $app_name := "ansi2txt" -}} -{{- with $repo := (printf "%s/%s" "gabe565" $app_name) -}} -{{- with $version := trimPrefix "v" (gitHubLatestRelease $repo).GetTagName -}} -{{- $_ := set $externals (printf ".local/bin/%s" $app_name) (dict - "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/v%s/%s_%s_%s.tar.gz" $repo $version $app_name $version $myArch) - "path" $app_name - "executable" true - "refreshPeriod" $defaultRefresh -) -}}{{- end -}}{{- end -}}{{- end -}} - {{/* # valid arch strings: # linux-aarch64 diff --git a/chezmoi.roots/_src.posix/.chezmoiignore b/_src.posix/.chezmoiignore similarity index 100% rename from chezmoi.roots/_src.posix/.chezmoiignore rename to _src.posix/.chezmoiignore diff --git a/chezmoi.roots/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl b/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl similarity index 100% rename from chezmoi.roots/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl rename to _src.posix/.chezmoiscripts/run_once_init.sh.tmpl diff --git a/chezmoi.roots/_src.posix/dot_bashrc b/_src.posix/dot_bashrc similarity index 100% rename from chezmoi.roots/_src.posix/dot_bashrc rename to _src.posix/dot_bashrc diff --git a/chezmoi.roots/_src.posix/dot_gitconfig.tmpl b/_src.posix/dot_gitconfig.tmpl similarity index 100% rename from chezmoi.roots/_src.posix/dot_gitconfig.tmpl rename to _src.posix/dot_gitconfig.tmpl diff --git a/chezmoi.roots/_src.posix/dot_profile b/_src.posix/dot_profile similarity index 100% rename from chezmoi.roots/_src.posix/dot_profile rename to _src.posix/dot_profile diff --git a/chezmoi.roots/_src.posix/dot_vimrc b/_src.posix/dot_vimrc similarity index 100% rename from chezmoi.roots/_src.posix/dot_vimrc rename to _src.posix/dot_vimrc diff --git a/chezmoi.roots/_src.posix/dot_zshrc b/_src.posix/dot_zshrc similarity index 100% rename from chezmoi.roots/_src.posix/dot_zshrc rename to _src.posix/dot_zshrc diff --git a/chezmoi.roots/_src.posix/private_dot_config/atuin/config.toml b/_src.posix/private_dot_config/atuin/config.toml similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/atuin/config.toml rename to _src.posix/private_dot_config/atuin/config.toml diff --git a/chezmoi.roots/_src.posix/private_dot_config/pet/config.toml b/_src.posix/private_dot_config/pet/config.toml similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/pet/config.toml rename to _src.posix/private_dot_config/pet/config.toml diff --git a/chezmoi.roots/_src.posix/private_dot_config/pet/snippet.toml b/_src.posix/private_dot_config/pet/snippet.toml similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/pet/snippet.toml rename to _src.posix/private_dot_config/pet/snippet.toml diff --git a/chezmoi.roots/_src.posix/private_dot_config/starship.toml b/_src.posix/private_dot_config/starship.toml similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/starship.toml rename to _src.posix/private_dot_config/starship.toml diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env b/_src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env rename to _src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/ID_truenas_scale.env b/_src.posix/private_dot_config/sz.env/ID_truenas_scale.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/ID_truenas_scale.env rename to _src.posix/private_dot_config/sz.env/ID_truenas_scale.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_home_bin.env b/_src.posix/private_dot_config/sz.env/PATH_home_bin.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_home_bin.env rename to _src.posix/private_dot_config/sz.env/PATH_home_bin.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_node.env b/_src.posix/private_dot_config/sz.env/PATH_node.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_node.env rename to _src.posix/private_dot_config/sz.env/PATH_node.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_truestuff.env b/_src.posix/private_dot_config/sz.env/PATH_truestuff.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_truestuff.env rename to _src.posix/private_dot_config/sz.env/PATH_truestuff.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_zz_cleanup.env b/_src.posix/private_dot_config/sz.env/PATH_zz_cleanup.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/PATH_zz_cleanup.env rename to _src.posix/private_dot_config/sz.env/PATH_zz_cleanup.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_000_term.env b/_src.posix/private_dot_config/sz.env/aaa_000_term.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_000_term.env rename to _src.posix/private_dot_config/sz.env/aaa_000_term.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh b/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh rename to _src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh b/_src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh rename to _src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh b/_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh similarity index 70% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh rename to _src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh index 72d8db7..714e502 100644 --- a/chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh +++ b/_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh @@ -1,7 +1,8 @@ #!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"' -zinit load 'marlonrichert/zsh-autocomplete' -if false; then +BASE_SHELL=${BASE_SHELL:-${SHELL##*/}} + +if [[ "${BASE_SHELL}" == "zsh" ]]; then autoload -Uz +X compinit bashcompinit && compinit && bashcompinit zstyle ':completion:*' menu yes select diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/aab_zellij.env b/_src.posix/private_dot_config/sz.env/aab_zellij.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/aab_zellij.env rename to _src.posix/private_dot_config/sz.env/aab_zellij.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/aliases.env.tmpl b/_src.posix/private_dot_config/sz.env/aliases.env.tmpl similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/aliases.env.tmpl rename to _src.posix/private_dot_config/sz.env/aliases.env.tmpl diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/bbb_bash_preexec.env.bash b/_src.posix/private_dot_config/sz.env/bbb_bash_preexec.env.bash similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/bbb_bash_preexec.env.bash rename to _src.posix/private_dot_config/sz.env/bbb_bash_preexec.env.bash diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/bbb_ble.sh.env.bash b/_src.posix/private_dot_config/sz.env/bbb_ble.sh.env.bash similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/bbb_ble.sh.env.bash rename to _src.posix/private_dot_config/sz.env/bbb_ble.sh.env.bash diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/broot.env b/_src.posix/private_dot_config/sz.env/broot.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/broot.env rename to _src.posix/private_dot_config/sz.env/broot.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/ccc_load_complete-alias.env b/_src.posix/private_dot_config/sz.env/ccc_load_complete-alias.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/ccc_load_complete-alias.env rename to _src.posix/private_dot_config/sz.env/ccc_load_complete-alias.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/envman-and-webi.env b/_src.posix/private_dot_config/sz.env/envman-and-webi.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/envman-and-webi.env rename to _src.posix/private_dot_config/sz.env/envman-and-webi.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/executable__.load.sh b/_src.posix/private_dot_config/sz.env/executable__.load.sh similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/executable__.load.sh rename to _src.posix/private_dot_config/sz.env/executable__.load.sh diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/fix-kubectl.env b/_src.posix/private_dot_config/sz.env/fix-kubectl.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/fix-kubectl.env rename to _src.posix/private_dot_config/sz.env/fix-kubectl.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/fix-nvim.env b/_src.posix/private_dot_config/sz.env/fix-nvim.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/fix-nvim.env rename to _src.posix/private_dot_config/sz.env/fix-nvim.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env b/_src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env rename to _src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env b/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env rename to _src.posix/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env b/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env rename to _src.posix/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_bbb_bash_preexec.env b/_src.posix/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_bbb_bash_preexec.env rename to _src.posix/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_bbb_ble.sh.env b/_src.posix/private_dot_config/sz.env/remove_bbb_bash_preexec.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_bbb_ble.sh.env rename to _src.posix/private_dot_config/sz.env/remove_bbb_bash_preexec.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl b/_src.posix/private_dot_config/sz.env/remove_bbb_ble.sh.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl rename to _src.posix/private_dot_config/sz.env/remove_bbb_ble.sh.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/truenas-scale.env b/_src.posix/private_dot_config/sz.env/truenas-scale.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/truenas-scale.env rename to _src.posix/private_dot_config/sz.env/truenas-scale.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zzy_atuin.env b/_src.posix/private_dot_config/sz.env/zza_atuin.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zzy_atuin.env rename to _src.posix/private_dot_config/sz.env/zza_atuin.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_lsd.env b/_src.posix/private_dot_config/sz.env/zza_lsd.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_lsd.env rename to _src.posix/private_dot_config/sz.env/zza_lsd.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_pet.env b/_src.posix/private_dot_config/sz.env/zza_pet.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_pet.env rename to _src.posix/private_dot_config/sz.env/zza_pet.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_starship.env b/_src.posix/private_dot_config/sz.env/zza_starship.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_starship.env rename to _src.posix/private_dot_config/sz.env/zza_starship.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_vivid.env b/_src.posix/private_dot_config/sz.env/zza_vivid.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_vivid.env rename to _src.posix/private_dot_config/sz.env/zza_vivid.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zzb_eza.env b/_src.posix/private_dot_config/sz.env/zzb_eza.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zzb_eza.env rename to _src.posix/private_dot_config/sz.env/zzb_eza.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zzz_bash_post.env b/_src.posix/private_dot_config/sz.env/zzz_bash_post.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zzz_bash_post.env rename to _src.posix/private_dot_config/sz.env/zzz_bash_post.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zzy_chezmoi.env.tmpl b/_src.posix/private_dot_config/sz.env/zzz_chezmoi.env.tmpl similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zzy_chezmoi.env.tmpl rename to _src.posix/private_dot_config/sz.env/zzz_chezmoi.env.tmpl diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zzk_fzf.env b/_src.posix/private_dot_config/sz.env/zzz_fzf.env.off similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zzk_fzf.env rename to _src.posix/private_dot_config/sz.env/zzz_fzf.env.off diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/zzz_teleport.env b/_src.posix/private_dot_config/sz.env/zzz_teleport.env similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/sz.env/zzz_teleport.env rename to _src.posix/private_dot_config/sz.env/zzz_teleport.env diff --git a/chezmoi.roots/_src.posix/private_dot_config/vim/_init b/_src.posix/private_dot_config/vim/_init similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_config/vim/_init rename to _src.posix/private_dot_config/vim/_init diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/.keep b/_src.posix/private_dot_local/bin/.keep similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/.keep rename to _src.posix/private_dot_local/bin/.keep diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_auto-copy-ssh-id b/_src.posix/private_dot_local/bin/executable_auto-copy-ssh-id similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_auto-copy-ssh-id rename to _src.posix/private_dot_local/bin/executable_auto-copy-ssh-id diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_get-github-release.sh b/_src.posix/private_dot_local/bin/executable_get-github-release.sh similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_get-github-release.sh rename to _src.posix/private_dot_local/bin/executable_get-github-release.sh diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_load-starship b/_src.posix/private_dot_local/bin/executable_load-starship similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_load-starship rename to _src.posix/private_dot_local/bin/executable_load-starship diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_load-webi b/_src.posix/private_dot_local/bin/executable_load-webi similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_load-webi rename to _src.posix/private_dot_local/bin/executable_load-webi diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_load-zellij b/_src.posix/private_dot_local/bin/executable_load-zellij similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_load-zellij rename to _src.posix/private_dot_local/bin/executable_load-zellij diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_szetup-kubectl4k3s b/_src.posix/private_dot_local/bin/executable_szetup-kubectl4k3s similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_szetup-kubectl4k3s rename to _src.posix/private_dot_local/bin/executable_szetup-kubectl4k3s diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_tsh-get b/_src.posix/private_dot_local/bin/executable_tsh-get similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_tsh-get rename to _src.posix/private_dot_local/bin/executable_tsh-get diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_tssh b/_src.posix/private_dot_local/bin/executable_tssh similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_tssh rename to _src.posix/private_dot_local/bin/executable_tssh diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel b/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel rename to _src.posix/private_dot_local/bin/executable_tssh-with-tunnel diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_update-atuin b/_src.posix/private_dot_local/bin/executable_update-atuin similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_update-atuin rename to _src.posix/private_dot_local/bin/executable_update-atuin diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/executable_update-nvim b/_src.posix/private_dot_local/bin/executable_update-nvim similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/executable_update-nvim rename to _src.posix/private_dot_local/bin/executable_update-nvim diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/symlink_nvim b/_src.posix/private_dot_local/bin/symlink_nvim similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/symlink_nvim rename to _src.posix/private_dot_local/bin/symlink_nvim diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vi b/_src.posix/private_dot_local/bin/symlink_vi similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vi rename to _src.posix/private_dot_local/bin/symlink_vi diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vim b/_src.posix/private_dot_local/bin/symlink_vim similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vim rename to _src.posix/private_dot_local/bin/symlink_vim diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vim.tiny b/_src.posix/private_dot_local/bin/symlink_vim.tiny similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vim.tiny rename to _src.posix/private_dot_local/bin/symlink_vim.tiny diff --git a/chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vimdiff b/_src.posix/private_dot_local/bin/symlink_vimdiff similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_local/bin/symlink_vimdiff rename to _src.posix/private_dot_local/bin/symlink_vimdiff diff --git a/chezmoi.roots/_src.posix/private_dot_ssh/config b/_src.posix/private_dot_ssh/config similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_ssh/config rename to _src.posix/private_dot_ssh/config diff --git a/chezmoi.roots/_src.posix/private_dot_ssh/config.d/.keep b/_src.posix/private_dot_ssh/config.d/.keep similarity index 100% rename from chezmoi.roots/_src.posix/private_dot_ssh/config.d/.keep rename to _src.posix/private_dot_ssh/config.d/.keep diff --git a/chezmoi.roots/__root_links/base.chezmoiroot.linux b/base.chezmoiroot.linux similarity index 100% rename from chezmoi.roots/__root_links/base.chezmoiroot.linux rename to base.chezmoiroot.linux diff --git a/base.chezmoiroot.macos b/base.chezmoiroot.macos new file mode 100644 index 0000000..b42b5ea --- /dev/null +++ b/base.chezmoiroot.macos @@ -0,0 +1 @@ +_home.macos diff --git a/chezmoi.roots/__root_links/base.chezmoiroot.macos.laptop b/base.chezmoiroot.macos.laptop similarity index 100% rename from chezmoi.roots/__root_links/base.chezmoiroot.macos.laptop rename to base.chezmoiroot.macos.laptop diff --git a/base.chezmoiroot.posix b/base.chezmoiroot.posix new file mode 100644 index 0000000..65cabf6 --- /dev/null +++ b/base.chezmoiroot.posix @@ -0,0 +1 @@ +_home diff --git a/chezmoi.roots/__root_links/base.chezmoiroot.macos b/chezmoi.roots/__root_links/base.chezmoiroot.macos deleted file mode 100644 index 74f276f..0000000 --- a/chezmoi.roots/__root_links/base.chezmoiroot.macos +++ /dev/null @@ -1 +0,0 @@ -chezmoi.roots/_home.macos diff --git a/chezmoi.roots/__root_links/base.chezmoiroot.posix b/chezmoi.roots/__root_links/base.chezmoiroot.posix deleted file mode 100644 index e4b7be3..0000000 --- a/chezmoi.roots/__root_links/base.chezmoiroot.posix +++ /dev/null @@ -1 +0,0 @@ -chezmoi.roots/_home diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zza_atuin.env b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zza_atuin.env deleted file mode 120000 index ec283df..0000000 --- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zza_atuin.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/remove_zza_atuin.env \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl deleted file mode 120000 index 72599a9..0000000 --- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_fzf.env.off b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_fzf.env.off deleted file mode 120000 index 5020619..0000000 --- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_fzf.env.off +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/remove_zzz_fzf.env.off \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzk_fzf.env b/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzk_fzf.env deleted file mode 120000 index 7f366f7..0000000 --- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzk_fzf.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/zzk_fzf.env \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_atuin.env b/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_atuin.env deleted file mode 120000 index 00acdb2..0000000 --- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_atuin.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/zzy_atuin.env \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_chezmoi.env.tmpl b/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_chezmoi.env.tmpl deleted file mode 120000 index 8e69310..0000000 --- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_chezmoi.env.tmpl +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/zzy_chezmoi.env.tmpl \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/wezterm/wezterm.lua.tmpl b/chezmoi.roots/_home.macos/private_dot_config/wezterm/wezterm.lua.tmpl deleted file mode 120000 index a70f560..0000000 --- a/chezmoi.roots/_home.macos/private_dot_config/wezterm/wezterm.lua.tmpl +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/wezterm/wezterm.lua.tmpl \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_zza_atuin.env b/chezmoi.roots/_home/private_dot_config/sz.env/remove_zza_atuin.env deleted file mode 120000 index ec283df..0000000 --- a/chezmoi.roots/_home/private_dot_config/sz.env/remove_zza_atuin.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/remove_zza_atuin.env \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl b/chezmoi.roots/_home/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl deleted file mode 120000 index 72599a9..0000000 --- a/chezmoi.roots/_home/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/remove_zzz_fzf.env.off b/chezmoi.roots/_home/private_dot_config/sz.env/remove_zzz_fzf.env.off deleted file mode 120000 index 5020619..0000000 --- a/chezmoi.roots/_home/private_dot_config/sz.env/remove_zzz_fzf.env.off +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/remove_zzz_fzf.env.off \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zzk_fzf.env b/chezmoi.roots/_home/private_dot_config/sz.env/zzk_fzf.env deleted file mode 120000 index 7f366f7..0000000 --- a/chezmoi.roots/_home/private_dot_config/sz.env/zzk_fzf.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/zzk_fzf.env \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zzy_atuin.env b/chezmoi.roots/_home/private_dot_config/sz.env/zzy_atuin.env deleted file mode 120000 index 00acdb2..0000000 --- a/chezmoi.roots/_home/private_dot_config/sz.env/zzy_atuin.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/zzy_atuin.env \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/zzy_chezmoi.env.tmpl b/chezmoi.roots/_home/private_dot_config/sz.env/zzy_chezmoi.env.tmpl deleted file mode 120000 index 8e69310..0000000 --- a/chezmoi.roots/_home/private_dot_config/sz.env/zzy_chezmoi.env.tmpl +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/zzy_chezmoi.env.tmpl \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/wezterm/wezterm.lua.tmpl b/chezmoi.roots/_home/private_dot_config/wezterm/wezterm.lua.tmpl deleted file mode 120000 index a70f560..0000000 --- a/chezmoi.roots/_home/private_dot_config/wezterm/wezterm.lua.tmpl +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/wezterm/wezterm.lua.tmpl \ No newline at end of file diff --git a/chezmoi.roots/_src.all/.chezmoi.toml.tmpl b/chezmoi.roots/_src.all/.chezmoi.toml.tmpl deleted file mode 100644 index 3513201..0000000 --- a/chezmoi.roots/_src.all/.chezmoi.toml.tmpl +++ /dev/null @@ -1,117 +0,0 @@ -# source by .chezmoi.toml.tmpl, it is recommended to edit with -# cz edit-config-template && cz init - -{{- $githubToken := or ( - env "CZ_GITHUB_ACCESS_TOKEN" - ) ( env "CHEZMOI_GITHUB_ACCESS_TOKEN" - ) ( env "GITHUB_ACCESS_TOKEN" - ) ( env "GITHUB_TOKEN" - ) ( promptStringOnce . "githubToken" "Public GITHUB token (mostly for rate limits - !insecure!)" - ) -}} -{{- $sysname := promptStringOnce . "sysname" "System name" (or ( - env "CZ_SYSNAME" - ) ( .chezmoi.hostname - )) -}} -{{- $sysgroup := promptStringOnce . "sysgroup" "System group" (or ( - env "CZ_SYSGROUP" - ) ( .chezmoi.group - )) -}} -{{- $sysuser := promptStringOnce . "sysuser" "System user" (or ( - env "CZ_SYSUSER" - ) ( .chezmoi.username - )) -}} -{{- $gitEmail := promptStringOnce . "gitEmail" "email address (for git commits)" (or ( - env "CZ_GIT_EMAIL" - ) ( output "git" "config" "user.email" - ) ( list .chezmoi.username "@" .chezmoi.fqdnHostname | join "" - )) -}} -{{- $gitName := promptStringOnce . "gitName" "Full name (for git commits)" (or ( - env "CZ_GIT_NAME" - ) ( output "git" "config" "user.name" - ) ( list .chezmoi.username " (@" $sysname ")" | join "" - )) -}} - -{{- $scriptTempDir := or ( get . "sz.os.scriptTempDir" ) ( env "CZ_SCRIPT_TEMPDIR" ) -}} -{{- $chassisType := or ( get . "sz.os.chassisType" ) ( env "CZ_CHASSIS" ) -}} -{{- $sysType := or ( get . "sz.os.sysType" ) ( env "CZ_SYS" ) -}} -{{- $sysVendor := or ( get . "sz.os.sysVendor" ) ( env "CZ_VENDOR" ) -}} - -{{- $arch_alt := "x86_64" -}} -{{- $arch_alt_dash := "x86-64" -}} -{{- $clib_flavor := "" -}} -{{- if eq .chezmoi.os "darwin" -}} -{{- $arch_alt = "aarch64" -}} -{{- $arch_alt_dash = $arch_alt -}} -{{- else if eq .chezmoi.os "linux" -}} -{{- $clib_flavor = "-musl" -}} -{{- else if eq .chezmoi.os "windows" -}} -{{- $clib_flavor = "-msvc" -}} -{{- end -}} - -{{- $scriptTempDir := "~/.cache/chezmoi/tmp" }} -scriptTempDir={{ $scriptTempDir | quote }} - -[data.sz.os] -{{- if eq .chezmoi.os "linux" }} - short={{- .chezmoi.os | quote }} -{{- else if eq .chezmoi.os "darwin" }} - short="mac" -{{- 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 }} -{{- end }} -{{- if ($sysType) }} - sysType={{- $sysType | quote }} -{{- end }} - -[data] -{{- if ($githubToken) }} - githubToken={{- $githubToken | quote }} -{{- end }} -{{- if ($sysname) }} - sysname = {{ $sysname | quote }} -{{- end }} -{{- if ($sysgroup) }} - sysgroup = {{ $sysgroup | quote }} -{{- end }} -{{- if ($sysuser) }} - sysuser = {{ $sysuser | quote }} -{{- end }} - -{{- if ($gitEmail) }} - gitEmail = {{ $gitEmail | quote }} -{{- end }} -{{- if ($gitName) }} - gitName = {{ $gitName | quote }} -{{- end }} -{{- if not ($githubToken) }} - githubToken={{- $githubToken | quote }} -{{- end }} - -[scriptEnv] - CZ_SCRIPT_TEMPDIR={{- $scriptTempDir | quote }} - CZ_CHASSIS={{- $chassisType | quote }} - CZ_SYS={{- $sysType | quote }} - CZ_OS={{- .chezmoi.os | quote }} - CZ_GITHUB_ACCESS_TOKEN={{- $githubToken | quote }} - CZ_VENDOR={{- $sysVendor | quote }} - GITHUB_ACCESS_TOKEN={{- $githubToken | quote }} - GITHUB_TOKEN={{- $githubToken | quote }} - -[diff] -# command = "nvim" -# args = ["-d", "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"] - - command = "delta" - args = ["--paging=never", "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"] - pager = "moar" - diff --git a/chezmoi.roots/_src.all/private_dot_config/wezterm/wezterm.lua.tmpl b/chezmoi.roots/_src.all/private_dot_config/wezterm/wezterm.lua.tmpl deleted file mode 100644 index 52e7435..0000000 --- a/chezmoi.roots/_src.all/private_dot_config/wezterm/wezterm.lua.tmpl +++ /dev/null @@ -1,469 +0,0 @@ --- Pull in the wezterm API -local wezterm = require("wezterm") -local act = wezterm.action - --- This table will hold the configuration. -local config = {} - --- In newer versions of wezterm, use the config_builder which will --- help provide clearer error messages -if wezterm.config_builder then - config = wezterm.config_builder() -end - -{{- if eq .chezmoi.os "Windows" }} -config.default_prog = { 'pwsh' } -{{- end }} - -config.hide_tab_bar_if_only_one_tab = true -config.window_background_opacity = 0.9 -config.text_background_opacity = 0.9 - --- This is where you actually apply your config choices -config.audible_bell = "Disabled" - -config.visual_bell = { - fade_in_function = "EaseIn", - fade_in_duration_ms = 50, - fade_out_function = "Constant", - fade_out_duration_ms = 0, -} --- config.colors = { --- visual_bell = '#202020', --- } - --- For example, changing the color scheme: --- config.color_scheme = 'AdventureTime' --- config.color_scheme = 'Batman' --- config.color_scheme = 'Apple System Colors' --- config.color_scheme = 'Azu (Gogh)' --- config.color_scheme = 'Bim (Gogh)' --- config.colorCMD_scheme = 'Cai (Gogh)' --- config.color_scheme = 'CGA' --- config.color_scheme = 'Chalkboard' --- config.color_scheme = 'Dark Pastel' --- config.color_scheme = 'Dark Violet (base16)' --- config.color_scheme = 'Default Dark (base16)' --- config.color_scheme = 'Dotshare (terminal.sexy)' --- config.color_scheme = 'Dracula' --- config.color_scheme = 'Dracula (Official)' --- config.color_scheme = 'Dracula+' --- config.color_scheme = 'duckbones' --- config.color_scheme = 'Floraverse' -- ***** --- config.color_scheme = 'Galizur' --- config.color_scheme = 'Github Dark (Gogh)' --- config.color_scheme = 'Glacier' --- config.color_scheme = 'Gnometerm (terminal.sexy)' --- config.color_scheme = 'Gotham (Gogh)' --- config.color_scheme = 'Grayscale Dark (base16)' --- config.color_scheme = 'Hardcore (Gogh)' --- config.color_scheme = 'Highway' --- config.color_scheme = 'Hybrid (terminal.sexy)' --- config.color_scheme = 'Ibm3270 (Gogh)' --- config.color_scheme = 'Iiamblack (terminal.sexy)' --- config.color_scheme = 'iTerm2 Default' --- config.color_scheme = 'iTerm2 Smoooooth' --- config.color_scheme = 'iTerm2 Tango Dark' --- config.color_scheme = 'Jason Wryan (terminal.sexy)' --- config.color_scheme = 'Kibble' --- config.color_scheme = 'Kibble (Gogh)' --- config.color_scheme = 'Konsolas' --- config.color_scheme = 'LiquidCarbonTransparent' --- config.color_scheme = 'MaterialDark' --- config.color_scheme = 'MaterialDesignColors' --- config.color_scheme = 'Muse (terminal.sexy)' --- config.color_scheme = 'niji' --- config.color_scheme = 'Oceanic Next (Gogh)' --- config.color_scheme = 'Pasque (base16)' -- Purple/Lavendar hues -config.color_scheme = "Pencil Dark (Gogh)" -- ****1/2 --- config.color_scheme = 'PencilDark' --- config.color_scheme = 'Popping and Locking' --- config.color_scheme = 'Rasi (terminal.sexy)' --- config.color_scheme = 'Rezza (terminal.sexy)' --- config.color_scheme = 'Rosé Pine (Gogh)' --- config.color_scheme = 'Rouge 2' --- config.color_scheme = 'Royal' -- ****1/2 --- config.color_scheme = 'Sea Shells (Gogh)' --- config.color_scheme = 'Seti' --- config.color_scheme = 'shades-of-purple' --- config.color_scheme = 'SpaceGray Eighties' --- config.color_scheme = 'Tango (terminal.sexy)' --- config.color_scheme = 'Twilight (dark) (terminal.sexy)' --- config.color_scheme = 'VibrantInk' --- config.color_scheme = 'Vice Alt (base16)' --- config.color_scheme = 'Vice Dark (base16)' - --- config.font = wezterm.font 'CaskaydiaCove Nerd Font Mono Regular' -config.font = wezterm.font_with_fallback({ - "FiraCode Nerd Font Mono", - "FiraCode Nerd Font Mono SemBd", - "FiraCode Nerd Font Mono Ret", - "FiraMono Nerd Font Mono", - "DroidSansM Nerd Font", - "DroidSansMono NF", - "DroidSansMono", - "Consolas", - "Courier New", - "monospace", -}) - -config.window_background_gradient = { - -- Can be "Vertical" or "Horizontal". Specifies the direction - -- in which the color gradient varies. The default is "Horizontal", - -- with the gradient going from left-to-right. - -- Linear and Radial gradients are also supported; see the other - -- examples below - orientation = "Vertical", - - -- Specifies the set of colors that are interpolated in the gradient. - -- Accepts CSS style color specs, from named colors, through rgb - -- strings and more - colors = { - "#0f0c29", - "#302b63", - "#24243e", - }, - - -- Instead of specifying `colors`, you can use one of a number of - -- predefined, preset gradients. - -- A list of presets is shown in a section below. - -- preset = "Warm", - - -- Specifies the interpolation style to be used. - -- "Linear", "Basis" and "CatmullRom" as supported. - -- The default is "Linear". - interpolation = "Linear", - - -- How the colors are blended in the gradient. - -- "Rgb", "LinearRgb", "Hsv" and "Oklab" are supported. - -- The default is "Rgb". - blend = "Rgb", - - -- To avoid vertical color banding for horizontal gradients, the - -- gradient position is randomly shifted by up to the `noise` value - -- for each pixel. - -- Smaller values, or 0, will make bands more prominent. - -- The default value is 64 which gives decent looking results - -- on a retina macbook pro display. - -- noise = 64, - - -- By default, the gradient smoothly transitions between the colors. - -- You can adjust the sharpness by specifying the segment_size and - -- segment_smoothness parameters. - -- segment_size configures how many segments are present. - -- segment_smoothness is how hard the edge is; 0.0 is a hard edge, - -- 1.0 is a soft edge. - - -- segment_size = 11, - -- segment_smoothness = 0.0, -} -config.window_background_gradient = null -config.prefer_to_spawn_tabs = true - -wezterm.on("format-tab-title", function(tab, tabs, panes, config, hover, max_width) - local pane_title = tab.active_pane.title - local user_title = tab.active_pane.user_vars.panetitle - - if user_title ~= nil and #user_title > 0 then - pane_title = user_title - end - - return { - -- {Background={Color="blue"}}, - -- {Foreground={Color="white"}}, - { Text = " " .. pane_title .. " " }, - } -end) - --- # First and only argument is the desired term title --- function rename_wezterm_title { printf "\x1b]1337;SetUserVar=panetitle=%s\x07" "$(echo -n "$*" | base64)"; }; rename_wezterm_title Serial:$(hostname) - --- wezterm.on("merge_all_windows", function(window, pane) --- local workspace = wezterm.mux.get_active_workspace() --- local all_windows = wezterm.mux.all_windows() - --- -- Find the first window in the workspace to move all tabs into --- local target_window = nil --- for _, win in ipairs(all_windows) do --- if win:get_workspace() == workspace then --- target_window = win --- break --- end --- end - --- if not target_window then return end - --- -- Move all tabs from other windows into target_window --- for _, win in ipairs(all_windows) do --- if win ~= target_window and win:get_workspace() == workspace then --- for _, tab in ipairs(win:tabs()) do --- tab:move_to_window(target_window) --- end --- -- Close the now empty window --- win:perform_action(wezterm.action.CloseCurrentPane { confirm = false }, win:active_pane()) --- end --- end --- end) - -config.disable_default_key_bindings = true - -config.keys = { --- { key = 'Tab', mods = 'CTRL', action = act.ActivateTabRelative(1) }, --- { key = 'Tab', mods = 'SHIFT|CTRL', action = act.ActivateTabRelative(-1) }, --- { key = 'Enter', mods = 'ALT', action = act.ToggleFullScreen }, --- { key = '!', mods = 'CTRL', action = act.ActivateTab(0) }, --- { key = '!', mods = 'SHIFT|CTRL', action = act.ActivateTab(0) }, --- { key = '\"', mods = 'ALT|CTRL', action = act.SplitVertical{ domain = 'CurrentPaneDomain' } }, --- { key = '\"', mods = 'SHIFT|ALT|CTRL', action = act.SplitVertical{ domain = 'CurrentPaneDomain' } }, --- { key = '#', mods = 'CTRL', action = act.ActivateTab(2) }, --- { key = '#', mods = 'SHIFT|CTRL', action = act.ActivateTab(2) }, --- { key = '$', mods = 'CTRL', action = act.ActivateTab(3) }, --- { key = '$', mods = 'SHIFT|CTRL', action = act.ActivateTab(3) }, --- { key = '%', mods = 'CTRL', action = act.ActivateTab(4) }, --- { key = '%', mods = 'SHIFT|CTRL', action = act.ActivateTab(4) }, --- { key = '%', mods = 'ALT|CTRL', action = act.SplitHorizontal{ domain = 'CurrentPaneDomain' } }, --- { key = '%', mods = 'SHIFT|ALT|CTRL', action = act.SplitHorizontal{ domain = 'CurrentPaneDomain' } }, --- { key = '&', mods = 'CTRL', action = act.ActivateTab(6) }, --- { key = '&', mods = 'SHIFT|CTRL', action = act.ActivateTab(6) }, --- { key = '\'', mods = 'SHIFT|ALT|CTRL', action = act.SplitVertical{ domain = 'CurrentPaneDomain' } }, --- { key = '(', mods = 'CTRL', action = act.ActivateTab(-1) }, --- { key = '(', mods = 'SHIFT|CTRL', action = act.ActivateTab(-1) }, --- { key = ')', mods = 'CTRL', action = act.ResetFontSize }, --- { key = ')', mods = 'SHIFT|CTRL', action = act.ResetFontSize }, --- { key = '*', mods = 'CTRL', action = act.ActivateTab(7) }, --- { key = '*', mods = 'SHIFT|CTRL', action = act.ActivateTab(7) }, --- { key = '+', mods = 'CTRL', action = act.IncreaseFontSize }, --- { key = '+', mods = 'SHIFT|CTRL', action = act.IncreaseFontSize }, --- { key = '-', mods = 'CTRL', action = act.DecreaseFontSize }, --- { key = '-', mods = 'SHIFT|CTRL', action = act.DecreaseFontSize }, --- { key = '-', mods = 'SUPER', action = act.DecreaseFontSize }, --- { key = '0', mods = 'CTRL', action = act.ResetFontSize }, --- { key = '0', mods = 'SHIFT|CTRL', action = act.ResetFontSize }, --- { key = '0', mods = 'SUPER', action = act.ResetFontSize }, --- { key = '1', mods = 'SHIFT|CTRL', action = act.ActivateTab(0) }, --- { key = '1', mods = 'SUPER', action = act.ActivateTab(0) }, --- { key = '2', mods = 'SHIFT|CTRL', action = act.ActivateTab(1) }, --- { key = '2', mods = 'SUPER', action = act.ActivateTab(1) }, --- { key = '3', mods = 'SHIFT|CTRL', action = act.ActivateTab(2) }, --- { key = '3', mods = 'SUPER', action = act.ActivateTab(2) }, --- { key = '4', mods = 'SHIFT|CTRL', action = act.ActivateTab(3) }, --- { key = '4', mods = 'SUPER', action = act.ActivateTab(3) }, --- { key = '5', mods = 'SHIFT|CTRL', action = act.ActivateTab(4) }, --- { key = '5', mods = 'SHIFT|ALT|CTRL', action = act.SplitHorizontal{ domain = 'CurrentPaneDomain' } }, --- { key = '5', mods = 'SUPER', action = act.ActivateTab(4) }, --- { key = '6', mods = 'SHIFT|CTRL', action = act.ActivateTab(5) }, --- { key = '6', mods = 'SUPER', action = act.ActivateTab(5) }, --- { key = '7', mods = 'SHIFT|CTRL', action = act.ActivateTab(6) }, --- { key = '7', mods = 'SUPER', action = act.ActivateTab(6) }, --- { key = '8', mods = 'SHIFT|CTRL', action = act.ActivateTab(7) }, --- { key = '8', mods = 'SUPER', action = act.ActivateTab(7) }, --- { key = '9', mods = 'SHIFT|CTRL', action = act.ActivateTab(-1) }, --- { key = '9', mods = 'SUPER', action = act.ActivateTab(-1) }, --- { key = '=', mods = 'CTRL', action = act.IncreaseFontSize }, --- { key = '=', mods = 'SHIFT|CTRL', action = act.IncreaseFontSize }, --- { key = '=', mods = 'SUPER', action = act.IncreaseFontSize }, --- { key = '@', mods = 'CTRL', action = act.ActivateTab(1) }, --- { key = '@', mods = 'SHIFT|CTRL', action = act.ActivateTab(1) }, --- { key = 'C', mods = 'CTRL', action = act.CopyTo 'Clipboard' }, --- { key = 'C', mods = 'SHIFT|CTRL', action = act.CopyTo 'Clipboard' }, --- { key = 'F', mods = 'CTRL', action = act.Search 'CurrentSelectionOrEmptyString' }, --- { key = 'F', mods = 'SHIFT|CTRL', action = act.Search 'CurrentSelectionOrEmptyString' }, --- { key = 'H', mods = 'CTRL', action = act.HideApplication }, --- { key = 'H', mods = 'SHIFT|CTRL', action = act.HideApplication }, --- { key = 'K', mods = 'CTRL', action = act.ClearScrollback 'ScrollbackOnly' }, --- { key = 'K', mods = 'SHIFT|CTRL', action = act.ClearScrollback 'ScrollbackOnly' }, --- { key = 'L', mods = 'CTRL', action = act.ShowDebugOverlay }, --- { key = 'L', mods = 'SHIFT|CTRL', action = act.ShowDebugOverlay }, --- { key = 'M', mods = 'CTRL', action = act.Hide }, --- { key = 'M', mods = 'SHIFT|CTRL', action = act.Hide }, --- { key = 'N', mods = 'CTRL', action = act.SpawnWindow }, --- { key = 'N', mods = 'SHIFT|CTRL', action = act.SpawnWindow }, - { key = 'P', mods = 'CTRL', action = act.ActivateCommandPalette }, - { key = 'P', mods = 'SHIFT|CTRL', action = act.ActivateCommandPalette }, --- { key = 'Q', mods = 'CTRL', action = act.QuitApplication }, --- { key = 'Q', mods = 'SHIFT|CTRL', action = act.QuitApplication }, --- { key = 'R', mods = 'CTRL', action = act.ReloadConfiguration }, --- { key = 'R', mods = 'SHIFT|CTRL', action = act.ReloadConfiguration }, - { key = 'T', mods = 'CTRL', action = act.ShowLauncher }, - { key = 't', mods = 'CTRL', action = act.ShowLauncher }, - { key = 't', mods = 'SUPER', action = act.ShowLauncher }, - { key = 'T', mods = 'SUPER', action = act.ShowLauncher }, --- { key = 'U', mods = 'CTRL', action = act.CharSelect{ copy_on_select = true, copy_to = 'ClipboardAndPrimarySelection' } }, --- { key = 'U', mods = 'SHIFT|CTRL', action = act.CharSelect{ copy_on_select = true, copy_to = 'ClipboardAndPrimarySelection' } }, --- { key = 'V', mods = 'CTRL', action = act.PasteFrom 'Clipboard' }, --- { key = 'V', mods = 'SHIFT|CTRL', action = act.PasteFrom 'Clipboard' }, --- { key = 'W', mods = 'CTRL', action = act.CloseCurrentTab{ confirm = true } }, --- { key = 'W', mods = 'SHIFT|CTRL', action = act.CloseCurrentTab{ confirm = true } }, --- { key = 'X', mods = 'CTRL', action = act.ActivateCopyMode }, --- { key = 'X', mods = 'SHIFT|CTRL', action = act.ActivateCopyMode }, --- { key = 'Z', mods = 'CTRL', action = act.TogglePaneZoomState }, --- { key = 'Z', mods = 'SHIFT|CTRL', action = act.TogglePaneZoomState }, --- { key = '[', mods = 'SHIFT|SUPER', action = act.ActivateTabRelative(-1) }, --- { key = ']', mods = 'SHIFT|SUPER', action = act.ActivateTabRelative(1) }, --- { key = '^', mods = 'CTRL', action = act.ActivateTab(5) }, --- { key = '^', mods = 'SHIFT|CTRL', action = act.ActivateTab(5) }, --- { key = '_', mods = 'CTRL', action = act.DecreaseFontSize }, --- { key = '_', mods = 'SHIFT|CTRL', action = act.DecreaseFontSize }, --- { key = 'c', mods = 'SHIFT|CTRL', action = act.CopyTo 'Clipboard' }, --- { key = 'c', mods = 'SUPER', action = act.CopyTo 'Clipboard' }, --- { key = 'f', mods = 'SHIFT|CTRL', action = act.Search 'CurrentSelectionOrEmptyString' }, --- { key = 'f', mods = 'SUPER', action = act.Search 'CurrentSelectionOrEmptyString' }, --- { key = 'h', mods = 'SHIFT|CTRL', action = act.HideApplication }, --- { key = 'h', mods = 'SUPER', action = act.HideApplication }, --- { key = 'k', mods = 'SHIFT|CTRL', action = act.ClearScrollback 'ScrollbackOnly' }, --- { key = 'k', mods = 'SUPER', action = act.ClearScrollback 'ScrollbackOnly' }, --- { key = 'l', mods = 'SHIFT|CTRL', action = act.ShowDebugOverlay }, --- { key = 'm', mods = 'SHIFT|CTRL', action = act.Hide }, --- { key = 'm', mods = 'SUPER', action = act.Hide }, --- { key = 'n', mods = 'SHIFT|CTRL', action = act.SpawnWindow }, --- { key = 'n', mods = 'SUPER', action = act.SpawnWindow }, - { key = 'p', mods = 'SHIFT|CTRL', action = act.ActivateCommandPalette }, --- { key = 'q', mods = 'SHIFT|CTRL', action = act.QuitApplication }, --- { key = 'q', mods = 'SUPER', action = act.QuitApplication }, --- { key = 'r', mods = 'SHIFT|CTRL', action = act.ReloadConfiguration }, --- { key = 'r', mods = 'SUPER', action = act.ReloadConfiguration }, --- { key = 't', mods = 'SUPER', action = act.SpawnTab 'CurrentPaneDomain' }, --- { key = 'u', mods = 'SHIFT|CTRL', action = act.CharSelect{ copy_on_select = true, copy_to = 'ClipboardAndPrimarySelection' } }, --- { key = 'v', mods = 'SHIFT|CTRL', action = act.PasteFrom 'Clipboard' }, --- { key = 'v', mods = 'SUPER', action = act.PasteFrom 'Clipboard' }, --- { key = 'w', mods = 'SHIFT|CTRL', action = act.CloseCurrentTab{ confirm = true } }, --- { key = 'w', mods = 'SUPER', action = act.CloseCurrentTab{ confirm = true } }, --- { key = 'x', mods = 'SHIFT|CTRL', action = act.ActivateCopyMode }, --- { key = 'z', mods = 'SHIFT|CTRL', action = act.TogglePaneZoomState }, --- { key = '{', mods = 'SUPER', action = act.ActivateTabRelative(-1) }, --- { key = '{', mods = 'SHIFT|SUPER', action = act.ActivateTabRelative(-1) }, --- { key = '}', mods = 'SUPER', action = act.ActivateTabRelative(1) }, --- { key = '}', mods = 'SHIFT|SUPER', action = act.ActivateTabRelative(1) }, --- { key = 'phys:Space', mods = 'SHIFT|CTRL', action = act.QuickSelect }, --- { key = 'PageUp', mods = 'SHIFT', action = act.ScrollByPage(-1) }, --- { key = 'PageUp', mods = 'CTRL', action = act.ActivateTabRelative(-1) }, --- { key = 'PageUp', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(-1) }, --- { key = 'PageDown', mods = 'SHIFT', action = act.ScrollByPage(1) }, --- { key = 'PageDown', mods = 'CTRL', action = act.ActivateTabRelative(1) }, --- { key = 'PageDown', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(1) }, --- { key = 'LeftArrow', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Left' }, --- { key = 'LeftArrow', mods = 'SHIFT|ALT|CTRL', action = act.AdjustPaneSize{ 'Left', 1 } }, --- { key = 'RightArrow', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Right' }, --- { key = 'RightArrow', mods = 'SHIFT|ALT|CTRL', action = act.AdjustPaneSize{ 'Right', 1 } }, --- { key = 'UpArrow', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Up' }, --- { key = 'UpArrow', mods = 'SHIFT|ALT|CTRL', action = act.AdjustPaneSize{ 'Up', 1 } }, --- { key = 'DownArrow', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Down' }, --- { key = 'DownArrow', mods = 'SHIFT|ALT|CTRL', action = act.AdjustPaneSize{ 'Down', 1 } }, - { key = 'Copy', mods = 'NONE', action = act.CopyTo 'Clipboard' }, - { key = 'Paste', mods = 'NONE', action = act.PasteFrom 'Clipboard' }, - } - -config.key_tables = { - copy_mode = { - { key = 'Tab', mods = 'NONE', action = act.CopyMode 'MoveForwardWord' }, - { key = 'Tab', mods = 'SHIFT', action = act.CopyMode 'MoveBackwardWord' }, - { key = 'Enter', mods = 'NONE', action = act.CopyMode 'MoveToStartOfNextLine' }, - { key = 'Escape', mods = 'NONE', action = act.CopyMode 'Close' }, - { key = 'Space', mods = 'NONE', action = act.CopyMode{ SetSelectionMode = 'Cell' } }, - { key = '$', mods = 'NONE', action = act.CopyMode 'MoveToEndOfLineContent' }, - { key = '$', mods = 'SHIFT', action = act.CopyMode 'MoveToEndOfLineContent' }, - { key = ',', mods = 'NONE', action = act.CopyMode 'JumpReverse' }, - { key = '0', mods = 'NONE', action = act.CopyMode 'MoveToStartOfLine' }, - { key = ';', mods = 'NONE', action = act.CopyMode 'JumpAgain' }, - { key = 'F', mods = 'NONE', action = act.CopyMode{ JumpBackward = { prev_char = false } } }, - { key = 'F', mods = 'SHIFT', action = act.CopyMode{ JumpBackward = { prev_char = false } } }, - { key = 'G', mods = 'NONE', action = act.CopyMode 'MoveToScrollbackBottom' }, - { key = 'G', mods = 'SHIFT', action = act.CopyMode 'MoveToScrollbackBottom' }, - { key = 'H', mods = 'NONE', action = act.CopyMode 'MoveToViewportTop' }, - { key = 'H', mods = 'SHIFT', action = act.CopyMode 'MoveToViewportTop' }, - { key = 'L', mods = 'NONE', action = act.CopyMode 'MoveToViewportBottom' }, - { key = 'L', mods = 'SHIFT', action = act.CopyMode 'MoveToViewportBottom' }, - { key = 'M', mods = 'NONE', action = act.CopyMode 'MoveToViewportMiddle' }, - { key = 'M', mods = 'SHIFT', action = act.CopyMode 'MoveToViewportMiddle' }, - { key = 'O', mods = 'NONE', action = act.CopyMode 'MoveToSelectionOtherEndHoriz' }, - { key = 'O', mods = 'SHIFT', action = act.CopyMode 'MoveToSelectionOtherEndHoriz' }, - { key = 'T', mods = 'NONE', action = act.CopyMode{ JumpBackward = { prev_char = true } } }, - { key = 'T', mods = 'SHIFT', action = act.CopyMode{ JumpBackward = { prev_char = true } } }, - { key = 'V', mods = 'NONE', action = act.CopyMode{ SetSelectionMode = 'Line' } }, - { key = 'V', mods = 'SHIFT', action = act.CopyMode{ SetSelectionMode = 'Line' } }, - { key = '^', mods = 'NONE', action = act.CopyMode 'MoveToStartOfLineContent' }, - { key = '^', mods = 'SHIFT', action = act.CopyMode 'MoveToStartOfLineContent' }, - { key = 'b', mods = 'NONE', action = act.CopyMode 'MoveBackwardWord' }, - { key = 'b', mods = 'ALT', action = act.CopyMode 'MoveBackwardWord' }, - { key = 'b', mods = 'CTRL', action = act.CopyMode 'PageUp' }, - { key = 'c', mods = 'CTRL', action = act.CopyMode 'Close' }, - { key = 'd', mods = 'CTRL', action = act.CopyMode{ MoveByPage = (0.5) } }, - { key = 'e', mods = 'NONE', action = act.CopyMode 'MoveForwardWordEnd' }, - { key = 'f', mods = 'NONE', action = act.CopyMode{ JumpForward = { prev_char = false } } }, - { key = 'f', mods = 'ALT', action = act.CopyMode 'MoveForwardWord' }, - { key = 'f', mods = 'CTRL', action = act.CopyMode 'PageDown' }, - { key = 'g', mods = 'NONE', action = act.CopyMode 'MoveToScrollbackTop' }, - { key = 'g', mods = 'CTRL', action = act.CopyMode 'Close' }, - { key = 'h', mods = 'NONE', action = act.CopyMode 'MoveLeft' }, - { key = 'j', mods = 'NONE', action = act.CopyMode 'MoveDown' }, - { key = 'k', mods = 'NONE', action = act.CopyMode 'MoveUp' }, - { key = 'l', mods = 'NONE', action = act.CopyMode 'MoveRight' }, - { key = 'm', mods = 'ALT', action = act.CopyMode 'MoveToStartOfLineContent' }, - { key = 'o', mods = 'NONE', action = act.CopyMode 'MoveToSelectionOtherEnd' }, - { key = 'q', mods = 'NONE', action = act.CopyMode 'Close' }, - { key = 't', mods = 'NONE', action = act.CopyMode{ JumpForward = { prev_char = true } } }, - { key = 'u', mods = 'CTRL', action = act.CopyMode{ MoveByPage = (-0.5) } }, - { key = 'v', mods = 'NONE', action = act.CopyMode{ SetSelectionMode = 'Cell' } }, - { key = 'v', mods = 'CTRL', action = act.CopyMode{ SetSelectionMode = 'Block' } }, - { key = 'w', mods = 'NONE', action = act.CopyMode 'MoveForwardWord' }, - { key = 'y', mods = 'NONE', action = act.Multiple{ { CopyTo = 'ClipboardAndPrimarySelection' }, { CopyMode = 'Close' } } }, - { key = 'PageUp', mods = 'NONE', action = act.CopyMode 'PageUp' }, - { key = 'PageDown', mods = 'NONE', action = act.CopyMode 'PageDown' }, - { key = 'End', mods = 'NONE', action = act.CopyMode 'MoveToEndOfLineContent' }, - { key = 'Home', mods = 'NONE', action = act.CopyMode 'MoveToStartOfLine' }, - { key = 'LeftArrow', mods = 'NONE', action = act.CopyMode 'MoveLeft' }, - { key = 'LeftArrow', mods = 'ALT', action = act.CopyMode 'MoveBackwardWord' }, - { key = 'RightArrow', mods = 'NONE', action = act.CopyMode 'MoveRight' }, - { key = 'RightArrow', mods = 'ALT', action = act.CopyMode 'MoveForwardWord' }, - { key = 'UpArrow', mods = 'NONE', action = act.CopyMode 'MoveUp' }, - { key = 'DownArrow', mods = 'NONE', action = act.CopyMode 'MoveDown' }, - }, - - search_mode = { - { key = 'Enter', mods = 'NONE', action = act.CopyMode 'PriorMatch' }, - { key = 'Escape', mods = 'NONE', action = act.CopyMode 'Close' }, - { key = 'n', mods = 'CTRL', action = act.CopyMode 'NextMatch' }, - { key = 'p', mods = 'CTRL', action = act.CopyMode 'PriorMatch' }, - { key = 'r', mods = 'CTRL', action = act.CopyMode 'CycleMatchType' }, - { key = 'u', mods = 'CTRL', action = act.CopyMode 'ClearPattern' }, - { key = 'PageUp', mods = 'NONE', action = act.CopyMode 'PriorMatchPage' }, - { key = 'PageDown', mods = 'NONE', action = act.CopyMode 'NextMatchPage' }, - { key = 'UpArrow', mods = 'NONE', action = act.CopyMode 'PriorMatch' }, - { key = 'DownArrow', mods = 'NONE', action = act.CopyMode 'NextMatch' }, - }, - -} - --- { key = ',', mods = 'CMD', action = act.SpawnCommandInNewTab { --- cwd = os.getenv('WEZTERM_CONFIG_DIR'), --- set_environment_variables = { --- TERM = 'screen-256color', --- }, --- args = { --- 'code', --- os.getenv('WEZTERM_CONFIG_FILE'), --- }, --- }, --- }, --- { key = 'R', mods = 'CMD|SHIFT', action = act.PromptInputLine { --- description = 'Enter new name for tab', --- action = wezterm.action_callback(function(window, _, line) --- -- line will be `nil` if they hit escape without entering anything --- -- An empty string if they just hit enter --- -- Or the actual line of text they wrote --- if line then --- window:active_tab():set_title(line) --- end --- end), --- }, --- }, --- -- other keys --- -- { key = "n", mods = "CTRL", action = act.SpawnCommandInNewTab({ --- -- args = {"code ."} --- -- }) --- -- }, --- } - - --- and finally, return the configuration to wezterm -return config diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_zza_atuin.env b/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_zza_atuin.env deleted file mode 100644 index f649b24..0000000 --- a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_zza_atuin.env +++ /dev/null @@ -1 +0,0 @@ -2025-04-15T12-04:00 diff --git a/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_zzz_fzf.env.off b/chezmoi.roots/_src.posix/private_dot_config/sz.env/remove_zzz_fzf.env.off deleted file mode 100644 index e69de29..0000000 diff --git a/chezmoi.roots/_src.posix/private_dot_config/wezterm/wezterm.lua.tmpl b/chezmoi.roots/_src.posix/private_dot_config/wezterm/wezterm.lua.tmpl deleted file mode 120000 index 8293cd6..0000000 --- a/chezmoi.roots/_src.posix/private_dot_config/wezterm/wezterm.lua.tmpl +++ /dev/null @@ -1 +0,0 @@ -../../../_src.all/private_dot_config/wezterm/wezterm.lua.tmpl \ No newline at end of file diff --git a/chezmoi.roots/symclone.sh b/symclone.sh similarity index 100% rename from chezmoi.roots/symclone.sh rename to symclone.sh