From 5862f80607c48f135158a2be34637246a89df124 Mon Sep 17 00:00:00 2001 From: Riley Smith Date: Tue, 26 Dec 2023 00:39:28 -0800 Subject: [PATCH] chore: update zshrc,env --- dot_config/astronvim/lua/user/plugins/user.lua | 13 +++++++++++++ dot_zshenv_darwin | 1 - dot_zshrc_darwin | 15 ++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dot_config/astronvim/lua/user/plugins/user.lua b/dot_config/astronvim/lua/user/plugins/user.lua index acdbf63..2fb24c7 100644 --- a/dot_config/astronvim/lua/user/plugins/user.lua +++ b/dot_config/astronvim/lua/user/plugins/user.lua @@ -9,4 +9,17 @@ return { -- require("lsp_signature").setup() -- end, -- }, + { + "zbirenbaum/copilot.lua", + cmd = "Copilot", + event = "InsertEnter", + config = function() + require("copilot").setup({}) + end, + }, + { + "andweeb/presence.nvim", + config = true, + lazy = false, + }, } diff --git a/dot_zshenv_darwin b/dot_zshenv_darwin index 9ce2316..1c64095 100644 --- a/dot_zshenv_darwin +++ b/dot_zshenv_darwin @@ -1,4 +1,3 @@ . "$HOME/.cargo/env" . "$HOME/.tokens" -export THEOS=~/theos # ssh-add --apple-use-keychain ~/.ssh/id\_ed25519 2>/dev/null diff --git a/dot_zshrc_darwin b/dot_zshrc_darwin index 756fd46..cc65aa3 100644 --- a/dot_zshrc_darwin +++ b/dot_zshrc_darwin @@ -51,8 +51,6 @@ alias cn="code-insiders ." # cd to z alias cd="z" -export VOLTA_HOME="$HOME/.volta" -export PATH="$VOLTA_HOME/bin:$PATH" # tabtab source for packages # uninstall by removing these lines @@ -65,6 +63,12 @@ export PATH="$VOLTA_HOME/bin:$PATH" export BUN_INSTALL="/Users/rileysmith/.bun" export PATH="$BUN_INSTALL/bin:$PATH" +# android +export ANDROID_HOME=$HOME/Library/Android/sdk +export PATH=$PATH:$ANDROID_HOME/emulator +export PATH=$PATH:$ANDROID_HOME/platform-tools +export JAVA_HOME=`/usr/libexec/java_home -v 17.0.8` + # zoxide eval "$(zoxide init zsh)" @@ -74,13 +78,18 @@ if [[ $TERM_PROGRAM != "WarpTerminal" ]]; then test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" fi + ( if ! ssh-add -l >/dev/null 2>&1; then ssh-add --apple-load-keychain >/dev/null 2>&1 fi & ) - #znap function _sshadd ssh 'eval "$(ssh-add --apple-load-keychain)"' # compctl -K _sshadd ssh source /Users/riley/.docker/init-zsh.sh || true # Added by Docker Desktop + +export NVM_DIR="$HOME/.config/nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +export PATH=$PATH:/Users/riley/.spicetify