diff --git a/.config/nvim/lua/tovi/plugins/lsp/lspconfig.lua b/.config/nvim/lua/tovi/plugins/lsp/lspconfig.lua index 0a3e5bb..91c6bb5 100644 --- a/.config/nvim/lua/tovi/plugins/lsp/lspconfig.lua +++ b/.config/nvim/lua/tovi/plugins/lsp/lspconfig.lua @@ -179,5 +179,12 @@ return { }, }, }) + + -- configure python server + lspconfig["dartls"].setup({ + capabilities = capabilities, + on_attach = on_attach, + }) + end, } diff --git a/.zshrc b/.zshrc index 5cda07b..1b498a5 100644 --- a/.zshrc +++ b/.zshrc @@ -192,30 +192,22 @@ function cdf () { export PATH="/usr/local/opt/php@7.4/bin:$PATH" export PATH="/usr/local/opt/php@7.4/sbin:$PATH" -# eval "$(starship init zsh)" +if [[ $(uname) == 'Darwin' ]]; then +export PATH="/opt/homebrew/lib/ruby/gems/3.3.0:$PATH" +export PATH="/opt/homebrew/Cellar/ruby/3.3.0/lib/ruby/gems/3.3.0:$PATH" +fi export LESS='-R' export LESSOPEN='|~/.lessfilter %s' -export QT_QPA_PLATFORMTHEME="qt5ct" - -# Open tmux when new interactive shell -#if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then -# exec tmux -#fi - - export ANDROID_HOME=$HOME/Android/Sdk +if [[ $(uname) == 'Darwin' ]]; then + export ANDROID_HOME=$HOME/Library/Android/sdk + export PATH="/opt/homebrew/opt/openjdk/bin:$PATH" +fi export PATH=$PATH:$ANDROID_HOME/platform-tools export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin -export ANDROID_SDK_ROOT='/opt/android-sdk' -export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools/ -export PATH=$PATH:$ANDROID_SDK_ROOT/tools/bin/ -export PATH=$PATH:$ANDROID_ROOT/emulator -export PATH=$PATH:$ANDROID_SDK_ROOT/tools/ -export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin - export PATH="/run/user/1000/fnm_multishells/20590_1663546026606/bin":$PATH export FNM_MULTISHELL_PATH="/run/user/1000/fnm_multishells/20590_1663546026606" export FNM_VERSION_FILE_STRATEGY="local" @@ -226,3 +218,7 @@ export FNM_ARCH="x64" rehash export PHPCS_STANDARD=~/.config/phpcs.xml + +if [[ $(uname) == 'Darwin' ]]; then + eval "$(rbenv init - zsh)" +fi