diff --git a/_home/.chezmoiexternal.yaml b/_home/.chezmoiexternal.yaml deleted file mode 120000 index ac9fe87..0000000 --- a/_home/.chezmoiexternal.yaml +++ /dev/null @@ -1 +0,0 @@ -../_src.posix/.chezmoiexternal.yaml \ No newline at end of file diff --git a/_home/.chezmoiexternal.yaml.tmpl b/_home/.chezmoiexternal.yaml.tmpl new file mode 120000 index 0000000..4375c3c --- /dev/null +++ b/_home/.chezmoiexternal.yaml.tmpl @@ -0,0 +1 @@ +../_src.posix/.chezmoiexternal.yaml.tmpl \ No newline at end of file diff --git a/_home/dot_vimrc b/_home/dot_vimrc new file mode 120000 index 0000000..bd4e90f --- /dev/null +++ b/_home/dot_vimrc @@ -0,0 +1 @@ +../_src.posix/dot_vimrc \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/.aliases.macos.env b/_home/private_dot_config/sz.env/.aliases.macos.env new file mode 120000 index 0000000..5e43498 --- /dev/null +++ b/_home/private_dot_config/sz.env/.aliases.macos.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/.aliases.macos.env \ No newline at end of file diff --git a/_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 deleted file mode 120000 index 117cb13..0000000 --- a/_home/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env +++ /dev/null @@ -1 +0,0 @@ -../../../_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/099_stop_on_non_interactive_sessions.env b/_home/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env new file mode 120000 index 0000000..8f5aa29 --- /dev/null +++ b/_home/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.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 deleted file mode 120000 index 9ad1a34..0000000 --- a/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env +++ /dev/null @@ -1 +0,0 @@ -../../../_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_0_perp.env.zsh b/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh new file mode 120000 index 0000000..4665313 --- /dev/null +++ b/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh \ 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 deleted file mode 120000 index 089a0d8..0000000 --- a/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env +++ /dev/null @@ -1 +0,0 @@ -../../../_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_2_zinit.env.zsh b/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh new file mode 120000 index 0000000..9db759c --- /dev/null +++ b/_home/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_2_zinit.env.zsh \ 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 deleted file mode 120000 index dbe81b1..0000000 --- a/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env +++ /dev/null @@ -1 +0,0 @@ -../../../_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/aaa_zsh_3_completion_system.env.zsh b/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh new file mode 120000 index 0000000..ee5878c --- /dev/null +++ b/_home/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh \ 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 deleted file mode 120000 index 1807a3a..0000000 --- a/_home/private_dot_config/sz.env/aliases.env +++ /dev/null @@ -1 +0,0 @@ -../../../_src.posix/private_dot_config/sz.env/aliases.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/aliases.env.tmpl b/_home/private_dot_config/sz.env/aliases.env.tmpl new file mode 120000 index 0000000..308fd94 --- /dev/null +++ b/_home/private_dot_config/sz.env/aliases.env.tmpl @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aliases.env.tmpl \ 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 deleted file mode 120000 index b13a0db..0000000 --- a/_home/private_dot_config/sz.env/bbb_bash_preexec.env +++ /dev/null @@ -1 +0,0 @@ -../../../_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_bash_preexec.env.bash b/_home/private_dot_config/sz.env/bbb_bash_preexec.env.bash new file mode 120000 index 0000000..882b92d --- /dev/null +++ b/_home/private_dot_config/sz.env/bbb_bash_preexec.env.bash @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/bbb_bash_preexec.env.bash \ 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 deleted file mode 120000 index 75fb560..0000000 --- a/_home/private_dot_config/sz.env/bbb_ble.sh.env +++ /dev/null @@ -1 +0,0 @@ -../../../_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/bbb_ble.sh.env.bash b/_home/private_dot_config/sz.env/bbb_ble.sh.env.bash new file mode 120000 index 0000000..33a3cce --- /dev/null +++ b/_home/private_dot_config/sz.env/bbb_ble.sh.env.bash @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/bbb_ble.sh.env.bash \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env b/_home/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env new file mode 120000 index 0000000..4cdc0dd --- /dev/null +++ b/_home/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env b/_home/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env new file mode 120000 index 0000000..192589d --- /dev/null +++ b/_home/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/remove_aaa_zsh_0_perp.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env b/_home/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env new file mode 120000 index 0000000..8051f78 --- /dev/null +++ b/_home/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/remove_aaa_zsh_2_zinit.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env b/_home/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env new file mode 120000 index 0000000..35e3ae4 --- /dev/null +++ b/_home/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/remove_aaa_zsh_3_completion_system.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/remove_bbb_bash_preexec.env b/_home/private_dot_config/sz.env/remove_bbb_bash_preexec.env new file mode 120000 index 0000000..0ae3324 --- /dev/null +++ b/_home/private_dot_config/sz.env/remove_bbb_bash_preexec.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/remove_bbb_bash_preexec.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/remove_bbb_ble.sh.env b/_home/private_dot_config/sz.env/remove_bbb_ble.sh.env new file mode 120000 index 0000000..b23615d --- /dev/null +++ b/_home/private_dot_config/sz.env/remove_bbb_ble.sh.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/remove_bbb_ble.sh.env \ No newline at end of file diff --git a/_home/private_dot_config/sz.env/zzz_teleport.env b/_home/private_dot_config/sz.env/zzz_teleport.env new file mode 120000 index 0000000..429b263 --- /dev/null +++ b/_home/private_dot_config/sz.env/zzz_teleport.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/zzz_teleport.env \ No newline at end of file diff --git a/_home/private_dot_config/vim/_init b/_home/private_dot_config/vim/_init new file mode 120000 index 0000000..6a433f0 --- /dev/null +++ b/_home/private_dot_config/vim/_init @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/vim/_init \ No newline at end of file diff --git a/_home/private_dot_local/bin/.keep b/_home/private_dot_local/bin/.keep new file mode 120000 index 0000000..3a6bac8 --- /dev/null +++ b/_home/private_dot_local/bin/.keep @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/.keep \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_tsh-get b/_home/private_dot_local/bin/executable_tsh-get new file mode 120000 index 0000000..7c62216 --- /dev/null +++ b/_home/private_dot_local/bin/executable_tsh-get @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_tsh-get \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_tssh b/_home/private_dot_local/bin/executable_tssh new file mode 120000 index 0000000..8f59b48 --- /dev/null +++ b/_home/private_dot_local/bin/executable_tssh @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_tssh \ No newline at end of file diff --git a/_home/private_dot_local/bin/executable_tssh-with-tunnel b/_home/private_dot_local/bin/executable_tssh-with-tunnel new file mode 120000 index 0000000..2322671 --- /dev/null +++ b/_home/private_dot_local/bin/executable_tssh-with-tunnel @@ -0,0 +1 @@ +../../../_src.posix/private_dot_local/bin/executable_tssh-with-tunnel \ 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 diff --git a/_home/private_dot_ssh/config.d/.keep b/_home/private_dot_ssh/config.d/.keep new file mode 120000 index 0000000..f5acf40 --- /dev/null +++ b/_home/private_dot_ssh/config.d/.keep @@ -0,0 +1 @@ +../../../_src.posix/private_dot_ssh/config.d/.keep \ No newline at end of file diff --git a/_src.posix/.chezmoiexternal.yaml.tmpl b/_src.posix/.chezmoiexternal.yaml.tmpl index 8baf005..e59546d 100644 --- a/_src.posix/.chezmoiexternal.yaml.tmpl +++ b/_src.posix/.chezmoiexternal.yaml.tmpl @@ -213,7 +213,7 @@ url: "https://raw.githubusercontent.com/rcaloras/bash-preexec/master/bash-preexec.sh" refreshPeriod: "{{ $defaultRefresh }}" -{{- if eq .chezmoi.os "linux" -}} +{{ if eq .chezmoi.os "linux" -}} ".local/bin/nvim.AppImage": type: "file" url: "https://github.com/neovim/neovim/releases/download/stable/nvim-linux-x86_64.appimage" diff --git a/_src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env b/_src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env similarity index 89% rename from _src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env rename to _src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env index 6e83c75..ac96f12 100644 --- a/_src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env +++ b/_src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env @@ -4,5 +4,5 @@ if [[ ! "$-" =~ i ]]; then LOAD_EXIT=1 echo "Non interactive session ($-) , stopping load of shell environment" 1>&2 else - reset + ${NO_RESET:+:} reset fi diff --git a/_src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env b/_src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env new file mode 100644 index 0000000..e69de29 diff --git a/_src.posix/private_dot_local/bin/executable_load-zellij b/_src.posix/private_dot_local/bin/executable_load-zellij index 6b2428b..175cb26 100644 --- a/_src.posix/private_dot_local/bin/executable_load-zellij +++ b/_src.posix/private_dot_local/bin/executable_load-zellij @@ -11,7 +11,7 @@ is_sourced() { } BASE_0=${BASE_0:-$0} -BASE_SHELL=$(basename "$SHELL") +BASE_SHELL="${BASE_SHELL:-$(basename "$SHELL")}" if is_sourced; then zellij-cleanup() { @@ -47,7 +47,8 @@ ${SET:-:} -x env zellij "${@}" fi } - zellij-completion() { + + zellij-load-completion() { if [[ "${BASE_SHELL}" == "zsh" ]]; then type _zellij > /dev/null \ || . <( env zellij setup --generate-completion zsh | sed -Ee 's/^(_(zellij) ).*/compdef \1\2/' ) @@ -57,7 +58,7 @@ ${SET:-:} -x } ${SET:-:} -x if [[ -n "$(env which zellij)" ]]; then - zellij-completion + zellij-load-completion fi ${SET:-:} -x # Was needed when zsh would load