From 10caf105be06396ca7403f73b5d6b367466e7a38 Mon Sep 17 00:00:00 2001 From: "Lockszmith (cs-dbg@VAST)" Date: Thu, 5 Jun 2025 19:47:40 +0000 Subject: [PATCH 1/5] load complete-alias on bash only but make it zsh code compatible in case you want to try and load it on zsh --- .../sz.env/091_load_complete-alias.env.bash | 11 +++++++++++ ...e-alias.env => remove_091_load_complete-alias.env} | 0 2 files changed, 11 insertions(+) create mode 100644 chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env.bash rename chezmoi.roots/_home/private_dot_config/sz.env/{091_load_complete-alias.env => remove_091_load_complete-alias.env} (100%) diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env.bash b/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env.bash new file mode 100644 index 0000000..3ca260c --- /dev/null +++ b/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env.bash @@ -0,0 +1,11 @@ +#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' + +if [ -f "$SZ_ENV_ROOT/lib/complete-alias" ]; then + source <(sed -Ee 's/\(\( "\$COMPAL_AUTO_UNMASK"/(( \${COMPAL_AUTO_UNMASK:-0}/g' "$SZ_ENV_ROOT/lib/complete-alias") --noattach +fi + +if [[ -n "${DBG}" && -n "$( command -v _complete_alias )" ]]; then + echo "complete-alias will be loaded." +fi + +# vim: set ft=sh expandtab tabstop=4 shiftwidth=4: diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env b/chezmoi.roots/_home/private_dot_config/sz.env/remove_091_load_complete-alias.env similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env rename to chezmoi.roots/_home/private_dot_config/sz.env/remove_091_load_complete-alias.env From 48c715529daa0d373a34c93d16312176d8c6fe0c Mon Sep 17 00:00:00 2001 From: "Lockszmith (cs-dbg@VAST)" Date: Thu, 5 Jun 2025 19:57:26 +0000 Subject: [PATCH 2/5] Add fast-syntax-highlighting zsh plugin --- .../sz.env/011_zsh_3_completion_system.env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh index f5ebaaf..7e23504 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh +++ b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh @@ -24,7 +24,7 @@ else # bindkey -M menuselect '^[[C' .forward-char '^[OC' .forward-char # `znap install` adds new commands and completions. - znap install aureliojargas/clitest zsh-users/zsh-completions + znap install aureliojargas/clitest zsh-users/zsh-completions zdharma-continuum/fast-syntax-highlighting fi # vim: set ft=sh expandtab tabstop=4 shiftwidth=4: From 231970542c04f0d9ae72ec22dc221e1d57c1a51e Mon Sep 17 00:00:00 2001 From: "Lockszmith (cs-dbg@VAST)" Date: Thu, 5 Jun 2025 19:58:29 +0000 Subject: [PATCH 3/5] cleaup load-zellij --- .../_home/private_dot_local/bin/executable_load-zellij | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij b/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij index 9df778a..11a94e2 100644 --- a/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij +++ b/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij @@ -105,7 +105,7 @@ ${SET_X-:} -x # Was needed when zsh would load # . <( zellij setup --generate-completion "$BASE_SHELL" | sed -ne '/^function/,$p' ) if [[ -z "$ZELLIJ_SESSION_NAME" ]]; then - zellij attach -c $USER@$(hostname) + zellij fi elif [[ "$1" == '-' ]]; then From 1f008bdfec3afd6e1e1feb402a3aaa6ae7434e64 Mon Sep 17 00:00:00 2001 From: "Lockszmith (cs-dbg@VAST)" Date: Thu, 5 Jun 2025 19:59:17 +0000 Subject: [PATCH 4/5] potentially safer nvim symlink --- chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl b/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl index f280f47..a70557a 100644 --- a/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl +++ b/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl @@ -1 +1,5 @@ +{{- if stat (list (env "HOME") "/.local/bin/squashfs-root/usr/bin/nvim" | join "/") -}} +squashfs-root/usr/bin/nvim +{{- else -}} nvim.AppImage +{{- end -}} From 8422f90ef4064d52f67f37075a2b4d74c2bfab64 Mon Sep 17 00:00:00 2001 From: "Lockszmith (cs-dbg@VAST)" Date: Thu, 5 Jun 2025 20:00:10 +0000 Subject: [PATCH 5/5] update _home.macos symlinks --- .../_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh | 1 + .../private_dot_config/sz.env/091_load_complete-alias.env.bash | 1 + .../private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh | 1 + .../private_dot_config/sz.env/remove_091_load_complete-alias.env | 1 + 4 files changed, 4 insertions(+) create mode 120000 chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh create mode 120000 chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env.bash create mode 120000 chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh create mode 120000 chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_091_load_complete-alias.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh new file mode 120000 index 0000000..e294ca3 --- /dev/null +++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh @@ -0,0 +1 @@ +../../../_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env.bash b/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env.bash new file mode 120000 index 0000000..0331ace --- /dev/null +++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env.bash @@ -0,0 +1 @@ +../../../_home/private_dot_config/sz.env/091_load_complete-alias.env.bash \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh new file mode 120000 index 0000000..7fcff3b --- /dev/null +++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh @@ -0,0 +1 @@ +../../../_home/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh \ No newline at end of file diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_091_load_complete-alias.env b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_091_load_complete-alias.env new file mode 120000 index 0000000..a32b799 --- /dev/null +++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_091_load_complete-alias.env @@ -0,0 +1 @@ +../../../_home/private_dot_config/sz.env/remove_091_load_complete-alias.env \ No newline at end of file