diff --git a/dependencies/homebrew.txt b/dependencies/homebrew.txt index af4078e..c60ab17 100644 --- a/dependencies/homebrew.txt +++ b/dependencies/homebrew.txt @@ -8,6 +8,7 @@ lua-language-server nodenv nodenv/nodenv/nodenv-default-packages pinentry-mac +pyenv rbenv ruby-build rust diff --git a/install.zsh b/install.zsh index d07e3b4..2d296ef 100755 --- a/install.zsh +++ b/install.zsh @@ -24,7 +24,6 @@ pushd tmux/.config/tmux/plugins git -C tpm pull || git clone git@github.com:tmux-plugins/tpm.git tpm popd - echo "Linking files" stow --dotfiles -t ~ zsh stow --dotfiles -t ~ ruby diff --git a/nvim/.config/nvim/lua/yock/plugins/lsp.lua b/nvim/.config/nvim/lua/yock/plugins/lsp.lua index 26f1c9c..fd623ef 100644 --- a/nvim/.config/nvim/lua/yock/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/yock/plugins/lsp.lua @@ -9,6 +9,15 @@ return { local capabilities = require('cmp_nvim_lsp').default_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true + lspconfig.pylsp.setup({ capabilities = capabilities }) + lspconfig.ruff_lsp.setup({ + capabilities = capabilities, + init_options = { + settings = { + args = { '--preview' }, + }, + }, + }) lspconfig.tsserver.setup({ capabilities = capabilities }) lspconfig.ruby_lsp.setup({ capabilities = capabilities }) lspconfig.angularls.setup({ capabilities = capabilities }) @@ -41,6 +50,7 @@ return { }) lspconfig.gopls.setup({ capabilities = capabilities }) lspconfig.rust_analyzer.setup({ capabilities = capabilities }) + lspconfig.sourcekit.setup({ capabilities = capabilities }) vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('UserLspConfig', {}), diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc index 73dfa52..afcccfa 100644 --- a/zsh/dot-zshrc +++ b/zsh/dot-zshrc @@ -1,7 +1,16 @@ source ~/.env +# rbenv eval "$(rbenv init -)" + +# nodenv eval "$(nodenv init -)" + +# pyenv +export PYENV_ROOT="$HOME/.pyenv" +[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" + eval "$(zoxide init --cmd cd zsh)" if type brew &>/dev/null; then @@ -26,9 +35,17 @@ export COMPLETION_WAITING_DOTS="true" export TERM="xterm-256color" export GPG_TTY=$(tty) export EDITOR="nvim" +export GREP_COLOR="1;36" export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1)" export PATH="$HOME/go/bin:$(npm -g bin):/usr/local/sbin:$PATH" +# Enable color support of ls +if ls --color=auto &>/dev/null; then + alias ls='ls -p --color=auto' +else + alias ls='ls -p -G' +fi + for file in $HOME/.functions/*.zsh; do source $file done