From 5e26df3f9bf2d85d160f14108d23f88e65095fe3 Mon Sep 17 00:00:00 2001 From: "GSz (@VAST)" Date: Thu, 20 Feb 2025 22:24:38 -0500 Subject: [PATCH 01/15] Introducing .init.me.sh for multi-machine-architecture support --- .chezmoi.toml.tmpl | 24 +++++++++++++++++++ .chezmoiignore | 7 ++++++ .chezmoiscripts/run_init.sh.tmpl | 22 +++++++++++++++++ .gitignore | 3 +++ .init.me.sh | 6 +++++ _home.macos/.chezmoi.toml.tmpl | 3 +++ .../.chezmoiscripts/run_once_init.sh.tmpl | 3 +++ _home.macos/dot_zshrc | 1 + _home.macos/private_dot_config/sz.env | 1 + _home/.chezmoiscripts/.keep | 0 _home/.chezmoiscripts/run_once_init.sh.tmpl | 3 +++ base.chezmoiroot.linux | 1 + base.chezmoiroot.macos | 1 + base.chezmoiroot.macos.laptop | 1 + .chezmoiroot => base.chezmoiroot.posix | 0 15 files changed, 76 insertions(+) create mode 100644 .chezmoi.toml.tmpl create mode 100644 .chezmoiignore create mode 100755 .chezmoiscripts/run_init.sh.tmpl create mode 100644 .gitignore create mode 100755 .init.me.sh create mode 100644 _home.macos/.chezmoi.toml.tmpl create mode 100755 _home.macos/.chezmoiscripts/run_once_init.sh.tmpl create mode 120000 _home.macos/dot_zshrc create mode 120000 _home.macos/private_dot_config/sz.env delete mode 100644 _home/.chezmoiscripts/.keep create mode 100755 _home/.chezmoiscripts/run_once_init.sh.tmpl create mode 120000 base.chezmoiroot.linux create mode 100644 base.chezmoiroot.macos create mode 120000 base.chezmoiroot.macos.laptop rename .chezmoiroot => base.chezmoiroot.posix (100%) diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl new file mode 100644 index 0000000..741056f --- /dev/null +++ b/.chezmoi.toml.tmpl @@ -0,0 +1,24 @@ +# This .chezmoi.toml file is used once only +# It collects information about the system in order to determine +# which of the _home.* dirs will be set as the .chezmoiroot +# +{{- $chassisType := "desktop" }} +{{- $sysType := "posix" }} +{{- if eq .chezmoi.os "darwin" }} +{{- $sysType = "macos" }} +{{- if contains "BatteryData" (output "ioreg" "-c" "AppleSmartBattery") }} +{{- $chassisType = "laptop" }} +{{- else }} +{{- $chassisType = "desktop" }} +{{- end }} +{{- else if eq .chezmoi.os "linux" }} +{{- $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }} +{{- else if eq .chezmoi.os "windows" }} +{{- $sysType = "windows" }} +{{- $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 }} + +[scriptEnv] + CZ_CHASSIS="{{- $chassisType }}" + CZ_SYS="{{- $sysType }}" + CZ_OS="{{- .chezmoi.os }}" diff --git a/.chezmoiignore b/.chezmoiignore new file mode 100644 index 0000000..a43e2b3 --- /dev/null +++ b/.chezmoiignore @@ -0,0 +1,7 @@ +# The content at the root of the repo is for initial detection only. +# Thus, only .chezmoitscripts is required, because it will setup the +# correct .chezmoiroot, where the rest of the content resides. +# +* +! .chezmoiscripts/ +! .chezmoiscripts/** diff --git a/.chezmoiscripts/run_init.sh.tmpl b/.chezmoiscripts/run_init.sh.tmpl new file mode 100755 index 0000000..8b93ddc --- /dev/null +++ b/.chezmoiscripts/run_init.sh.tmpl @@ -0,0 +1,22 @@ +#! /usr/bin/env bash + +set -e + +#env | grep -E 'chezmoi|^CZ' +cd "$CHEZMOI_SOURCE_DIR" +CZ_MODEL="$(ioreg -l | grep "product-name" | sed -Ee 's/^.*\<"(.*)\"\>.*$/\1/')" +set | grep '^CZ_' +printf 'System detected as %s/%s, setting up .chezmoiroot and initializing...\n' "$CZ_SYS" "$CZ_CHASSIS" +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 +fi + +# Brute force remove chezmoistate lock and restart init --apply +exec sh -c 'rm ~/.config/chezmoi/chezmoistate.boltdb && chezmoi init --apply' diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f4bb5b --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# .chezmoiroot is generated by .chezmoiscripts/run_onchage_init.sh.tmpl +# during chezmoi init --apply +.chezmoiroot diff --git a/.init.me.sh b/.init.me.sh new file mode 100755 index 0000000..fc85021 --- /dev/null +++ b/.init.me.sh @@ -0,0 +1,6 @@ +#! /usr/bin/env bash + +set -ex + +rm -fR ~/.config/chezmoi ~/.local/share/chezmoi/.chezmoiroot +chezmoi init --apply diff --git a/_home.macos/.chezmoi.toml.tmpl b/_home.macos/.chezmoi.toml.tmpl new file mode 100644 index 0000000..87d7e54 --- /dev/null +++ b/_home.macos/.chezmoi.toml.tmpl @@ -0,0 +1,3 @@ +[Data] + one="One" + diff --git a/_home.macos/.chezmoiscripts/run_once_init.sh.tmpl b/_home.macos/.chezmoiscripts/run_once_init.sh.tmpl new file mode 100755 index 0000000..8f13a6a --- /dev/null +++ b/_home.macos/.chezmoiscripts/run_once_init.sh.tmpl @@ -0,0 +1,3 @@ +#! /usr/bin/env bash + +printf '_home.macos init\n' diff --git a/_home.macos/dot_zshrc b/_home.macos/dot_zshrc new file mode 120000 index 0000000..1a0fdd6 --- /dev/null +++ b/_home.macos/dot_zshrc @@ -0,0 +1 @@ +../_home/dot_zshrc \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env b/_home.macos/private_dot_config/sz.env new file mode 120000 index 0000000..c77a44f --- /dev/null +++ b/_home.macos/private_dot_config/sz.env @@ -0,0 +1 @@ +../../_home/private_dot_config/sz.env \ No newline at end of file diff --git a/_home/.chezmoiscripts/.keep b/_home/.chezmoiscripts/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/_home/.chezmoiscripts/run_once_init.sh.tmpl b/_home/.chezmoiscripts/run_once_init.sh.tmpl new file mode 100755 index 0000000..92cc9ab --- /dev/null +++ b/_home/.chezmoiscripts/run_once_init.sh.tmpl @@ -0,0 +1,3 @@ +#! /usr/bin/env bash + +printf '_home init\s' diff --git a/base.chezmoiroot.linux b/base.chezmoiroot.linux new file mode 120000 index 0000000..1bb9fa1 --- /dev/null +++ b/base.chezmoiroot.linux @@ -0,0 +1 @@ +base.chezmoiroot.posix \ No newline at end of file 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/base.chezmoiroot.macos.laptop b/base.chezmoiroot.macos.laptop new file mode 120000 index 0000000..9db2158 --- /dev/null +++ b/base.chezmoiroot.macos.laptop @@ -0,0 +1 @@ +base.chezmoiroot.macos \ No newline at end of file diff --git a/.chezmoiroot b/base.chezmoiroot.posix similarity index 100% rename from .chezmoiroot rename to base.chezmoiroot.posix From 44b03e8724c80faa6dbc6f76fe00bb8dd53f5912 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Thu, 20 Feb 2025 23:34:24 -0500 Subject: [PATCH 02/15] prepare for symclone. From now on, _src.posix will be the single source of truth. And _home(.*) will symlink into it. --- {_home => _src.posix}/.chezmoi.toml.tmpl | 0 {_home => _src.posix}/.chezmoiexternal.yaml | 0 {_home => _src.posix}/.chezmoiignore | 0 .../.chezmoiscripts/run_once_init.sh.tmpl | 0 {_home => _src.posix}/dot_bashrc | 0 {_home => _src.posix}/dot_gitconfig.tmpl | 0 {_home => _src.posix}/dot_profile | 0 {_home => _src.posix}/dot_zshrc | 0 .../private_dot_config/atuin/config.toml | 0 .../private_dot_config/starship.toml | 0 .../000_stop_on_non_interactive_sessions.env | 0 .../sz.env/ID_truenas_scale.env | 0 .../sz.env/PATH_home_bin.env | 0 .../private_dot_config/sz.env/PATH_node.env | 0 .../sz.env/PATH_truestuff.env | 0 .../sz.env/PATH_zz_cleanup.env | 0 .../sz.env/aaa_zsh_0_perp.env | 0 .../sz.env/aaa_zsh_2_zinit.env | 0 .../sz.env/aaa_zsh_3_completion_system.env | 0 .../private_dot_config/sz.env/aab_zellij.env | 0 .../private_dot_config/sz.env/aliases.env | 0 .../sz.env/bbb_bash_preexec.env | 0 .../private_dot_config/sz.env/bbb_ble.sh.env | 0 .../private_dot_config/sz.env/broot.env | 0 .../sz.env/envman-and-webi.env | 0 .../sz.env/executable__.load.sh | 0 .../private_dot_config/sz.env/fix-kubectl.env | 0 .../private_dot_config/sz.env/fix-nvim.env | 0 .../sz.env/truenas-scale.env | 0 .../private_dot_config/sz.env/zza_atuin.env | 0 .../sz.env/zza_starship.env | 0 .../sz.env/zzz_bash_post.env | 0 .../private_dot_config/sz.env/zzz_chezmoi.env | 0 .../private_dot_config/sz.env/zzz_fzf.env.off | 0 .../bin/executable_get-github-release.sh | 0 .../bin/executable_load-starship | 0 .../bin/executable_load-webi | 0 .../bin/executable_load-zellij | 0 .../bin/executable_szetup-kubectl4k3s | 0 .../bin/executable_update-atuin | 0 .../bin/executable_update-nvim | 0 .../private_dot_local/bin/symlink_nvim | 0 .../private_dot_local/bin/symlink_vi | 0 .../private_dot_local/bin/symlink_vim | 0 .../private_dot_local/bin/symlink_vim.tiny | 0 .../private_dot_local/bin/symlink_vimdiff | 0 symclone.sh | 58 +++++++++++++++++++ 47 files changed, 58 insertions(+) rename {_home => _src.posix}/.chezmoi.toml.tmpl (100%) rename {_home => _src.posix}/.chezmoiexternal.yaml (100%) rename {_home => _src.posix}/.chezmoiignore (100%) rename {_home => _src.posix}/.chezmoiscripts/run_once_init.sh.tmpl (100%) rename {_home => _src.posix}/dot_bashrc (100%) rename {_home => _src.posix}/dot_gitconfig.tmpl (100%) rename {_home => _src.posix}/dot_profile (100%) rename {_home => _src.posix}/dot_zshrc (100%) rename {_home => _src.posix}/private_dot_config/atuin/config.toml (100%) rename {_home => _src.posix}/private_dot_config/starship.toml (100%) rename {_home => _src.posix}/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/ID_truenas_scale.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/PATH_home_bin.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/PATH_node.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/PATH_truestuff.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/PATH_zz_cleanup.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/aaa_zsh_0_perp.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/aaa_zsh_2_zinit.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/aaa_zsh_3_completion_system.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/aab_zellij.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/aliases.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/bbb_bash_preexec.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/bbb_ble.sh.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/broot.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/envman-and-webi.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/executable__.load.sh (100%) rename {_home => _src.posix}/private_dot_config/sz.env/fix-kubectl.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/fix-nvim.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/truenas-scale.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/zza_atuin.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/zza_starship.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/zzz_bash_post.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/zzz_chezmoi.env (100%) rename {_home => _src.posix}/private_dot_config/sz.env/zzz_fzf.env.off (100%) rename {_home => _src.posix}/private_dot_local/bin/executable_get-github-release.sh (100%) rename {_home => _src.posix}/private_dot_local/bin/executable_load-starship (100%) rename {_home => _src.posix}/private_dot_local/bin/executable_load-webi (100%) rename {_home => _src.posix}/private_dot_local/bin/executable_load-zellij (100%) rename {_home => _src.posix}/private_dot_local/bin/executable_szetup-kubectl4k3s (100%) rename {_home => _src.posix}/private_dot_local/bin/executable_update-atuin (100%) rename {_home => _src.posix}/private_dot_local/bin/executable_update-nvim (100%) rename {_home => _src.posix}/private_dot_local/bin/symlink_nvim (100%) rename {_home => _src.posix}/private_dot_local/bin/symlink_vi (100%) rename {_home => _src.posix}/private_dot_local/bin/symlink_vim (100%) rename {_home => _src.posix}/private_dot_local/bin/symlink_vim.tiny (100%) rename {_home => _src.posix}/private_dot_local/bin/symlink_vimdiff (100%) create mode 100755 symclone.sh diff --git a/_home/.chezmoi.toml.tmpl b/_src.posix/.chezmoi.toml.tmpl similarity index 100% rename from _home/.chezmoi.toml.tmpl rename to _src.posix/.chezmoi.toml.tmpl diff --git a/_home/.chezmoiexternal.yaml b/_src.posix/.chezmoiexternal.yaml similarity index 100% rename from _home/.chezmoiexternal.yaml rename to _src.posix/.chezmoiexternal.yaml diff --git a/_home/.chezmoiignore b/_src.posix/.chezmoiignore similarity index 100% rename from _home/.chezmoiignore rename to _src.posix/.chezmoiignore diff --git a/_home/.chezmoiscripts/run_once_init.sh.tmpl b/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl similarity index 100% rename from _home/.chezmoiscripts/run_once_init.sh.tmpl rename to _src.posix/.chezmoiscripts/run_once_init.sh.tmpl diff --git a/_home/dot_bashrc b/_src.posix/dot_bashrc similarity index 100% rename from _home/dot_bashrc rename to _src.posix/dot_bashrc diff --git a/_home/dot_gitconfig.tmpl b/_src.posix/dot_gitconfig.tmpl similarity index 100% rename from _home/dot_gitconfig.tmpl rename to _src.posix/dot_gitconfig.tmpl diff --git a/_home/dot_profile b/_src.posix/dot_profile similarity index 100% rename from _home/dot_profile rename to _src.posix/dot_profile diff --git a/_home/dot_zshrc b/_src.posix/dot_zshrc similarity index 100% rename from _home/dot_zshrc rename to _src.posix/dot_zshrc diff --git a/_home/private_dot_config/atuin/config.toml b/_src.posix/private_dot_config/atuin/config.toml similarity index 100% rename from _home/private_dot_config/atuin/config.toml rename to _src.posix/private_dot_config/atuin/config.toml diff --git a/_home/private_dot_config/starship.toml b/_src.posix/private_dot_config/starship.toml similarity index 100% rename from _home/private_dot_config/starship.toml rename to _src.posix/private_dot_config/starship.toml diff --git a/_home/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env b/_src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env similarity index 100% rename from _home/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env rename to _src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env diff --git a/_home/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 _home/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/_home/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 _home/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/_home/private_dot_config/sz.env/PATH_node.env b/_src.posix/private_dot_config/sz.env/PATH_node.env similarity index 100% rename from _home/private_dot_config/sz.env/PATH_node.env rename to _src.posix/private_dot_config/sz.env/PATH_node.env diff --git a/_home/private_dot_config/sz.env/PATH_truestuff.env b/_src.posix/private_dot_config/sz.env/PATH_truestuff.env similarity index 100% rename from _home/private_dot_config/sz.env/PATH_truestuff.env rename to _src.posix/private_dot_config/sz.env/PATH_truestuff.env diff --git a/_home/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 _home/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/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env b/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env similarity index 100% rename from _home/private_dot_config/sz.env/aaa_zsh_0_perp.env rename to _src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env diff --git a/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env b/_src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env similarity index 100% rename from _home/private_dot_config/sz.env/aaa_zsh_2_zinit.env rename to _src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env diff --git a/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env b/_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env similarity index 100% rename from _home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env rename to _src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env diff --git a/_home/private_dot_config/sz.env/aab_zellij.env b/_src.posix/private_dot_config/sz.env/aab_zellij.env similarity index 100% rename from _home/private_dot_config/sz.env/aab_zellij.env rename to _src.posix/private_dot_config/sz.env/aab_zellij.env diff --git a/_home/private_dot_config/sz.env/aliases.env b/_src.posix/private_dot_config/sz.env/aliases.env similarity index 100% rename from _home/private_dot_config/sz.env/aliases.env rename to _src.posix/private_dot_config/sz.env/aliases.env diff --git a/_home/private_dot_config/sz.env/bbb_bash_preexec.env b/_src.posix/private_dot_config/sz.env/bbb_bash_preexec.env similarity index 100% rename from _home/private_dot_config/sz.env/bbb_bash_preexec.env rename to _src.posix/private_dot_config/sz.env/bbb_bash_preexec.env diff --git a/_home/private_dot_config/sz.env/bbb_ble.sh.env b/_src.posix/private_dot_config/sz.env/bbb_ble.sh.env similarity index 100% rename from _home/private_dot_config/sz.env/bbb_ble.sh.env rename to _src.posix/private_dot_config/sz.env/bbb_ble.sh.env diff --git a/_home/private_dot_config/sz.env/broot.env b/_src.posix/private_dot_config/sz.env/broot.env similarity index 100% rename from _home/private_dot_config/sz.env/broot.env rename to _src.posix/private_dot_config/sz.env/broot.env diff --git a/_home/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 _home/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/_home/private_dot_config/sz.env/executable__.load.sh b/_src.posix/private_dot_config/sz.env/executable__.load.sh similarity index 100% rename from _home/private_dot_config/sz.env/executable__.load.sh rename to _src.posix/private_dot_config/sz.env/executable__.load.sh diff --git a/_home/private_dot_config/sz.env/fix-kubectl.env b/_src.posix/private_dot_config/sz.env/fix-kubectl.env similarity index 100% rename from _home/private_dot_config/sz.env/fix-kubectl.env rename to _src.posix/private_dot_config/sz.env/fix-kubectl.env diff --git a/_home/private_dot_config/sz.env/fix-nvim.env b/_src.posix/private_dot_config/sz.env/fix-nvim.env similarity index 100% rename from _home/private_dot_config/sz.env/fix-nvim.env rename to _src.posix/private_dot_config/sz.env/fix-nvim.env diff --git a/_home/private_dot_config/sz.env/truenas-scale.env b/_src.posix/private_dot_config/sz.env/truenas-scale.env similarity index 100% rename from _home/private_dot_config/sz.env/truenas-scale.env rename to _src.posix/private_dot_config/sz.env/truenas-scale.env diff --git a/_home/private_dot_config/sz.env/zza_atuin.env b/_src.posix/private_dot_config/sz.env/zza_atuin.env similarity index 100% rename from _home/private_dot_config/sz.env/zza_atuin.env rename to _src.posix/private_dot_config/sz.env/zza_atuin.env diff --git a/_home/private_dot_config/sz.env/zza_starship.env b/_src.posix/private_dot_config/sz.env/zza_starship.env similarity index 100% rename from _home/private_dot_config/sz.env/zza_starship.env rename to _src.posix/private_dot_config/sz.env/zza_starship.env diff --git a/_home/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 _home/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/_home/private_dot_config/sz.env/zzz_chezmoi.env b/_src.posix/private_dot_config/sz.env/zzz_chezmoi.env similarity index 100% rename from _home/private_dot_config/sz.env/zzz_chezmoi.env rename to _src.posix/private_dot_config/sz.env/zzz_chezmoi.env diff --git a/_home/private_dot_config/sz.env/zzz_fzf.env.off b/_src.posix/private_dot_config/sz.env/zzz_fzf.env.off similarity index 100% rename from _home/private_dot_config/sz.env/zzz_fzf.env.off rename to _src.posix/private_dot_config/sz.env/zzz_fzf.env.off diff --git a/_home/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 _home/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/_home/private_dot_local/bin/executable_load-starship b/_src.posix/private_dot_local/bin/executable_load-starship similarity index 100% rename from _home/private_dot_local/bin/executable_load-starship rename to _src.posix/private_dot_local/bin/executable_load-starship diff --git a/_home/private_dot_local/bin/executable_load-webi b/_src.posix/private_dot_local/bin/executable_load-webi similarity index 100% rename from _home/private_dot_local/bin/executable_load-webi rename to _src.posix/private_dot_local/bin/executable_load-webi diff --git a/_home/private_dot_local/bin/executable_load-zellij b/_src.posix/private_dot_local/bin/executable_load-zellij similarity index 100% rename from _home/private_dot_local/bin/executable_load-zellij rename to _src.posix/private_dot_local/bin/executable_load-zellij diff --git a/_home/private_dot_local/bin/executable_szetup-kubectl4k3s b/_src.posix/private_dot_local/bin/executable_szetup-kubectl4k3s similarity index 100% rename from _home/private_dot_local/bin/executable_szetup-kubectl4k3s rename to _src.posix/private_dot_local/bin/executable_szetup-kubectl4k3s diff --git a/_home/private_dot_local/bin/executable_update-atuin b/_src.posix/private_dot_local/bin/executable_update-atuin similarity index 100% rename from _home/private_dot_local/bin/executable_update-atuin rename to _src.posix/private_dot_local/bin/executable_update-atuin diff --git a/_home/private_dot_local/bin/executable_update-nvim b/_src.posix/private_dot_local/bin/executable_update-nvim similarity index 100% rename from _home/private_dot_local/bin/executable_update-nvim rename to _src.posix/private_dot_local/bin/executable_update-nvim diff --git a/_home/private_dot_local/bin/symlink_nvim b/_src.posix/private_dot_local/bin/symlink_nvim similarity index 100% rename from _home/private_dot_local/bin/symlink_nvim rename to _src.posix/private_dot_local/bin/symlink_nvim diff --git a/_home/private_dot_local/bin/symlink_vi b/_src.posix/private_dot_local/bin/symlink_vi similarity index 100% rename from _home/private_dot_local/bin/symlink_vi rename to _src.posix/private_dot_local/bin/symlink_vi diff --git a/_home/private_dot_local/bin/symlink_vim b/_src.posix/private_dot_local/bin/symlink_vim similarity index 100% rename from _home/private_dot_local/bin/symlink_vim rename to _src.posix/private_dot_local/bin/symlink_vim diff --git a/_home/private_dot_local/bin/symlink_vim.tiny b/_src.posix/private_dot_local/bin/symlink_vim.tiny similarity index 100% rename from _home/private_dot_local/bin/symlink_vim.tiny rename to _src.posix/private_dot_local/bin/symlink_vim.tiny diff --git a/_home/private_dot_local/bin/symlink_vimdiff b/_src.posix/private_dot_local/bin/symlink_vimdiff similarity index 100% rename from _home/private_dot_local/bin/symlink_vimdiff rename to _src.posix/private_dot_local/bin/symlink_vimdiff diff --git a/symclone.sh b/symclone.sh new file mode 100755 index 0000000..e855fad --- /dev/null +++ b/symclone.sh @@ -0,0 +1,58 @@ +#! /usr/bin/env bash + +set -e + +# Source directory (existing structure with files) +SRC_DIR=_src.posix + +# Target directory (new structure with symlinks) +DEST_DIR="${1:?}" + +# Check if both arguments are provided +if [[ -z "$SRC_DIR" || -z "$DEST_DIR" ]]; then + echo "Usage: $0 " + exit 1 +fi + +# Ensure source directory exists +if [[ ! -d "$SRC_DIR" ]]; then + echo "Error: Source directory '$SRC_DIR' does not exist." + exit 1 +fi + +# Create destination directory if it does not exist +mkdir -p "$DEST_DIR" + +# Find all directories and recreate them in the destination +find "$SRC_DIR" -type d -mindepth 1 | while read -r dir; do + mkdir -p "$DEST_DIR/${dir#$SRC_DIR/}" +done + +# Function to get relative path without realpath or python +relpath() { + local target=$1 + local base=$2 + local target_abs=$(cd "$(dirname "$target")" && pwd)/$(basename "$target") + local base_abs=$(cd "$base" && pwd) + local common_part="$base_abs" + local back="" + + while [[ "${target_abs#$common_part}" == "$target_abs" ]]; do + common_part=$(dirname "$common_part") + back="../$back" + done + + echo "${back}${target_abs#$common_part/}" +} + +# Find all files and create symbolic links in the destination +find "$SRC_DIR" -type f | while read -r file; do + # Determine the relative path for the symlink + target_file="${file#$SRC_DIR/}" + src_relative_path=$(relpath "$file" "$(dirname "$DEST_DIR/$target_file")") + + # Create the symlink with relative path + ln -vs "$src_relative_path" "$DEST_DIR/$target_file" +done + +echo "Symbolic links created successfully in '$DEST_DIR'." From 47f9e8eefbe392dbd46735b68ad2614c960e34d6 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Thu, 20 Feb 2025 23:38:35 -0500 Subject: [PATCH 03/15] Added _home --- _home/.chezmoi.toml.tmpl | 1 + _home/.chezmoiexternal.yaml | 1 + _home/.chezmoiignore | 1 + _home/.chezmoiscripts/run_once_init.sh.tmpl | 1 + _home/dot_bashrc | 1 + _home/dot_gitconfig.tmpl | 1 + _home/dot_profile | 1 + _home/dot_zshrc | 1 + _home/private_dot_config/atuin/config.toml | 1 + _home/private_dot_config/starship.toml | 1 + .../sz.env/000_stop_on_non_interactive_sessions.env | 1 + _home/private_dot_config/sz.env/ID_truenas_scale.env | 1 + _home/private_dot_config/sz.env/PATH_home_bin.env | 1 + _home/private_dot_config/sz.env/PATH_node.env | 1 + _home/private_dot_config/sz.env/PATH_truestuff.env | 1 + _home/private_dot_config/sz.env/PATH_zz_cleanup.env | 1 + _home/private_dot_config/sz.env/aaa_zsh_0_perp.env | 1 + _home/private_dot_config/sz.env/aaa_zsh_2_zinit.env | 1 + _home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env | 1 + _home/private_dot_config/sz.env/aab_zellij.env | 1 + _home/private_dot_config/sz.env/aliases.env | 1 + _home/private_dot_config/sz.env/bbb_bash_preexec.env | 1 + _home/private_dot_config/sz.env/bbb_ble.sh.env | 1 + _home/private_dot_config/sz.env/broot.env | 1 + _home/private_dot_config/sz.env/envman-and-webi.env | 1 + _home/private_dot_config/sz.env/executable__.load.sh | 1 + _home/private_dot_config/sz.env/fix-kubectl.env | 1 + _home/private_dot_config/sz.env/fix-nvim.env | 1 + _home/private_dot_config/sz.env/truenas-scale.env | 1 + _home/private_dot_config/sz.env/zza_atuin.env | 1 + _home/private_dot_config/sz.env/zza_starship.env | 1 + _home/private_dot_config/sz.env/zzz_bash_post.env | 1 + _home/private_dot_config/sz.env/zzz_chezmoi.env | 1 + _home/private_dot_config/sz.env/zzz_fzf.env.off | 1 + _home/private_dot_local/bin/executable_get-github-release.sh | 1 + _home/private_dot_local/bin/executable_load-starship | 1 + _home/private_dot_local/bin/executable_load-webi | 1 + _home/private_dot_local/bin/executable_load-zellij | 1 + _home/private_dot_local/bin/executable_szetup-kubectl4k3s | 1 + _home/private_dot_local/bin/executable_update-atuin | 1 + _home/private_dot_local/bin/executable_update-nvim | 1 + _home/private_dot_local/bin/symlink_nvim | 1 + _home/private_dot_local/bin/symlink_vi | 1 + _home/private_dot_local/bin/symlink_vim | 1 + _home/private_dot_local/bin/symlink_vim.tiny | 1 + _home/private_dot_local/bin/symlink_vimdiff | 1 + 46 files changed, 46 insertions(+) create mode 120000 _home/.chezmoi.toml.tmpl create mode 120000 _home/.chezmoiexternal.yaml create mode 120000 _home/.chezmoiignore create mode 120000 _home/.chezmoiscripts/run_once_init.sh.tmpl create mode 120000 _home/dot_bashrc create mode 120000 _home/dot_gitconfig.tmpl create mode 120000 _home/dot_profile create mode 120000 _home/dot_zshrc create mode 120000 _home/private_dot_config/atuin/config.toml create mode 120000 _home/private_dot_config/starship.toml create mode 120000 _home/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env create mode 120000 _home/private_dot_config/sz.env/ID_truenas_scale.env create mode 120000 _home/private_dot_config/sz.env/PATH_home_bin.env create mode 120000 _home/private_dot_config/sz.env/PATH_node.env create mode 120000 _home/private_dot_config/sz.env/PATH_truestuff.env create mode 120000 _home/private_dot_config/sz.env/PATH_zz_cleanup.env create mode 120000 _home/private_dot_config/sz.env/aaa_zsh_0_perp.env create mode 120000 _home/private_dot_config/sz.env/aaa_zsh_2_zinit.env create mode 120000 _home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env create mode 120000 _home/private_dot_config/sz.env/aab_zellij.env create mode 120000 _home/private_dot_config/sz.env/aliases.env create mode 120000 _home/private_dot_config/sz.env/bbb_bash_preexec.env create mode 120000 _home/private_dot_config/sz.env/bbb_ble.sh.env create mode 120000 _home/private_dot_config/sz.env/broot.env create mode 120000 _home/private_dot_config/sz.env/envman-and-webi.env create mode 120000 _home/private_dot_config/sz.env/executable__.load.sh create mode 120000 _home/private_dot_config/sz.env/fix-kubectl.env create mode 120000 _home/private_dot_config/sz.env/fix-nvim.env create mode 120000 _home/private_dot_config/sz.env/truenas-scale.env create mode 120000 _home/private_dot_config/sz.env/zza_atuin.env create mode 120000 _home/private_dot_config/sz.env/zza_starship.env create mode 120000 _home/private_dot_config/sz.env/zzz_bash_post.env create mode 120000 _home/private_dot_config/sz.env/zzz_chezmoi.env create mode 120000 _home/private_dot_config/sz.env/zzz_fzf.env.off create mode 120000 _home/private_dot_local/bin/executable_get-github-release.sh create mode 120000 _home/private_dot_local/bin/executable_load-starship create mode 120000 _home/private_dot_local/bin/executable_load-webi create mode 120000 _home/private_dot_local/bin/executable_load-zellij create mode 120000 _home/private_dot_local/bin/executable_szetup-kubectl4k3s create mode 120000 _home/private_dot_local/bin/executable_update-atuin create mode 120000 _home/private_dot_local/bin/executable_update-nvim create mode 120000 _home/private_dot_local/bin/symlink_nvim create mode 120000 _home/private_dot_local/bin/symlink_vi create mode 120000 _home/private_dot_local/bin/symlink_vim create mode 120000 _home/private_dot_local/bin/symlink_vim.tiny create mode 120000 _home/private_dot_local/bin/symlink_vimdiff diff --git a/_home/.chezmoi.toml.tmpl b/_home/.chezmoi.toml.tmpl new file mode 120000 index 0000000..7e4fdc7 --- /dev/null +++ b/_home/.chezmoi.toml.tmpl @@ -0,0 +1 @@ +../_src.posix/.chezmoi.toml.tmpl \ No newline at end of file diff --git a/_home/.chezmoiexternal.yaml b/_home/.chezmoiexternal.yaml new file mode 120000 index 0000000..ac9fe87 --- /dev/null +++ b/_home/.chezmoiexternal.yaml @@ -0,0 +1 @@ +../_src.posix/.chezmoiexternal.yaml \ No newline at end of file diff --git a/_home/.chezmoiignore b/_home/.chezmoiignore new file mode 120000 index 0000000..cc506ef --- /dev/null +++ b/_home/.chezmoiignore @@ -0,0 +1 @@ +../_src.posix/.chezmoiignore \ No newline at end of file diff --git a/_home/.chezmoiscripts/run_once_init.sh.tmpl b/_home/.chezmoiscripts/run_once_init.sh.tmpl new file mode 120000 index 0000000..3e5100d --- /dev/null +++ b/_home/.chezmoiscripts/run_once_init.sh.tmpl @@ -0,0 +1 @@ +../../_src.posix/.chezmoiscripts/run_once_init.sh.tmpl \ No newline at end of file diff --git a/_home/dot_bashrc b/_home/dot_bashrc new file mode 120000 index 0000000..0762bfe --- /dev/null +++ b/_home/dot_bashrc @@ -0,0 +1 @@ +../_src.posix/dot_bashrc \ No newline at end of file diff --git a/_home/dot_gitconfig.tmpl b/_home/dot_gitconfig.tmpl new file mode 120000 index 0000000..23d98c5 --- /dev/null +++ b/_home/dot_gitconfig.tmpl @@ -0,0 +1 @@ +../_src.posix/dot_gitconfig.tmpl \ No newline at end of file diff --git a/_home/dot_profile b/_home/dot_profile new file mode 120000 index 0000000..9f6dadf --- /dev/null +++ b/_home/dot_profile @@ -0,0 +1 @@ +../_src.posix/dot_profile \ No newline at end of file diff --git a/_home/dot_zshrc b/_home/dot_zshrc new file mode 120000 index 0000000..784bde6 --- /dev/null +++ b/_home/dot_zshrc @@ -0,0 +1 @@ +../_src.posix/dot_zshrc \ No newline at end of file diff --git a/_home/private_dot_config/atuin/config.toml b/_home/private_dot_config/atuin/config.toml new file mode 120000 index 0000000..768b3d0 --- /dev/null +++ b/_home/private_dot_config/atuin/config.toml @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/atuin/config.toml \ No newline at end of file diff --git a/_home/private_dot_config/starship.toml b/_home/private_dot_config/starship.toml new file mode 120000 index 0000000..074c848 --- /dev/null +++ b/_home/private_dot_config/starship.toml @@ -0,0 +1 @@ +../../_src.posix/private_dot_config/starship.toml \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env b/_home/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env new file mode 120000 index 0000000..117cb13 --- /dev/null +++ b/_home/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/ID_truenas_scale.env b/_home/private_dot_config/sz.env/ID_truenas_scale.env new file mode 120000 index 0000000..9839390 --- /dev/null +++ b/_home/private_dot_config/sz.env/ID_truenas_scale.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/ID_truenas_scale.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/PATH_home_bin.env b/_home/private_dot_config/sz.env/PATH_home_bin.env new file mode 120000 index 0000000..f6f9878 --- /dev/null +++ b/_home/private_dot_config/sz.env/PATH_home_bin.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_home_bin.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/PATH_node.env b/_home/private_dot_config/sz.env/PATH_node.env new file mode 120000 index 0000000..06b67f6 --- /dev/null +++ b/_home/private_dot_config/sz.env/PATH_node.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_node.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/PATH_truestuff.env b/_home/private_dot_config/sz.env/PATH_truestuff.env new file mode 120000 index 0000000..62bc4e1 --- /dev/null +++ b/_home/private_dot_config/sz.env/PATH_truestuff.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_truestuff.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/PATH_zz_cleanup.env b/_home/private_dot_config/sz.env/PATH_zz_cleanup.env new file mode 120000 index 0000000..bd30077 --- /dev/null +++ b/_home/private_dot_config/sz.env/PATH_zz_cleanup.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_zz_cleanup.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env b/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env new file mode 120000 index 0000000..9ad1a34 --- /dev/null +++ b/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env b/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env new file mode 120000 index 0000000..089a0d8 --- /dev/null +++ b/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env b/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env new file mode 120000 index 0000000..dbe81b1 --- /dev/null +++ b/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/aab_zellij.env b/_home/private_dot_config/sz.env/aab_zellij.env new file mode 120000 index 0000000..6472cc8 --- /dev/null +++ b/_home/private_dot_config/sz.env/aab_zellij.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aab_zellij.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/aliases.env b/_home/private_dot_config/sz.env/aliases.env new file mode 120000 index 0000000..1807a3a --- /dev/null +++ b/_home/private_dot_config/sz.env/aliases.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aliases.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/bbb_bash_preexec.env b/_home/private_dot_config/sz.env/bbb_bash_preexec.env new file mode 120000 index 0000000..b13a0db --- /dev/null +++ b/_home/private_dot_config/sz.env/bbb_bash_preexec.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/bbb_bash_preexec.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/bbb_ble.sh.env b/_home/private_dot_config/sz.env/bbb_ble.sh.env new file mode 120000 index 0000000..75fb560 --- /dev/null +++ b/_home/private_dot_config/sz.env/bbb_ble.sh.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/bbb_ble.sh.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/broot.env b/_home/private_dot_config/sz.env/broot.env new file mode 120000 index 0000000..b2316c2 --- /dev/null +++ b/_home/private_dot_config/sz.env/broot.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/broot.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/envman-and-webi.env b/_home/private_dot_config/sz.env/envman-and-webi.env new file mode 120000 index 0000000..bc3184a --- /dev/null +++ b/_home/private_dot_config/sz.env/envman-and-webi.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/envman-and-webi.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/executable__.load.sh b/_home/private_dot_config/sz.env/executable__.load.sh new file mode 120000 index 0000000..7e4dc65 --- /dev/null +++ b/_home/private_dot_config/sz.env/executable__.load.sh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/executable__.load.sh \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/fix-kubectl.env b/_home/private_dot_config/sz.env/fix-kubectl.env new file mode 120000 index 0000000..2f5b699 --- /dev/null +++ b/_home/private_dot_config/sz.env/fix-kubectl.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/fix-kubectl.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/fix-nvim.env b/_home/private_dot_config/sz.env/fix-nvim.env new file mode 120000 index 0000000..4f47730 --- /dev/null +++ b/_home/private_dot_config/sz.env/fix-nvim.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/fix-nvim.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/truenas-scale.env b/_home/private_dot_config/sz.env/truenas-scale.env new file mode 120000 index 0000000..001f9a6 --- /dev/null +++ b/_home/private_dot_config/sz.env/truenas-scale.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/truenas-scale.env \ No newline at end of file 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/_home/private_dot_config/sz.env/zza_starship.env b/_home/private_dot_config/sz.env/zza_starship.env new file mode 120000 index 0000000..2a51f2d --- /dev/null +++ b/_home/private_dot_config/sz.env/zza_starship.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zza_starship.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/zzz_bash_post.env b/_home/private_dot_config/sz.env/zzz_bash_post.env new file mode 120000 index 0000000..227f00e --- /dev/null +++ b/_home/private_dot_config/sz.env/zzz_bash_post.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_bash_post.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/zzz_chezmoi.env b/_home/private_dot_config/sz.env/zzz_chezmoi.env new file mode 120000 index 0000000..fb97cec --- /dev/null +++ b/_home/private_dot_config/sz.env/zzz_chezmoi.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env \ 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/_home/private_dot_local/bin/executable_get-github-release.sh b/_home/private_dot_local/bin/executable_get-github-release.sh new file mode 120000 index 0000000..8166e11 --- /dev/null +++ b/_home/private_dot_local/bin/executable_get-github-release.sh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_get-github-release.sh \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_load-starship b/_home/private_dot_local/bin/executable_load-starship new file mode 120000 index 0000000..22d7305 --- /dev/null +++ b/_home/private_dot_local/bin/executable_load-starship @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_load-starship \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_load-webi b/_home/private_dot_local/bin/executable_load-webi new file mode 120000 index 0000000..7e8ee5b --- /dev/null +++ b/_home/private_dot_local/bin/executable_load-webi @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_load-webi \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_load-zellij b/_home/private_dot_local/bin/executable_load-zellij new file mode 120000 index 0000000..8aae9a8 --- /dev/null +++ b/_home/private_dot_local/bin/executable_load-zellij @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_load-zellij \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_szetup-kubectl4k3s b/_home/private_dot_local/bin/executable_szetup-kubectl4k3s new file mode 120000 index 0000000..e263800 --- /dev/null +++ b/_home/private_dot_local/bin/executable_szetup-kubectl4k3s @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_szetup-kubectl4k3s \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_update-atuin b/_home/private_dot_local/bin/executable_update-atuin new file mode 120000 index 0000000..58200fa --- /dev/null +++ b/_home/private_dot_local/bin/executable_update-atuin @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_update-atuin \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_update-nvim b/_home/private_dot_local/bin/executable_update-nvim new file mode 120000 index 0000000..1e6967f --- /dev/null +++ b/_home/private_dot_local/bin/executable_update-nvim @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_update-nvim \ No newline at end of file diff --git a/_home/private_dot_local/bin/symlink_nvim b/_home/private_dot_local/bin/symlink_nvim new file mode 120000 index 0000000..0c7503f --- /dev/null +++ b/_home/private_dot_local/bin/symlink_nvim @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/symlink_nvim \ No newline at end of file diff --git a/_home/private_dot_local/bin/symlink_vi b/_home/private_dot_local/bin/symlink_vi new file mode 120000 index 0000000..5173085 --- /dev/null +++ b/_home/private_dot_local/bin/symlink_vi @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/symlink_vi \ No newline at end of file diff --git a/_home/private_dot_local/bin/symlink_vim b/_home/private_dot_local/bin/symlink_vim new file mode 120000 index 0000000..eb45531 --- /dev/null +++ b/_home/private_dot_local/bin/symlink_vim @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/symlink_vim \ No newline at end of file diff --git a/_home/private_dot_local/bin/symlink_vim.tiny b/_home/private_dot_local/bin/symlink_vim.tiny new file mode 120000 index 0000000..638793a --- /dev/null +++ b/_home/private_dot_local/bin/symlink_vim.tiny @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/symlink_vim.tiny \ No newline at end of file diff --git a/_home/private_dot_local/bin/symlink_vimdiff b/_home/private_dot_local/bin/symlink_vimdiff new file mode 120000 index 0000000..d1e0ef1 --- /dev/null +++ b/_home/private_dot_local/bin/symlink_vimdiff @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/symlink_vimdiff \ No newline at end of file From 02bfe0d0dd69adb659cc5762691146e30d5d31c8 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Thu, 20 Feb 2025 23:40:55 -0500 Subject: [PATCH 04/15] Added _home.macos --- _home.macos/.chezmoi.toml.tmpl | 4 +--- _home.macos/.chezmoiignore | 1 + _home.macos/dot_bashrc | 1 + _home.macos/dot_gitconfig.tmpl | 1 + _home.macos/dot_profile | 1 + _home.macos/dot_zshrc | 2 +- _home.macos/private_dot_config/atuin/config.toml | 1 + _home.macos/private_dot_config/starship.toml | 1 + _home.macos/private_dot_config/sz.env | 1 - .../sz.env/000_stop_on_non_interactive_sessions.env | 1 + _home.macos/private_dot_config/sz.env/ID_truenas_scale.env | 1 + _home.macos/private_dot_config/sz.env/PATH_home_bin.env | 1 + _home.macos/private_dot_config/sz.env/PATH_node.env | 1 + _home.macos/private_dot_config/sz.env/PATH_truestuff.env | 1 + _home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env | 1 + _home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env | 1 + _home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env | 1 + .../private_dot_config/sz.env/aaa_zsh_3_completion_system.env | 1 + _home.macos/private_dot_config/sz.env/aab_zellij.env | 1 + _home.macos/private_dot_config/sz.env/bbb_bash_preexec.env | 1 + _home.macos/private_dot_config/sz.env/bbb_ble.sh.env | 1 + _home.macos/private_dot_config/sz.env/broot.env | 1 + _home.macos/private_dot_config/sz.env/envman-and-webi.env | 1 + _home.macos/private_dot_config/sz.env/executable__.load.sh | 1 + _home.macos/private_dot_config/sz.env/fix-kubectl.env | 1 + _home.macos/private_dot_config/sz.env/fix-nvim.env | 1 + _home.macos/private_dot_config/sz.env/truenas-scale.env | 1 + _home.macos/private_dot_config/sz.env/zza_atuin.env | 1 + _home.macos/private_dot_config/sz.env/zza_starship.env | 1 + _home.macos/private_dot_config/sz.env/zzz_bash_post.env | 1 + _home.macos/private_dot_config/sz.env/zzz_chezmoi.env | 1 + _home.macos/private_dot_config/sz.env/zzz_fzf.env.off | 1 + .../private_dot_local/bin/executable_get-github-release.sh | 1 + _home.macos/private_dot_local/bin/executable_load-starship | 1 + _home.macos/private_dot_local/bin/executable_load-webi | 1 + _home.macos/private_dot_local/bin/executable_load-zellij | 1 + _home.macos/private_dot_local/bin/executable_update-atuin | 1 + 37 files changed, 36 insertions(+), 5 deletions(-) mode change 100644 => 120000 _home.macos/.chezmoi.toml.tmpl create mode 120000 _home.macos/.chezmoiignore create mode 120000 _home.macos/dot_bashrc create mode 120000 _home.macos/dot_gitconfig.tmpl create mode 120000 _home.macos/dot_profile create mode 120000 _home.macos/private_dot_config/atuin/config.toml create mode 120000 _home.macos/private_dot_config/starship.toml delete mode 120000 _home.macos/private_dot_config/sz.env create mode 120000 _home.macos/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env create mode 120000 _home.macos/private_dot_config/sz.env/ID_truenas_scale.env create mode 120000 _home.macos/private_dot_config/sz.env/PATH_home_bin.env create mode 120000 _home.macos/private_dot_config/sz.env/PATH_node.env create mode 120000 _home.macos/private_dot_config/sz.env/PATH_truestuff.env create mode 120000 _home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env create mode 120000 _home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env create mode 120000 _home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env create mode 120000 _home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env create mode 120000 _home.macos/private_dot_config/sz.env/aab_zellij.env create mode 120000 _home.macos/private_dot_config/sz.env/bbb_bash_preexec.env create mode 120000 _home.macos/private_dot_config/sz.env/bbb_ble.sh.env create mode 120000 _home.macos/private_dot_config/sz.env/broot.env create mode 120000 _home.macos/private_dot_config/sz.env/envman-and-webi.env create mode 120000 _home.macos/private_dot_config/sz.env/executable__.load.sh create mode 120000 _home.macos/private_dot_config/sz.env/fix-kubectl.env create mode 120000 _home.macos/private_dot_config/sz.env/fix-nvim.env create mode 120000 _home.macos/private_dot_config/sz.env/truenas-scale.env create mode 120000 _home.macos/private_dot_config/sz.env/zza_atuin.env create mode 120000 _home.macos/private_dot_config/sz.env/zza_starship.env create mode 120000 _home.macos/private_dot_config/sz.env/zzz_bash_post.env create mode 120000 _home.macos/private_dot_config/sz.env/zzz_chezmoi.env create mode 120000 _home.macos/private_dot_config/sz.env/zzz_fzf.env.off create mode 120000 _home.macos/private_dot_local/bin/executable_get-github-release.sh create mode 120000 _home.macos/private_dot_local/bin/executable_load-starship create mode 120000 _home.macos/private_dot_local/bin/executable_load-webi create mode 120000 _home.macos/private_dot_local/bin/executable_load-zellij create mode 120000 _home.macos/private_dot_local/bin/executable_update-atuin diff --git a/_home.macos/.chezmoi.toml.tmpl b/_home.macos/.chezmoi.toml.tmpl deleted file mode 100644 index 87d7e54..0000000 --- a/_home.macos/.chezmoi.toml.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -[Data] - one="One" - diff --git a/_home.macos/.chezmoi.toml.tmpl b/_home.macos/.chezmoi.toml.tmpl new file mode 120000 index 0000000..7e4fdc7 --- /dev/null +++ b/_home.macos/.chezmoi.toml.tmpl @@ -0,0 +1 @@ +../_src.posix/.chezmoi.toml.tmpl \ No newline at end of file diff --git a/_home.macos/.chezmoiignore b/_home.macos/.chezmoiignore new file mode 120000 index 0000000..cc506ef --- /dev/null +++ b/_home.macos/.chezmoiignore @@ -0,0 +1 @@ +../_src.posix/.chezmoiignore \ No newline at end of file diff --git a/_home.macos/dot_bashrc b/_home.macos/dot_bashrc new file mode 120000 index 0000000..0762bfe --- /dev/null +++ b/_home.macos/dot_bashrc @@ -0,0 +1 @@ +../_src.posix/dot_bashrc \ No newline at end of file diff --git a/_home.macos/dot_gitconfig.tmpl b/_home.macos/dot_gitconfig.tmpl new file mode 120000 index 0000000..23d98c5 --- /dev/null +++ b/_home.macos/dot_gitconfig.tmpl @@ -0,0 +1 @@ +../_src.posix/dot_gitconfig.tmpl \ No newline at end of file diff --git a/_home.macos/dot_profile b/_home.macos/dot_profile new file mode 120000 index 0000000..9f6dadf --- /dev/null +++ b/_home.macos/dot_profile @@ -0,0 +1 @@ +../_src.posix/dot_profile \ No newline at end of file diff --git a/_home.macos/dot_zshrc b/_home.macos/dot_zshrc index 1a0fdd6..784bde6 120000 --- a/_home.macos/dot_zshrc +++ b/_home.macos/dot_zshrc @@ -1 +1 @@ -../_home/dot_zshrc \ No newline at end of file +../_src.posix/dot_zshrc \ No newline at end of file diff --git a/_home.macos/private_dot_config/atuin/config.toml b/_home.macos/private_dot_config/atuin/config.toml new file mode 120000 index 0000000..768b3d0 --- /dev/null +++ b/_home.macos/private_dot_config/atuin/config.toml @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/atuin/config.toml \ No newline at end of file diff --git a/_home.macos/private_dot_config/starship.toml b/_home.macos/private_dot_config/starship.toml new file mode 120000 index 0000000..074c848 --- /dev/null +++ b/_home.macos/private_dot_config/starship.toml @@ -0,0 +1 @@ +../../_src.posix/private_dot_config/starship.toml \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env b/_home.macos/private_dot_config/sz.env deleted file mode 120000 index c77a44f..0000000 --- a/_home.macos/private_dot_config/sz.env +++ /dev/null @@ -1 +0,0 @@ -../../_home/private_dot_config/sz.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env b/_home.macos/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env new file mode 120000 index 0000000..117cb13 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/ID_truenas_scale.env b/_home.macos/private_dot_config/sz.env/ID_truenas_scale.env new file mode 120000 index 0000000..9839390 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/ID_truenas_scale.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/ID_truenas_scale.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/PATH_home_bin.env b/_home.macos/private_dot_config/sz.env/PATH_home_bin.env new file mode 120000 index 0000000..f6f9878 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/PATH_home_bin.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_home_bin.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/PATH_node.env b/_home.macos/private_dot_config/sz.env/PATH_node.env new file mode 120000 index 0000000..06b67f6 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/PATH_node.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_node.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/PATH_truestuff.env b/_home.macos/private_dot_config/sz.env/PATH_truestuff.env new file mode 120000 index 0000000..62bc4e1 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/PATH_truestuff.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_truestuff.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env b/_home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env new file mode 120000 index 0000000..bd30077 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/PATH_zz_cleanup.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/PATH_zz_cleanup.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env b/_home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env new file mode 120000 index 0000000..9ad1a34 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/aaa_zsh_0_perp.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env b/_home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env new file mode 120000 index 0000000..089a0d8 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/aaa_zsh_2_zinit.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env b/_home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env new file mode 120000 index 0000000..dbe81b1 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/aaa_zsh_3_completion_system.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/aab_zellij.env b/_home.macos/private_dot_config/sz.env/aab_zellij.env new file mode 120000 index 0000000..6472cc8 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/aab_zellij.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aab_zellij.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/bbb_bash_preexec.env b/_home.macos/private_dot_config/sz.env/bbb_bash_preexec.env new file mode 120000 index 0000000..b13a0db --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/bbb_bash_preexec.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/bbb_bash_preexec.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/bbb_ble.sh.env b/_home.macos/private_dot_config/sz.env/bbb_ble.sh.env new file mode 120000 index 0000000..75fb560 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/bbb_ble.sh.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/bbb_ble.sh.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/broot.env b/_home.macos/private_dot_config/sz.env/broot.env new file mode 120000 index 0000000..b2316c2 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/broot.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/broot.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/envman-and-webi.env b/_home.macos/private_dot_config/sz.env/envman-and-webi.env new file mode 120000 index 0000000..bc3184a --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/envman-and-webi.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/envman-and-webi.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/executable__.load.sh b/_home.macos/private_dot_config/sz.env/executable__.load.sh new file mode 120000 index 0000000..7e4dc65 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/executable__.load.sh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/executable__.load.sh \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/fix-kubectl.env b/_home.macos/private_dot_config/sz.env/fix-kubectl.env new file mode 120000 index 0000000..2f5b699 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/fix-kubectl.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/fix-kubectl.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/fix-nvim.env b/_home.macos/private_dot_config/sz.env/fix-nvim.env new file mode 120000 index 0000000..4f47730 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/fix-nvim.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/fix-nvim.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/truenas-scale.env b/_home.macos/private_dot_config/sz.env/truenas-scale.env new file mode 120000 index 0000000..001f9a6 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/truenas-scale.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/truenas-scale.env \ No newline at end of file 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/_home.macos/private_dot_config/sz.env/zza_starship.env b/_home.macos/private_dot_config/sz.env/zza_starship.env new file mode 120000 index 0000000..2a51f2d --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/zza_starship.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zza_starship.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/zzz_bash_post.env b/_home.macos/private_dot_config/sz.env/zzz_bash_post.env new file mode 120000 index 0000000..227f00e --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/zzz_bash_post.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_bash_post.env \ No newline at end of file diff --git a/_home.macos/private_dot_config/sz.env/zzz_chezmoi.env b/_home.macos/private_dot_config/sz.env/zzz_chezmoi.env new file mode 120000 index 0000000..fb97cec --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/zzz_chezmoi.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env \ 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/_home.macos/private_dot_local/bin/executable_get-github-release.sh b/_home.macos/private_dot_local/bin/executable_get-github-release.sh new file mode 120000 index 0000000..8166e11 --- /dev/null +++ b/_home.macos/private_dot_local/bin/executable_get-github-release.sh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_get-github-release.sh \ No newline at end of file diff --git a/_home.macos/private_dot_local/bin/executable_load-starship b/_home.macos/private_dot_local/bin/executable_load-starship new file mode 120000 index 0000000..22d7305 --- /dev/null +++ b/_home.macos/private_dot_local/bin/executable_load-starship @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_load-starship \ No newline at end of file diff --git a/_home.macos/private_dot_local/bin/executable_load-webi b/_home.macos/private_dot_local/bin/executable_load-webi new file mode 120000 index 0000000..7e8ee5b --- /dev/null +++ b/_home.macos/private_dot_local/bin/executable_load-webi @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_load-webi \ No newline at end of file diff --git a/_home.macos/private_dot_local/bin/executable_load-zellij b/_home.macos/private_dot_local/bin/executable_load-zellij new file mode 120000 index 0000000..8aae9a8 --- /dev/null +++ b/_home.macos/private_dot_local/bin/executable_load-zellij @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_load-zellij \ No newline at end of file diff --git a/_home.macos/private_dot_local/bin/executable_update-atuin b/_home.macos/private_dot_local/bin/executable_update-atuin new file mode 120000 index 0000000..58200fa --- /dev/null +++ b/_home.macos/private_dot_local/bin/executable_update-atuin @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_update-atuin \ No newline at end of file From 2e17bae9d0001c8e7776c9dd5afa7d3251439a0c Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Thu, 20 Feb 2025 23:41:12 -0500 Subject: [PATCH 05/15] Modified _home.macos --- _home.macos/private_dot_config/sz.env/aliases.macos.env | 9 +++++++++ _home.macos/private_dot_config/sz.env/remove_aliases.env | 0 2 files changed, 9 insertions(+) create mode 100644 _home.macos/private_dot_config/sz.env/aliases.macos.env create mode 100644 _home.macos/private_dot_config/sz.env/remove_aliases.env 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 100644 index 0000000..1fcbe78 --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/aliases.macos.env @@ -0,0 +1,9 @@ +#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' + +alias l='ls -lahF --color=auto ' +alias lu='l -U ' +alias lold='l -t ' +alias lnew='l -tr ' +alias ll='l -A' + +alias sudo='sudo ' diff --git a/_home.macos/private_dot_config/sz.env/remove_aliases.env b/_home.macos/private_dot_config/sz.env/remove_aliases.env new file mode 100644 index 0000000..e69de29 From bea637a7a795415a6fdabe04fd0c1f842eb5a256 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Thu, 20 Feb 2025 23:58:15 -0500 Subject: [PATCH 06/15] separate chezmoiexternals for macos and posix (for now) --- _home.macos/.chezmoiexternal.yaml | 105 ++++++++++++++++++++++++++++++ _src.posix/.chezmoiexternal.yaml | 24 +++++-- 2 files changed, 122 insertions(+), 7 deletions(-) create mode 100644 _home.macos/.chezmoiexternal.yaml diff --git a/_home.macos/.chezmoiexternal.yaml b/_home.macos/.chezmoiexternal.yaml new file mode 100644 index 0000000..1d84c22 --- /dev/null +++ b/_home.macos/.chezmoiexternal.yaml @@ -0,0 +1,105 @@ +# https://www.chezmoi.io/reference/special-files-and-directories/chezmoiexternal-format/ +# +# The externals are checked based on the refreshPeriod whenever an `apply` (or `update`) operations run +# +# The simplest form to update all externals: +# ```sh +# chezmoi apply --include externals +# ``` +# +# Variable Type Default Description +# type string none External type (file, archive, archive-file, or git-repo) +# url string none URL +# refreshPeriod duration 0 Refresh period (Examples: one day (24h), one week (168h), or four weeks (672h)) +# executable bool false Add executable_ attribute to file +# path string none Path to file in archive + +{{ $defaultRefresh := "168h" -}} +{{- $externals := dict -}} + +{{ $myArch := "aarch64-apple-darwin" }} + +{{- with $repo := "zellij-org/zellij" -}} +{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} +{{- $_ := set $externals ".cache/chezmoi/tmp/zellij" (dict + "type" "archive-file" + "url" (printf "https://github.com/%s/releases/download/%s/zellij-%s.tar.gz" $repo $version $myArch) + "path" "zellij" + "executable" true + "refreshPeriod" $defaultRefresh +) -}} +{{- end -}} +{{- end }} + +{{- with $repo := "dandavison/delta" -}} +{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} +{{- $_ := set $externals ".local/bin/delta" (dict + "type" "archive-file" + "url" (printf "https://github.com/%s/releases/download/%s/delta-%s-%s.tar.gz" $repo $version $version $myArch) + "path" (printf "delta-%s-%s/delta" $version $myArch) + "refreshPeriod" $defaultRefresh +) -}} +{{- end -}} +{{- end -}} + +{{ $myArch = "darwin_arm64" }} + +{{- with $repo := "hickford/git-credential-oauth" -}} +{{- with $version := trimPrefix "v" (gitHubLatestRelease $repo).GetTagName -}} +{{- $_ := set $externals ".local/bin/git-credential-oauth" (dict + "type" "archive-file" + "url" (printf "https://github.com/%s/releases/download/v%s/git-credential-oauth_%s_%s.tar.gz" $repo $version $version $myArch) + "path" "git-credential-oauth" + "executable" true + "refreshPeriod" $defaultRefresh +) -}} +{{- end -}} +{{- end -}} + +{{ $myArch = "mac" }} + +{{- with $repo := "extrawurst/gitui" -}} +{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} +{{- $_ := set $externals ".local/bin/gitui" (dict + "type" "archive-file" + "url" (printf "https://github.com/%s/releases/download/%s/gitui-%s.tar.gz" $repo $version $myArch) + "path" "./gitui" + "executable" true + "refreshPeriod" $defaultRefresh +) -}} +{{- end -}} +{{- end }} + +{{ $myArch = "Darwin_arm64" }} + +{{- with $repo := "theimpostor/osc" -}} +{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} +{{- $_ := set $externals ".local/bin/osc" (dict + "type" "archive-file" + "url" (printf "https://github.com/%s/releases/download/%s/osc_%s.tar.gz" $repo $version $myArch) + "path" "osc" + "executable" true + "refreshPeriod" $defaultRefresh +) -}} +{{- end -}} +{{- end }} + +{{ $myArch = "darwin-arm64" }} + +{{- with $repo := "Lifailon/lazyjournal" -}} +{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} +{{- $_ := set $externals ".local/bin/lazyjournal" (dict + "type" "file" + "url" (printf "https://github.com/%s/releases/download/%s/lazyjournal-%s-%s" $repo $version $version $myArch) + "executable" true + "refreshPeriod" $defaultRefresh +) -}} +{{- end -}} +{{- end }} + +{{- $externals | toYaml }} + +".config/sz.env/lib/delta.themes.gitconfig": + type: "file" + url: "https://raw.githubusercontent.com/dandavison/delta/refs/heads/main/themes.gitconfig" + refreshPeriod: "{{ $defaultRefresh }}" diff --git a/_src.posix/.chezmoiexternal.yaml b/_src.posix/.chezmoiexternal.yaml index a5362b7..12ee019 100644 --- a/_src.posix/.chezmoiexternal.yaml +++ b/_src.posix/.chezmoiexternal.yaml @@ -17,11 +17,13 @@ {{ $defaultRefresh := "168h" -}} {{- $externals := dict -}} +{{ $myArch := "x86_64-unknown-linux-musl" }} + {{- with $repo := "zellij-org/zellij" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} {{- $_ := set $externals ".cache/chezmoi/tmp/zellij" (dict "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/%s/zellij-x86_64-unknown-linux-musl.tar.gz" $repo $version) + "url" (printf "https://github.com/%s/releases/download/%s/zellij-%s.tar.gz" $repo $version $myArch) "path" "zellij" "executable" true "refreshPeriod" $defaultRefresh @@ -33,18 +35,20 @@ {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} {{- $_ := set $externals ".local/bin/delta" (dict "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/%s/delta-%s-x86_64-unknown-linux-musl.tar.gz" $repo $version $version) - "path" (printf "delta-%s-x86_64-unknown-linux-musl/delta" $version) + "url" (printf "https://github.com/%s/releases/download/%s/delta-%s-%s.tar.gz" $repo $version $version $myArch) + "path" (printf "delta-%s-%s/delta" $version $myArch) "refreshPeriod" $defaultRefresh ) -}} {{- end -}} {{- end -}} +{{ $myArch = "linux_amd64" }} + {{- with $repo := "hickford/git-credential-oauth" -}} {{- with $version := trimPrefix "v" (gitHubLatestRelease $repo).GetTagName -}} {{- $_ := set $externals ".local/bin/git-credential-oauth" (dict "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/v%s/git-credential-oauth_%s_linux_amd64.tar.gz" $repo $version $version) + "url" (printf "https://github.com/%s/releases/download/v%s/git-credential-oauth_%s_%s.tar.gz" $repo $version $version $myArch) "path" "git-credential-oauth" "executable" true "refreshPeriod" $defaultRefresh @@ -52,11 +56,13 @@ {{- end -}} {{- end -}} +{{ $myArch = "linux-x86_64" }} + {{- with $repo := "extrawurst/gitui" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} {{- $_ := set $externals ".local/bin/gitui" (dict "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/%s/gitui-linux-x86_64.tar.gz" $repo $version) + "url" (printf "https://github.com/%s/releases/download/%s/gitui-%s.tar.gz" $repo $version $myArch) "path" "./gitui" "executable" true "refreshPeriod" $defaultRefresh @@ -64,11 +70,13 @@ {{- end -}} {{- end }} +{{ $myArch = "linux_x86_64" }} + {{- with $repo := "theimpostor/osc" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} {{- $_ := set $externals ".local/bin/osc" (dict "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/%s/osc_linux_x86_64.tar.gz" $repo $version) + "url" (printf "https://github.com/%s/releases/download/%s/osc_%s.tar.gz" $repo $version $myArch) "path" "osc" "executable" true "refreshPeriod" $defaultRefresh @@ -76,11 +84,13 @@ {{- end -}} {{- end }} +{{ $myArch = "linux-amd64" }} + {{- with $repo := "Lifailon/lazyjournal" -}} {{- with $version := (gitHubLatestRelease $repo).GetTagName -}} {{- $_ := set $externals ".local/bin/lazyjournal" (dict "type" "file" - "url" (printf "https://github.com/%s/releases/download/%s/lazyjournal-%s-linux-amd64" $repo $version $version) + "url" (printf "https://github.com/%s/releases/download/%s/lazyjournal-%s-%s" $repo $version $version $myArch) "executable" true "refreshPeriod" $defaultRefresh ) -}} From 33753621fe5254486ab5e1efa4df3eaa257b0d9f Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:31:09 -0500 Subject: [PATCH 07/15] Add home dir to chemoi vscode workspace --- .../_workspaces/🏡chezmoi.code-workspace | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 _home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace diff --git a/_home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace b/_home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace new file mode 100644 index 0000000..d2ed564 --- /dev/null +++ b/_home.macos/dot_vscode/_workspaces/🏡chezmoi.code-workspace @@ -0,0 +1,19 @@ +{ + "folders": [ + { + "name": "chezmoi 🏡", + "path": "../../.local/share/chezmoi" + }, + { + "name": "~/.config/chezmoi", + "path": "../../.config/chezmoi" + }, + { + "path": "." + }, + { + "path": "../.." + } + ], + "settings": {} +} \ No newline at end of file From ed59d36f0a5847d66e6ed8c46e4e9eb436a2adcd Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:33:45 -0500 Subject: [PATCH 08/15] macos env fixes --- _home.macos/private_dot_config/sz.env/ID_truenas_scale.env | 1 - .../private_dot_config/sz.env/remove_ID_truenas_scale.env | 0 _home.macos/private_dot_config/sz.env/remove_truenas-scale.env | 0 _home.macos/private_dot_config/sz.env/truenas-scale.env | 1 - 4 files changed, 2 deletions(-) delete mode 120000 _home.macos/private_dot_config/sz.env/ID_truenas_scale.env create mode 100644 _home.macos/private_dot_config/sz.env/remove_ID_truenas_scale.env create mode 100644 _home.macos/private_dot_config/sz.env/remove_truenas-scale.env delete mode 120000 _home.macos/private_dot_config/sz.env/truenas-scale.env diff --git a/_home.macos/private_dot_config/sz.env/ID_truenas_scale.env b/_home.macos/private_dot_config/sz.env/ID_truenas_scale.env deleted file mode 120000 index 9839390..0000000 --- a/_home.macos/private_dot_config/sz.env/ID_truenas_scale.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/ID_truenas_scale.env \ No newline at end of file diff --git a/_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 new file mode 100644 index 0000000..e69de29 diff --git a/_home.macos/private_dot_config/sz.env/remove_truenas-scale.env b/_home.macos/private_dot_config/sz.env/remove_truenas-scale.env new file mode 100644 index 0000000..e69de29 diff --git a/_home.macos/private_dot_config/sz.env/truenas-scale.env b/_home.macos/private_dot_config/sz.env/truenas-scale.env deleted file mode 120000 index 001f9a6..0000000 --- a/_home.macos/private_dot_config/sz.env/truenas-scale.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/truenas-scale.env \ No newline at end of file From 9225991e217316feef315c46c6e8645cfe8e11fd Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:34:06 -0500 Subject: [PATCH 09/15] macos: add homebrew loading --- _home.macos/private_dot_config/sz.env/zzz_homebrew.env | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 _home.macos/private_dot_config/sz.env/zzz_homebrew.env diff --git a/_home.macos/private_dot_config/sz.env/zzz_homebrew.env b/_home.macos/private_dot_config/sz.env/zzz_homebrew.env new file mode 100644 index 0000000..fd649ce --- /dev/null +++ b/_home.macos/private_dot_config/sz.env/zzz_homebrew.env @@ -0,0 +1,4 @@ +#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' + +! [ -x /opt/homebrew/bin/brew ] || \ + eval "$(/opt/homebrew/bin/brew shellenv)" From 125a023c01a31946027298ef299928937d8058a5 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:34:42 -0500 Subject: [PATCH 10/15] fix: error while loading zsh on macos --- _src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env b/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env index be73805..f39c09e 100644 --- a/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env +++ b/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env @@ -26,7 +26,7 @@ if [[ "${BASE_SHELL}" == "zsh" ]]; then # SZ_TPUT_END=$(tput cup 9999 0) # echo $SZ_TPUT_END - PS1="$(zsh -c '. <(cat /etc/*-release | uniq -u); echo "$NAME $VERSION_ID "')| ZSH ${ZSH_VERSION} LOADING >" + PS1="$(zsh -c '. <([ -n "$(echo /etc/*-release(N))" ] && cat /etc/*-release(N) | uniq -u || NAME="$VENDOR" ); echo "$NAME $VERSION_ID "')| ZSH ${ZSH_VERSION} LOADING >" #"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" #""" Shell Settings """ From 02260030a9720d2f10ad58179816bea0e17a1f67 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:35:23 -0500 Subject: [PATCH 11/15] fix: zellij should not be loaded in vscode terminal --- _src.posix/private_dot_config/sz.env/aab_zellij.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_src.posix/private_dot_config/sz.env/aab_zellij.env b/_src.posix/private_dot_config/sz.env/aab_zellij.env index 32d2119..d3999ff 100644 --- a/_src.posix/private_dot_config/sz.env/aab_zellij.env +++ b/_src.posix/private_dot_config/sz.env/aab_zellij.env @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' -if is_cmd load-zellij; then +if is_cmd load-zellij && [ -z "${VSCODE_PROFILE_INITIALIZED}" ]; then # zellij will need to allow reload of the enviornment [[ -z "$ZELLIJ_SESSION_NAME" ]] && unset SZ_ENV_LOADED . <( load-zellij - ) From be5cc4ea50f51af53596d69c8da808fe9a49ff06 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:36:10 -0500 Subject: [PATCH 12/15] macos: add .finicky.js configuration --- _home.macos/dot_finicky.js | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 _home.macos/dot_finicky.js diff --git a/_home.macos/dot_finicky.js b/_home.macos/dot_finicky.js new file mode 100644 index 0000000..c31e7e9 --- /dev/null +++ b/_home.macos/dot_finicky.js @@ -0,0 +1,50 @@ +// Use https://finicky-kickstart.now.sh to generate basic configuration +// Learn more about configuration options: https://github.com/johnste/finicky/wiki/Configuration + +module.exports = { + defaultBrowser: "Browserosaurus", + rewrite: [{ + match: () => true, // Execute rewrite on all incoming urls to make this example easier to understand + url: ({ url }) => { + const removeKeysStartingWith = ["utm_", "uta_"]; // Remove all query parameters beginning with these strings + const removeKeys = ["fbclid", "gclid", "si"]; // Remove all query parameters matching these keys + + const search = url.search + .split("&") + .map((parameter) => parameter.split("=")) + .filter(([key]) => !removeKeysStartingWith.some((startingWith) => key.startsWith(startingWith))) + .filter(([key]) => !removeKeys.some((removeKey) => key === removeKey)); + + return { + ...url, + search: search.map((parameter) => parameter.join("=")).join("&"), + }; + }, + }], + handlers: [ + { + match: [ + finicky.matchDomains(/.*\.vastdata.com/) + ], + browser: "Google Chrome" + }, + { + match: [ + finicky.matchDomains(/127\.0\.0\.1/) + ], + browser: "DuckDuckGo" + }, + { + // Open these in Browserosaurus + match: [ + "github.com*", + "open.spotify.com*", + // YouTube + "youtube.com*", + "youtu.be*", + finicky.matchDomains(/.*\.youtube.com/) // use helper function to match on domain only + ], + browser: "Browserosaurus" + } + ] +} From dffe727d189d7d13038c4e5cdf7e15e072ed3af4 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:37:28 -0500 Subject: [PATCH 13/15] .gitconfig: add comment + prefer vim (more compatible) --- _src.posix/dot_gitconfig.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_src.posix/dot_gitconfig.tmpl b/_src.posix/dot_gitconfig.tmpl index 930a684..5796817 100644 --- a/_src.posix/dot_gitconfig.tmpl +++ b/_src.posix/dot_gitconfig.tmpl @@ -9,6 +9,8 @@ name = {{ .gitName }} email = {{ .gitEmail }} +# Information on how to set this up: +# https://github.com/hickford/git-credential-oauth?tab=readme-ov-file#git-credential-oauth [credential] helper = cache --timeout 21600 helper = oauth @@ -21,7 +23,7 @@ # oauthDeviceAuthURL = /login/oauth/authorize_device # oauthScopes = read_repository [core] - editor = nvim + editor = vim pager = delta [init] From eec1bc00815abbf81d4ad81d96aeefc19c47d6ac Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:37:52 -0500 Subject: [PATCH 14/15] .gitconfig: add vastdata gitlab OAuth --- _src.posix/dot_gitconfig.tmpl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/_src.posix/dot_gitconfig.tmpl b/_src.posix/dot_gitconfig.tmpl index 5796817..960e3c9 100644 --- a/_src.posix/dot_gitconfig.tmpl +++ b/_src.posix/dot_gitconfig.tmpl @@ -14,7 +14,19 @@ [credential] helper = cache --timeout 21600 helper = oauth -# helper = oauth -device +# helper = osxkeychain +# helper = oauth -device + +# Raed only OAuth2 authorization +[credential "https://git.vastdata.com"] + oauthClientId = 45fddd19ac1e3828f6caca2087dd78383477f0fc94164920476db536ac618beb + oauthClientSecret = 98958d78931d8f02be1ab9c4fd4f718dcce357be3b609e771ba26f500ddd6196 + # oauthScopes = "read_repository write_repository" + oauthScopes = "read_repository" + oauthAuthURL = /oauth/authorize + oauthTokenURL = /oauth/token + oauthDeviceAuthURL = /oauth/authorize_device + [credential "https://code.lksz.me"] oauthClientId = a4792ccc-144e-407e-86c9-5e7d8d9c3269 oauthAuthURL = /login/oauth/authorize From 01143db2bd4b0dc381fcfab08e63a618a93b72ee Mon Sep 17 00:00:00 2001 From: "Lockszmith (@VAST)" Date: Tue, 25 Feb 2025 09:53:02 -0500 Subject: [PATCH 15/15] Add _src.all for shared content --- _src.all/private_dot_local/bin/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 _src.all/private_dot_local/bin/.keep diff --git a/_src.all/private_dot_local/bin/.keep b/_src.all/private_dot_local/bin/.keep new file mode 100644 index 0000000..e69de29