diff --git a/.gitmodules b/.gitmodules index 06e4480..ea787c2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,11 +4,6 @@ url = https://github.com/anishathalye/dotbot.git ignore = dirty -[submodule "dotbot-brew"] - path = tools/dotbot-brew - url = https://github.com/wren/dotbot-brew.git - ignore = dirty - [submodule "dotbot-include"] path = tools/dotbot-include url = https://gitlab.com/gnfzdz/dotbot-include.git @@ -29,11 +24,6 @@ url = https://github.com/tmux-plugins/tmux-sessionist.git ignore = dirty -[submodule "dotbot-pip"] - path = tools/dotbot-pip - url = https://github.com/sobolevn/dotbot-pip.git - ignore = dirty - [submodule "tmux/tmux-suspend"] path = config/tmux/plugins/tmux-suspend url = https://github.com/MunifTanjim/tmux-suspend.git @@ -63,6 +53,8 @@ [submodule "tmux/tmux-resurrect"] path = config/tmux/plugins/tmux-resurrect url = https://github.com/tmux-plugins/tmux-resurrect.git + ignore = dirty [submodule "tmux/catppuccin"] path = config/tmux/plugins/catppuccin url = https://github.com/catppuccin/tmux.git + ignore = dirty diff --git a/.ignore b/.ignore index 8fde71c..67e9861 100644 --- a/.ignore +++ b/.ignore @@ -6,6 +6,5 @@ config/tmux/plugins/** config/vim/plugged/** node_modules tools/antidote/** -tools/dotbot-brew/** tools/dotbot-include/** tools/dotbot/** diff --git a/add-submodules.sh b/add-submodules.sh index 14500c9..47d8949 100755 --- a/add-submodules.sh +++ b/add-submodules.sh @@ -5,12 +5,8 @@ git submodule sync --recursive # dotbot and plugins git submodule add --name dotbot \ -f https://github.com/anishathalye/dotbot.git tools/dotbot -git submodule add --name dotbot-brew \ - -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew git submodule add --name dotbot-include \ -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include -git submodule add --name dotbot-pip \ - -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip # other repos git submodule add --name cheat-community \ diff --git a/config/homebrew/Brewfile b/config/homebrew/Brewfile index 48821d5..b29b672 100644 --- a/config/homebrew/Brewfile +++ b/config/homebrew/Brewfile @@ -260,8 +260,6 @@ brew "php@8.2", link: true brew "php@8.3" # Pins GitHub Actions to full hashes and versions brew "pinact" -# Execute binaries from Python packages in isolated environments -brew "pipx" # Python version management brew "pyenv" # Migrate pip packages from one Python version to another diff --git a/install b/install index a8439ef..6d4fbf5 100755 --- a/install +++ b/install @@ -15,10 +15,7 @@ git submodule update --init --recursive "${DOTBOT_DIR}" "${DOTBOT_BIN_PATH}" \ -d "${BASEDIR}" \ - --plugin-dir=tools/dotbot-asdf \ - --plugin-dir=tools/dotbot-brew \ --plugin-dir=tools/dotbot-include \ - --plugin-dir=tools/dotbot-pip \ -c "${CONFIG}" \ "${@}" @@ -29,10 +26,7 @@ if [ "${DOTBOT_HOST}" != "" ]; then echo "(!) Found $DOTBOT_HOST_CONFIG" && "$DOTBOT_BIN_PATH" \ -d "$BASEDIR" \ - --plugin-dir=tools/dotbot-asdf \ - --plugin-dir=tools/dotbot-brew \ --plugin-dir=tools/dotbot-include \ - --plugin-dir=tools/dotbot-pip \ -c "$DOTBOT_HOST_CONFIG" \ "${@}" fi diff --git a/install.conf.yaml b/install.conf.yaml index ff2eaa6..8953823 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -78,8 +78,3 @@ - shell: # Use my dotfiles manager to install everything - bash local/bin/dfm install all - -- pipx: - file: tools/requirements-pipx.txt - stdout: true - stderr: true diff --git a/tools/dotbot-brew b/tools/dotbot-brew deleted file mode 160000 index 98e3463..0000000 --- a/tools/dotbot-brew +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98e346360b7f610334c343bd818290628bedd171 diff --git a/tools/dotbot-pip b/tools/dotbot-pip deleted file mode 160000 index 4d0cc11..0000000 --- a/tools/dotbot-pip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4d0cc116e851384f0b2ef830782bba79e495e4b8 diff --git a/tools/requirements-pipx.txt b/tools/requirements-pipx.txt deleted file mode 100644 index 6e7e34e..0000000 --- a/tools/requirements-pipx.txt +++ /dev/null @@ -1 +0,0 @@ -openapi-python-client