diff --git a/cli/node/yarn.zsh b/cli/node/yarn.zsh index 6528557..4e93b05 100644 --- a/cli/node/yarn.zsh +++ b/cli/node/yarn.zsh @@ -1,3 +1,4 @@ -alias yarn='yarn --use-yarnrc "$XDG_CONFIG_HOME/yarn/config"' +# alias yarn='yarn --use-yarnrc "$XDG_CONFIG_HOME/yarn/config"' +source /usr/share/nvm/init-nvm.sh export PATH=$PATH:~/.local/share/npm/bin diff --git a/cli/profile/config/profile b/cli/profile/config/profile index 6199e04..89f7ffd 100644 --- a/cli/profile/config/profile +++ b/cli/profile/config/profile @@ -30,7 +30,6 @@ export XINITRC=$XDG_CONFIG_HOME/X11/xinitrc export XSERVERRC=$XDG_CONFIG_HOME/X11/xserverrc export PYTHONSTARTUP=$XDG_CONFIG_HOME/pythonstartup.py export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history" -export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export WGETRC="$XDG_CONFIG_HOME/wgetrc" export PUB_CACHE="$XDG_CACHE_HOME/pub-cache" export OMNISHARPHOME="$XDG_DATA_HOME/omnisharp" diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua b/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua index 5b051d6..602c834 100644 --- a/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua +++ b/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua @@ -65,6 +65,7 @@ lspconfig.jsonls.setup({ }, }, }) +table.insert(servers, "jsonls") lspconfig.sumneko_lua.setup({ diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua b/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua index bf7958c..15c8318 100644 --- a/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua +++ b/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua @@ -9,7 +9,7 @@ end vim.cmd [[ augroup lsp au! - au FileType java,scala,sbt lua require("metals").initialize_or_attach(metals_config) + au FileType scala,sbt lua require("metals").initialize_or_attach(metals_config) augroup end ]] diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/null-ls.lua b/nvim/nvim/config/nvim.ln/lua/lsp/null-ls.lua index d49ab0b..c3baa1d 100644 --- a/nvim/nvim/config/nvim.ln/lua/lsp/null-ls.lua +++ b/nvim/nvim/config/nvim.ln/lua/lsp/null-ls.lua @@ -9,6 +9,7 @@ local sources = { nl.builtins.diagnostics.eslint_d, nl.builtins.formatting.eslint_d, nl.builtins.formatting.prettierd, + nl.builtins.formatting.black, } nl.setup({ debug = false,