From 6c935271421d4fc4321cf211e2f865db998646dd Mon Sep 17 00:00:00 2001 From: "Lockszmith (@crater)" Date: Wed, 12 Mar 2025 14:17:55 +0000 Subject: [PATCH 1/4] Fix init process - reducing assumptions --- .chezmoi.toml.tmpl | 3 ++- .chezmoiscripts/run_init.sh.tmpl | 1 + _src.posix/.chezmoi.toml.tmpl | 3 ++- symclone.sh | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl index 2d4a71e..4f8e2c7 100644 --- a/.chezmoi.toml.tmpl +++ b/.chezmoi.toml.tmpl @@ -15,7 +15,8 @@ {{- $chassisType = "desktop" }} {{- end }} {{- else if eq .chezmoi.os "linux" }} -{{- $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }} +# $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }} +{{- $chassisType = "server" }} {{- 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 }} diff --git a/.chezmoiscripts/run_init.sh.tmpl b/.chezmoiscripts/run_init.sh.tmpl index 9f1dc0f..d74d340 100755 --- a/.chezmoiscripts/run_init.sh.tmpl +++ b/.chezmoiscripts/run_init.sh.tmpl @@ -7,6 +7,7 @@ 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" +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 diff --git a/_src.posix/.chezmoi.toml.tmpl b/_src.posix/.chezmoi.toml.tmpl index 031b1d0..95e69e6 100644 --- a/_src.posix/.chezmoi.toml.tmpl +++ b/_src.posix/.chezmoi.toml.tmpl @@ -26,7 +26,8 @@ {{- $chassisType = "desktop" }} {{- end }} {{- else if eq .chezmoi.os "linux" }} -{{- $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }} +# $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }} +{{- $chassisType = "server" }} {{- else if eq .chezmoi.os "windows" }} {{- $sysType = "windows" }} {{- $sysVendor = "pc" }} diff --git a/symclone.sh b/symclone.sh index a5e6cfe..c762bb8 100755 --- a/symclone.sh +++ b/symclone.sh @@ -32,7 +32,7 @@ fi 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 +find "$SRC_DIR" -mindepth 1 -type d | while read -r dir; do mkdir -p "$DEST_DIR/${dir#$SRC_DIR/}" done From d0c28747d2865864d7d76f152cbb614c07c266ce Mon Sep 17 00:00:00 2001 From: "Lockszmith (@crater)" Date: Wed, 12 Mar 2025 14:26:18 +0000 Subject: [PATCH 2/4] Align chezmoi env in _home to _src.posix --- _home/private_dot_config/sz.env/zzz_chezmoi.env | 1 - _home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 _home/private_dot_config/sz.env/zzz_chezmoi.env create mode 120000 _home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl diff --git a/_home/private_dot_config/sz.env/zzz_chezmoi.env b/_home/private_dot_config/sz.env/zzz_chezmoi.env deleted file mode 120000 index fb97cec..0000000 --- a/_home/private_dot_config/sz.env/zzz_chezmoi.env +++ /dev/null @@ -1 +0,0 @@ -../../../_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_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 From 8c05936e88a90df524f99e9cec7d05f2d1245c43 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@crater)" Date: Wed, 12 Mar 2025 14:27:27 +0000 Subject: [PATCH 3/4] Align _home vim config to aliases --- _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 - _src.posix/private_dot_config/sz.env/aliases.env | 4 +++- 6 files changed, 3 insertions(+), 6 deletions(-) delete mode 120000 _home/private_dot_local/bin/symlink_nvim delete mode 120000 _home/private_dot_local/bin/symlink_vi delete mode 120000 _home/private_dot_local/bin/symlink_vim delete mode 120000 _home/private_dot_local/bin/symlink_vim.tiny delete mode 120000 _home/private_dot_local/bin/symlink_vimdiff diff --git a/_home/private_dot_local/bin/symlink_nvim b/_home/private_dot_local/bin/symlink_nvim deleted file mode 120000 index 0c7503f..0000000 --- a/_home/private_dot_local/bin/symlink_nvim +++ /dev/null @@ -1 +0,0 @@ -../../../_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 deleted file mode 120000 index 5173085..0000000 --- a/_home/private_dot_local/bin/symlink_vi +++ /dev/null @@ -1 +0,0 @@ -../../../_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 deleted file mode 120000 index eb45531..0000000 --- a/_home/private_dot_local/bin/symlink_vim +++ /dev/null @@ -1 +0,0 @@ -../../../_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 deleted file mode 120000 index 638793a..0000000 --- a/_home/private_dot_local/bin/symlink_vim.tiny +++ /dev/null @@ -1 +0,0 @@ -../../../_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 deleted file mode 120000 index d1e0ef1..0000000 --- a/_home/private_dot_local/bin/symlink_vimdiff +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_local/bin/symlink_vimdiff \ No newline at end of file diff --git a/_src.posix/private_dot_config/sz.env/aliases.env b/_src.posix/private_dot_config/sz.env/aliases.env index d5c470b..fb96806 100644 --- a/_src.posix/private_dot_config/sz.env/aliases.env +++ b/_src.posix/private_dot_config/sz.env/aliases.env @@ -8,7 +8,9 @@ alias ll='l -A' alias sudo='sudo ' -alias nvim='POSTFIX_BUITINS=1 command nvim -p ' +is_cmd nvim \ +&& alias nvim='POSTFIX_BUITINS=1 command nvim -p ' \ +|| alias nvim='POSTFIX_BUITINS=1 command vim -p ' alias vi='nvim ' alias vim='nvim ' alias nvimdiff='nvim -d ' From 7f3a4b86a200c08f922d09ed61377c9f84ecbc93 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@crater)" Date: Wed, 12 Mar 2025 14:29:46 +0000 Subject: [PATCH 4/4] Add _home symlinks --- _home/private_dot_config/pet/config.toml | 1 + _home/private_dot_config/pet/snippet.toml | 1 + _home/private_dot_config/sz.env/zza_pet.env | 1 + _home/private_dot_local/bin/executable_auto-copy-ssh-id | 1 + 4 files changed, 4 insertions(+) create mode 120000 _home/private_dot_config/pet/config.toml create mode 120000 _home/private_dot_config/pet/snippet.toml create mode 120000 _home/private_dot_config/sz.env/zza_pet.env create mode 120000 _home/private_dot_local/bin/executable_auto-copy-ssh-id diff --git a/_home/private_dot_config/pet/config.toml b/_home/private_dot_config/pet/config.toml new file mode 120000 index 0000000..434a914 --- /dev/null +++ b/_home/private_dot_config/pet/config.toml @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/pet/config.toml \ No newline at end of file diff --git a/_home/private_dot_config/pet/snippet.toml b/_home/private_dot_config/pet/snippet.toml new file mode 120000 index 0000000..47f0c4c --- /dev/null +++ b/_home/private_dot_config/pet/snippet.toml @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/pet/snippet.toml \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/zza_pet.env b/_home/private_dot_config/sz.env/zza_pet.env new file mode 120000 index 0000000..a35fff6 --- /dev/null +++ b/_home/private_dot_config/sz.env/zza_pet.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zza_pet.env \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_auto-copy-ssh-id b/_home/private_dot_local/bin/executable_auto-copy-ssh-id new file mode 120000 index 0000000..c54d6f6 --- /dev/null +++ b/_home/private_dot_local/bin/executable_auto-copy-ssh-id @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_auto-copy-ssh-id \ No newline at end of file