From f4530abf704dd1c773e86c392b18f422cabe029d Mon Sep 17 00:00:00 2001 From: himkt Date: Thu, 5 Dec 2024 23:05:36 +0900 Subject: [PATCH 1/2] misc: cleanup unused recipes and configs --- Makefile | 47 +++-------------------------------- poetry/bin/setup.sh | 14 ----------- poetry/config.d/config.toml | 2 -- rye/bin/clean.sh | 3 --- sheldon/bin/setup.sh | 4 --- sheldon/config.d/plugins.toml | 17 ------------- 6 files changed, 3 insertions(+), 84 deletions(-) delete mode 100755 poetry/bin/setup.sh delete mode 100644 poetry/config.d/config.toml delete mode 100755 rye/bin/clean.sh delete mode 100755 sheldon/bin/setup.sh delete mode 100644 sheldon/config.d/plugins.toml diff --git a/Makefile b/Makefile index 283d7537..04f36831 100644 --- a/Makefile +++ b/Makefile @@ -2,34 +2,9 @@ RED := $(shell tput setaf 1) NOCOLOR := $(shell tput sgr0) -.PHONY: \ - all docs brew \ - base cli gui \ +.PHONY: all docs \ cargo git \ - nvim poetry tmux uv zsh - -all: clean base docs - -# ========================= - -brew: - $(PWD)/brew/bin/setup.sh - -brew-base: - brew bundle --verbose --no-lock --file=$(PWD)/brew/config.d/base/Brewfile - -brew-optional: - brew bundle --verbose --no-lock --file=$(PWD)/brew/config.d/optional/Brewfile - -brew-gui: - brew bundle --verbose --no-lock --file=$(PWD)/brew/config.d/gui/Brewfile - -krew-base: - kubectl krew install open-svc oidc-login ns images ctx hns stern neat - -# ========================= - -base: cargo git tmux zsh + nvim tmux uv zsh cargo: cargo_clean $(PWD)/cargo/bin/setup.sh @@ -46,12 +21,6 @@ nvim: nvim_clean poetry: poetry_clean $(PWD)/poetry/bin/setup.sh -rye: rye_clean - curl -sSf https://rye-up.com/get | bash - -sheldon: sheldon_clean - $(PWD)/sheldon/bin/setup.sh - tmux: tmux_clean $(PWD)/tmux/bin/setup.sh @@ -68,7 +37,7 @@ zsh: zsh_clean clean: \ cargo_clean \ - git_clean nvim_clean poetry_clean \ + git_clean nvim_clean \ tmux_clean zsh_clean cargo_clean: @@ -87,16 +56,6 @@ nvim_clean: rm -rf $(HOME)/.vim rm -rf $(HOME)/.config/nvim -poetry_clean: - rm -rf $(HOME)/.config/pypoetry - rm -rf $(HOME)/Library/Application\ Support/pypoetry - -rye_clean: - ./rye/bin/clean.sh - -sheldon_clean: - rm -rf $(HOME)/.config/sheldon - tmux_clean: rm -rf $(HOME)/.tmux.conf diff --git a/poetry/bin/setup.sh b/poetry/bin/setup.sh deleted file mode 100755 index d87c02ca..00000000 --- a/poetry/bin/setup.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -case ${OSTYPE} in - darwin*) - POETRY_HOME="$HOME/Library/Application Support/pypoetry" - ;; - linux*) - POETRY_HOME="$HOME/.config/pypoetry" - ;; -esac - -mkdir -p "$POETRY_HOME" -rm -f "$POETRY_HOME/config.toml" -ln -s "$PWD/poetry/config.d/config.toml" "$POETRY_HOME/config.toml" diff --git a/poetry/config.d/config.toml b/poetry/config.d/config.toml deleted file mode 100644 index ab1033bd..00000000 --- a/poetry/config.d/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[virtualenvs] -in-project = true diff --git a/rye/bin/clean.sh b/rye/bin/clean.sh deleted file mode 100755 index ae82c882..00000000 --- a/rye/bin/clean.sh +++ /dev/null @@ -1,3 +0,0 @@ -if command -v rye > /dev/null; then - rye self uninstall -fi diff --git a/sheldon/bin/setup.sh b/sheldon/bin/setup.sh deleted file mode 100755 index fd6b5ef6..00000000 --- a/sheldon/bin/setup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -mkdir -p "$HOME/.config/sheldon" -ln -s "$PWD/sheldon/config.d/plugins.toml" "$HOME/.config/sheldon/plugins.toml" diff --git a/sheldon/config.d/plugins.toml b/sheldon/config.d/plugins.toml deleted file mode 100644 index d501f3aa..00000000 --- a/sheldon/config.d/plugins.toml +++ /dev/null @@ -1,17 +0,0 @@ -shell = "zsh" - -[templates] -macos_source = ''' -if [[ "$OSTYPE" = darwin* ]]; then - {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" - {% endfor %}{{ hooks?.post | nl }} -fi -''' - -[plugins.zsh-autosuggestions] -github = 'zsh-users/zsh-autosuggestions' -apply = ['source'] - -[plugins.zsh-syntax-highlighting] -github = 'zsh-users/zsh-syntax-highlighting' -apply = ['source'] From 7c1d0d813383daec9ec9d84d6520507070dab787 Mon Sep 17 00:00:00 2001 From: himkt Date: Thu, 5 Dec 2024 23:06:43 +0900 Subject: [PATCH 2/2] misc: update GHA workflow --- .github/workflows/main.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5f818197..664b3385 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,14 +20,3 @@ jobs: run: | cp -r $GITHUB_WORKSPACE $HOME/dotfiles && cd $HOME/dotfiles make - - - name: make {brew,brew-optional} - run: | - make brew - make brew-base - make brew-optional - - - name: zsh - run: | - make zsh - make sheldon