Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Cleanup #104

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Here's a short description of each script in this repository:
- `macos.sh` configure several macOS settings
- `install.sh` install fonts, tools, and apps using Homebrew, [`uv`](https://docs.astral.sh/uv/), and the Mac App Store
- `dock.sh` configure macOS dock
- `code.sh` install Cursor extensions
martimlobao marked this conversation as resolved.
Show resolved Hide resolved
- `local.sh` final local settings, like configuring git user details and registering apps using keys stored in 1Password
- `bash_traceback.sh` helper script used by other scripts to print a more helpful traceback on failure (does nothing by itself)

Expand Down
4 changes: 2 additions & 2 deletions code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ done
extensions_file="${root}/linkme/.config/code/extensions.txt"

export_extensions() {
printf "\n📲 \033[1;34mExporting extensions from %s to extensions.txt...\033[0m\n\n" "$2"
printf "📲 \033[1;34mExporting extensions from %s to extensions.txt...\033[0m\n\n" "$2"
$1 --list-extensions >"${extensions_file}"
printf "✅ \033[1;32mExtensions exported to extensions.txt\033[0m\n"
}

sync_extensions() {
printf "\n📲 \033[1;34mSyncing extensions for %s...\033[0m\n\n" "$2"
printf "📲 \033[1;34mSyncing extensions for %s...\033[0m\n\n" "$2"
local installed to_remove=()

# Get currently installed extensions
Expand Down
4 changes: 0 additions & 4 deletions linkme/.config/code/extensions.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
1password.op-vscode
ban.spellright
batisteo.vscode-django
bierner.emojisense
bierner.markdown-mermaid
Expand All @@ -10,14 +9,12 @@ davidanson.vscode-markdownlint
dbaeumer.vscode-eslint
dnicolson.binary-plist
donjayamanne.githistory
donjayamanne.python-environment-manager
donjayamanne.python-extension-pack
dorzey.vscode-sqlfluff
dotjoshjohnson.xml
eamodio.gitlens
eliverlara.andromeda
esbenp.prettier-vscode
file-icons.file-icons
formulahendry.code-runner
github.remotehub
github.vscode-github-actions
Expand Down Expand Up @@ -63,7 +60,6 @@ njpwerner.autodocstring
pnp.polacode
redhat.vscode-yaml
richie5um2.vscode-sort-json
searking.preview-vscode
snowflake.snowflake-vsc
stkb.rewrap
streetsidesoftware.code-spell-checker
Expand Down
21 changes: 10 additions & 11 deletions linkme/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -74,34 +74,33 @@ ZSH_CUSTOM=$ZSH/custom
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(
1password
auto-notify
autojump
git
thefuck
)

source $ZSH/oh-my-zsh.sh

# Activate Homebrew-installed plugins
source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

source $ZSH/oh-my-zsh.sh

# Load the shell dotfiles, and then some:
# * ~/.extra can be used for other settings you don't want to commit.
for file in ~/.{aliases,exports,functions,extra}; do
[ -r "$file" ] && [ -f "$file" ] && source "$file";
done;
unset file;

# 1Password completion and plugins
eval "$(op completion zsh)"; compdef _op op
source "$HOME/.config/op/plugins.sh"

# Starship complettion
# Starship completion
eval "$(starship init zsh)"

# Shell completion for uv, uvx, and ruff
eval "$(uv generate-shell-completion zsh)"
eval "$(uvx --generate-shell-completion zsh)"
eval "$(ruff generate-shell-completion zsh)"

# Load the shell dotfiles, and then some:
# * ~/.extra can be used for other settings you don't want to commit.
for file in ~/.{aliases,exports,functions,extra}; do
[ -r "$file" ] && [ -f "$file" ] && source "$file";
done;
unset file;