From 398158e747795ea1f4a1836dc27cdd2e621fd97d Mon Sep 17 00:00:00 2001 From: Buddy Sandidge Date: Thu, 25 May 2023 16:03:18 -0700 Subject: [PATCH] Convert tmux from stow to chezmoi --- .chezmoiignore | 1 - .../tmux/plugins/executable_macos-color-workaround.tmpl | 2 ++ {tmux/.config => dot_config}/tmux/plugins/tpm/CHANGELOG.md | 0 .../.config => dot_config}/tmux/plugins/tpm/HOW_TO_PLUGIN.md | 0 {tmux/.config => dot_config}/tmux/plugins/tpm/LICENSE.md | 0 {tmux/.config => dot_config}/tmux/plugins/tpm/README.md | 0 .../tmux/plugins/tpm/bin/executable_clean_plugins | 0 .../tmux/plugins/tpm/bin/executable_install_plugins | 0 .../tmux/plugins/tpm/bin/executable_update_plugins | 0 .../tmux/plugins/tpm/bindings/executable_clean_plugins | 0 .../tmux/plugins/tpm/bindings/executable_install_plugins | 0 .../tmux/plugins/tpm/bindings/executable_update_plugins | 0 .../tmux/plugins/tpm/docs/automatic_tpm_installation.md | 0 .../tmux/plugins/tpm/docs/changing_plugins_install_dir.md | 0 .../tmux/plugins/tpm/docs/how_to_create_plugin.md | 0 .../tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md | 0 .../tmux/plugins/tpm/docs/tpm_not_working.md | 0 .../tmux/plugins/tpm/dot_gitattributes | 0 .../.gitignore => dot_config/tmux/plugins/tpm/dot_gitignore | 0 .../.gitmodules => dot_config/tmux/plugins/tpm/dot_gitmodules | 0 .../.travis.yml => dot_config/tmux/plugins/tpm/dot_travis.yml | 0 .../tpm/tpm => dot_config/tmux/plugins/tpm/executable_tpm | 0 .../tmux/plugins/tpm/scripts/executable_check_tmux_version.sh | 0 .../tmux/plugins/tpm/scripts/executable_clean_plugins.sh | 0 .../tmux/plugins/tpm/scripts/executable_install_plugins.sh | 0 .../tmux/plugins/tpm/scripts/executable_source_plugins.sh | 0 .../tmux/plugins/tpm/scripts/executable_update_plugin.sh | 0 .../tpm/scripts/executable_update_plugin_prompt_handler.sh | 0 .../tmux/plugins/tpm/scripts/helpers/plugin_functions.sh | 0 .../tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh | 0 .../tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh | 0 .../tmux/plugins/tpm/scripts/helpers/tmux_utils.sh | 0 .../tmux/plugins/tpm/scripts/helpers/utility.sh | 0 .../tmux/plugins/tpm/scripts/variables.sh | 0 .../tpm/tests/executable_expect_failed_plugin_download | 0 .../tpm/tests/executable_expect_successful_clean_plugins | 0 .../executable_expect_successful_multiple_plugins_download | 0 .../tpm/tests/executable_expect_successful_plugin_download | 0 .../executable_expect_successful_update_of_a_single_plugin | 0 .../tests/executable_expect_successful_update_of_all_plugins | 0 .../tmux/plugins/tpm/tests/executable_test_plugin_clean.sh | 0 .../plugins/tpm/tests/executable_test_plugin_installation.sh | 0 .../tpm/tests/executable_test_plugin_installation_legacy.sh | 0 .../tmux/plugins/tpm/tests/executable_test_plugin_sourcing.sh | 0 .../tmux/plugins/tpm/tests/executable_test_plugin_update.sh | 0 .../tmux/plugins/tpm/tests/helpers/tpm.sh | 0 tmux/.config/tmux/tmux.conf => dot_config/tmux/tmux.conf.tmpl | 4 ++++ .../zshrc.d/tmux.zsh => dot_config/zsh/zshrc.d/tmux.zsh.tmpl | 2 ++ tmux/.config/tmux/plugins/tpm/lib/tmux-test | 1 - 49 files changed, 8 insertions(+), 2 deletions(-) rename tmux/.config/tmux/plugins/macos-color-workaround => dot_config/tmux/plugins/executable_macos-color-workaround.tmpl (70%) mode change 100755 => 100644 rename {tmux/.config => dot_config}/tmux/plugins/tpm/CHANGELOG.md (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/HOW_TO_PLUGIN.md (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/LICENSE.md (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/README.md (100%) rename tmux/.config/tmux/plugins/tpm/bin/clean_plugins => dot_config/tmux/plugins/tpm/bin/executable_clean_plugins (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/bin/install_plugins => dot_config/tmux/plugins/tpm/bin/executable_install_plugins (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/bin/update_plugins => dot_config/tmux/plugins/tpm/bin/executable_update_plugins (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/bindings/clean_plugins => dot_config/tmux/plugins/tpm/bindings/executable_clean_plugins (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/bindings/install_plugins => dot_config/tmux/plugins/tpm/bindings/executable_install_plugins (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/bindings/update_plugins => dot_config/tmux/plugins/tpm/bindings/executable_update_plugins (100%) mode change 100755 => 100644 rename {tmux/.config => dot_config}/tmux/plugins/tpm/docs/automatic_tpm_installation.md (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/docs/changing_plugins_install_dir.md (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/docs/how_to_create_plugin.md (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/docs/tpm_not_working.md (100%) rename tmux/.config/tmux/plugins/tpm/.gitattributes => dot_config/tmux/plugins/tpm/dot_gitattributes (100%) rename tmux/.config/tmux/plugins/tpm/.gitignore => dot_config/tmux/plugins/tpm/dot_gitignore (100%) rename tmux/.config/tmux/plugins/tpm/.gitmodules => dot_config/tmux/plugins/tpm/dot_gitmodules (100%) rename tmux/.config/tmux/plugins/tpm/.travis.yml => dot_config/tmux/plugins/tpm/dot_travis.yml (100%) rename tmux/.config/tmux/plugins/tpm/tpm => dot_config/tmux/plugins/tpm/executable_tpm (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/scripts/check_tmux_version.sh => dot_config/tmux/plugins/tpm/scripts/executable_check_tmux_version.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/scripts/clean_plugins.sh => dot_config/tmux/plugins/tpm/scripts/executable_clean_plugins.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/scripts/install_plugins.sh => dot_config/tmux/plugins/tpm/scripts/executable_install_plugins.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/scripts/source_plugins.sh => dot_config/tmux/plugins/tpm/scripts/executable_source_plugins.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/scripts/update_plugin.sh => dot_config/tmux/plugins/tpm/scripts/executable_update_plugin.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/scripts/update_plugin_prompt_handler.sh => dot_config/tmux/plugins/tpm/scripts/executable_update_plugin_prompt_handler.sh (100%) mode change 100755 => 100644 rename {tmux/.config => dot_config}/tmux/plugins/tpm/scripts/helpers/plugin_functions.sh (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/scripts/helpers/tmux_utils.sh (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/scripts/helpers/utility.sh (100%) rename {tmux/.config => dot_config}/tmux/plugins/tpm/scripts/variables.sh (100%) rename tmux/.config/tmux/plugins/tpm/tests/expect_failed_plugin_download => dot_config/tmux/plugins/tpm/tests/executable_expect_failed_plugin_download (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/expect_successful_clean_plugins => dot_config/tmux/plugins/tpm/tests/executable_expect_successful_clean_plugins (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/expect_successful_multiple_plugins_download => dot_config/tmux/plugins/tpm/tests/executable_expect_successful_multiple_plugins_download (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/expect_successful_plugin_download => dot_config/tmux/plugins/tpm/tests/executable_expect_successful_plugin_download (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/expect_successful_update_of_a_single_plugin => dot_config/tmux/plugins/tpm/tests/executable_expect_successful_update_of_a_single_plugin (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/expect_successful_update_of_all_plugins => dot_config/tmux/plugins/tpm/tests/executable_expect_successful_update_of_all_plugins (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/test_plugin_clean.sh => dot_config/tmux/plugins/tpm/tests/executable_test_plugin_clean.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/test_plugin_installation.sh => dot_config/tmux/plugins/tpm/tests/executable_test_plugin_installation.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/test_plugin_installation_legacy.sh => dot_config/tmux/plugins/tpm/tests/executable_test_plugin_installation_legacy.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/test_plugin_sourcing.sh => dot_config/tmux/plugins/tpm/tests/executable_test_plugin_sourcing.sh (100%) mode change 100755 => 100644 rename tmux/.config/tmux/plugins/tpm/tests/test_plugin_update.sh => dot_config/tmux/plugins/tpm/tests/executable_test_plugin_update.sh (100%) mode change 100755 => 100644 rename {tmux/.config => dot_config}/tmux/plugins/tpm/tests/helpers/tpm.sh (100%) rename tmux/.config/tmux/tmux.conf => dot_config/tmux/tmux.conf.tmpl (97%) rename tmux/.config/zsh/zshrc.d/tmux.zsh => dot_config/zsh/zshrc.d/tmux.zsh.tmpl (75%) delete mode 160000 tmux/.config/tmux/plugins/tpm/lib/tmux-test diff --git a/.chezmoiignore b/.chezmoiignore index d0534a6..cab7c70 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,7 +1,6 @@ /hellotech/ /install-scripts/ /old-scripts/ -/tmux/ /vim-fancy/ /vim/ /README.md diff --git a/tmux/.config/tmux/plugins/macos-color-workaround b/dot_config/tmux/plugins/executable_macos-color-workaround.tmpl old mode 100755 new mode 100644 similarity index 70% rename from tmux/.config/tmux/plugins/macos-color-workaround rename to dot_config/tmux/plugins/executable_macos-color-workaround.tmpl index 3802b8a..bcc45ca --- a/tmux/.config/tmux/plugins/macos-color-workaround +++ b/dot_config/tmux/plugins/executable_macos-color-workaround.tmpl @@ -1,3 +1,4 @@ +{{ if and (lookPath "tmux") (eq .chezmoi.os "darwin") -}} #!/usr/bin/env bash if [ "$(uname -s)" == "Darwin" ]; then @@ -6,3 +7,4 @@ fi tmux set default-terminal "tmux-256color" tmux set terminal-overrides ",xterm-256color:Tc" +{{- end }} diff --git a/tmux/.config/tmux/plugins/tpm/CHANGELOG.md b/dot_config/tmux/plugins/tpm/CHANGELOG.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/CHANGELOG.md rename to dot_config/tmux/plugins/tpm/CHANGELOG.md diff --git a/tmux/.config/tmux/plugins/tpm/HOW_TO_PLUGIN.md b/dot_config/tmux/plugins/tpm/HOW_TO_PLUGIN.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/HOW_TO_PLUGIN.md rename to dot_config/tmux/plugins/tpm/HOW_TO_PLUGIN.md diff --git a/tmux/.config/tmux/plugins/tpm/LICENSE.md b/dot_config/tmux/plugins/tpm/LICENSE.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/LICENSE.md rename to dot_config/tmux/plugins/tpm/LICENSE.md diff --git a/tmux/.config/tmux/plugins/tpm/README.md b/dot_config/tmux/plugins/tpm/README.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/README.md rename to dot_config/tmux/plugins/tpm/README.md diff --git a/tmux/.config/tmux/plugins/tpm/bin/clean_plugins b/dot_config/tmux/plugins/tpm/bin/executable_clean_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/bin/clean_plugins rename to dot_config/tmux/plugins/tpm/bin/executable_clean_plugins diff --git a/tmux/.config/tmux/plugins/tpm/bin/install_plugins b/dot_config/tmux/plugins/tpm/bin/executable_install_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/bin/install_plugins rename to dot_config/tmux/plugins/tpm/bin/executable_install_plugins diff --git a/tmux/.config/tmux/plugins/tpm/bin/update_plugins b/dot_config/tmux/plugins/tpm/bin/executable_update_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/bin/update_plugins rename to dot_config/tmux/plugins/tpm/bin/executable_update_plugins diff --git a/tmux/.config/tmux/plugins/tpm/bindings/clean_plugins b/dot_config/tmux/plugins/tpm/bindings/executable_clean_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/bindings/clean_plugins rename to dot_config/tmux/plugins/tpm/bindings/executable_clean_plugins diff --git a/tmux/.config/tmux/plugins/tpm/bindings/install_plugins b/dot_config/tmux/plugins/tpm/bindings/executable_install_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/bindings/install_plugins rename to dot_config/tmux/plugins/tpm/bindings/executable_install_plugins diff --git a/tmux/.config/tmux/plugins/tpm/bindings/update_plugins b/dot_config/tmux/plugins/tpm/bindings/executable_update_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/bindings/update_plugins rename to dot_config/tmux/plugins/tpm/bindings/executable_update_plugins diff --git a/tmux/.config/tmux/plugins/tpm/docs/automatic_tpm_installation.md b/dot_config/tmux/plugins/tpm/docs/automatic_tpm_installation.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/docs/automatic_tpm_installation.md rename to dot_config/tmux/plugins/tpm/docs/automatic_tpm_installation.md diff --git a/tmux/.config/tmux/plugins/tpm/docs/changing_plugins_install_dir.md b/dot_config/tmux/plugins/tpm/docs/changing_plugins_install_dir.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/docs/changing_plugins_install_dir.md rename to dot_config/tmux/plugins/tpm/docs/changing_plugins_install_dir.md diff --git a/tmux/.config/tmux/plugins/tpm/docs/how_to_create_plugin.md b/dot_config/tmux/plugins/tpm/docs/how_to_create_plugin.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/docs/how_to_create_plugin.md rename to dot_config/tmux/plugins/tpm/docs/how_to_create_plugin.md diff --git a/tmux/.config/tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md b/dot_config/tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md rename to dot_config/tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md diff --git a/tmux/.config/tmux/plugins/tpm/docs/tpm_not_working.md b/dot_config/tmux/plugins/tpm/docs/tpm_not_working.md similarity index 100% rename from tmux/.config/tmux/plugins/tpm/docs/tpm_not_working.md rename to dot_config/tmux/plugins/tpm/docs/tpm_not_working.md diff --git a/tmux/.config/tmux/plugins/tpm/.gitattributes b/dot_config/tmux/plugins/tpm/dot_gitattributes similarity index 100% rename from tmux/.config/tmux/plugins/tpm/.gitattributes rename to dot_config/tmux/plugins/tpm/dot_gitattributes diff --git a/tmux/.config/tmux/plugins/tpm/.gitignore b/dot_config/tmux/plugins/tpm/dot_gitignore similarity index 100% rename from tmux/.config/tmux/plugins/tpm/.gitignore rename to dot_config/tmux/plugins/tpm/dot_gitignore diff --git a/tmux/.config/tmux/plugins/tpm/.gitmodules b/dot_config/tmux/plugins/tpm/dot_gitmodules similarity index 100% rename from tmux/.config/tmux/plugins/tpm/.gitmodules rename to dot_config/tmux/plugins/tpm/dot_gitmodules diff --git a/tmux/.config/tmux/plugins/tpm/.travis.yml b/dot_config/tmux/plugins/tpm/dot_travis.yml similarity index 100% rename from tmux/.config/tmux/plugins/tpm/.travis.yml rename to dot_config/tmux/plugins/tpm/dot_travis.yml diff --git a/tmux/.config/tmux/plugins/tpm/tpm b/dot_config/tmux/plugins/tpm/executable_tpm old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tpm rename to dot_config/tmux/plugins/tpm/executable_tpm diff --git a/tmux/.config/tmux/plugins/tpm/scripts/check_tmux_version.sh b/dot_config/tmux/plugins/tpm/scripts/executable_check_tmux_version.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/check_tmux_version.sh rename to dot_config/tmux/plugins/tpm/scripts/executable_check_tmux_version.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/clean_plugins.sh b/dot_config/tmux/plugins/tpm/scripts/executable_clean_plugins.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/clean_plugins.sh rename to dot_config/tmux/plugins/tpm/scripts/executable_clean_plugins.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/install_plugins.sh b/dot_config/tmux/plugins/tpm/scripts/executable_install_plugins.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/install_plugins.sh rename to dot_config/tmux/plugins/tpm/scripts/executable_install_plugins.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/source_plugins.sh b/dot_config/tmux/plugins/tpm/scripts/executable_source_plugins.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/source_plugins.sh rename to dot_config/tmux/plugins/tpm/scripts/executable_source_plugins.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/update_plugin.sh b/dot_config/tmux/plugins/tpm/scripts/executable_update_plugin.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/update_plugin.sh rename to dot_config/tmux/plugins/tpm/scripts/executable_update_plugin.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/update_plugin_prompt_handler.sh b/dot_config/tmux/plugins/tpm/scripts/executable_update_plugin_prompt_handler.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/update_plugin_prompt_handler.sh rename to dot_config/tmux/plugins/tpm/scripts/executable_update_plugin_prompt_handler.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/helpers/plugin_functions.sh b/dot_config/tmux/plugins/tpm/scripts/helpers/plugin_functions.sh similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/helpers/plugin_functions.sh rename to dot_config/tmux/plugins/tpm/scripts/helpers/plugin_functions.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh b/dot_config/tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh rename to dot_config/tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh b/dot_config/tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh rename to dot_config/tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/helpers/tmux_utils.sh b/dot_config/tmux/plugins/tpm/scripts/helpers/tmux_utils.sh similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/helpers/tmux_utils.sh rename to dot_config/tmux/plugins/tpm/scripts/helpers/tmux_utils.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/helpers/utility.sh b/dot_config/tmux/plugins/tpm/scripts/helpers/utility.sh similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/helpers/utility.sh rename to dot_config/tmux/plugins/tpm/scripts/helpers/utility.sh diff --git a/tmux/.config/tmux/plugins/tpm/scripts/variables.sh b/dot_config/tmux/plugins/tpm/scripts/variables.sh similarity index 100% rename from tmux/.config/tmux/plugins/tpm/scripts/variables.sh rename to dot_config/tmux/plugins/tpm/scripts/variables.sh diff --git a/tmux/.config/tmux/plugins/tpm/tests/expect_failed_plugin_download b/dot_config/tmux/plugins/tpm/tests/executable_expect_failed_plugin_download old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/expect_failed_plugin_download rename to dot_config/tmux/plugins/tpm/tests/executable_expect_failed_plugin_download diff --git a/tmux/.config/tmux/plugins/tpm/tests/expect_successful_clean_plugins b/dot_config/tmux/plugins/tpm/tests/executable_expect_successful_clean_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/expect_successful_clean_plugins rename to dot_config/tmux/plugins/tpm/tests/executable_expect_successful_clean_plugins diff --git a/tmux/.config/tmux/plugins/tpm/tests/expect_successful_multiple_plugins_download b/dot_config/tmux/plugins/tpm/tests/executable_expect_successful_multiple_plugins_download old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/expect_successful_multiple_plugins_download rename to dot_config/tmux/plugins/tpm/tests/executable_expect_successful_multiple_plugins_download diff --git a/tmux/.config/tmux/plugins/tpm/tests/expect_successful_plugin_download b/dot_config/tmux/plugins/tpm/tests/executable_expect_successful_plugin_download old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/expect_successful_plugin_download rename to dot_config/tmux/plugins/tpm/tests/executable_expect_successful_plugin_download diff --git a/tmux/.config/tmux/plugins/tpm/tests/expect_successful_update_of_a_single_plugin b/dot_config/tmux/plugins/tpm/tests/executable_expect_successful_update_of_a_single_plugin old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/expect_successful_update_of_a_single_plugin rename to dot_config/tmux/plugins/tpm/tests/executable_expect_successful_update_of_a_single_plugin diff --git a/tmux/.config/tmux/plugins/tpm/tests/expect_successful_update_of_all_plugins b/dot_config/tmux/plugins/tpm/tests/executable_expect_successful_update_of_all_plugins old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/expect_successful_update_of_all_plugins rename to dot_config/tmux/plugins/tpm/tests/executable_expect_successful_update_of_all_plugins diff --git a/tmux/.config/tmux/plugins/tpm/tests/test_plugin_clean.sh b/dot_config/tmux/plugins/tpm/tests/executable_test_plugin_clean.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/test_plugin_clean.sh rename to dot_config/tmux/plugins/tpm/tests/executable_test_plugin_clean.sh diff --git a/tmux/.config/tmux/plugins/tpm/tests/test_plugin_installation.sh b/dot_config/tmux/plugins/tpm/tests/executable_test_plugin_installation.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/test_plugin_installation.sh rename to dot_config/tmux/plugins/tpm/tests/executable_test_plugin_installation.sh diff --git a/tmux/.config/tmux/plugins/tpm/tests/test_plugin_installation_legacy.sh b/dot_config/tmux/plugins/tpm/tests/executable_test_plugin_installation_legacy.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/test_plugin_installation_legacy.sh rename to dot_config/tmux/plugins/tpm/tests/executable_test_plugin_installation_legacy.sh diff --git a/tmux/.config/tmux/plugins/tpm/tests/test_plugin_sourcing.sh b/dot_config/tmux/plugins/tpm/tests/executable_test_plugin_sourcing.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/test_plugin_sourcing.sh rename to dot_config/tmux/plugins/tpm/tests/executable_test_plugin_sourcing.sh diff --git a/tmux/.config/tmux/plugins/tpm/tests/test_plugin_update.sh b/dot_config/tmux/plugins/tpm/tests/executable_test_plugin_update.sh old mode 100755 new mode 100644 similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/test_plugin_update.sh rename to dot_config/tmux/plugins/tpm/tests/executable_test_plugin_update.sh diff --git a/tmux/.config/tmux/plugins/tpm/tests/helpers/tpm.sh b/dot_config/tmux/plugins/tpm/tests/helpers/tpm.sh similarity index 100% rename from tmux/.config/tmux/plugins/tpm/tests/helpers/tpm.sh rename to dot_config/tmux/plugins/tpm/tests/helpers/tpm.sh diff --git a/tmux/.config/tmux/tmux.conf b/dot_config/tmux/tmux.conf.tmpl similarity index 97% rename from tmux/.config/tmux/tmux.conf rename to dot_config/tmux/tmux.conf.tmpl index 6ed5b72..cf299e1 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/dot_config/tmux/tmux.conf.tmpl @@ -1,3 +1,4 @@ +{{ if lookPath "tmux" -}} ################################################################################ # Base configuration ################################################################################ @@ -32,7 +33,9 @@ set-option -g mouse on ################################################################################ # Colors ################################################################################ +{{ if eq .chezmoi.os "darwin" -}} run $XDG_CONFIG_HOME/tmux/plugins/macos-color-workaround +{{ end }} set -g status-fg white set -g status-bg black @@ -85,3 +88,4 @@ set -g @prefix_highlight_show_sync_mode 'on' set -g @prefix_highlight_sync_mode_attr 'fg=black,bg=green' # default is 'fg=default,bg=yellow' run $XDG_CONFIG_HOME/tmux/plugins/tpm/tpm +{{- end }} diff --git a/tmux/.config/zsh/zshrc.d/tmux.zsh b/dot_config/zsh/zshrc.d/tmux.zsh.tmpl similarity index 75% rename from tmux/.config/zsh/zshrc.d/tmux.zsh rename to dot_config/zsh/zshrc.d/tmux.zsh.tmpl index 34966d0..b4f1bb2 100644 --- a/tmux/.config/zsh/zshrc.d/tmux.zsh +++ b/dot_config/zsh/zshrc.d/tmux.zsh.tmpl @@ -1,4 +1,6 @@ +{{ if lookPath "tmux" -}} if [ "$TMUX" ]; then # TERM=tmux-256color does not work as expected on osx export TERM=screen-256color fi +{{- end }} diff --git a/tmux/.config/tmux/plugins/tpm/lib/tmux-test b/tmux/.config/tmux/plugins/tpm/lib/tmux-test deleted file mode 160000 index 33fa65f..0000000 --- a/tmux/.config/tmux/plugins/tpm/lib/tmux-test +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 33fa65fbfb72ba6dd106c21bf5ee6cc353ecdbb6