diff --git a/.config/nvim/lua/user/lsp/installer.lua b/.config/nvim/lua/user/lsp/installer.lua index af1aa07..055f935 100644 --- a/.config/nvim/lua/user/lsp/installer.lua +++ b/.config/nvim/lua/user/lsp/installer.lua @@ -9,11 +9,5 @@ lsp_installer.on_server_ready(function(server) capabilities = require("user.lsp.handlers").capabilities, } - if server.name == "jsonls" then - opts.settings = { - json = { schemas = require("nlspsettings.jsonls").get_default_schemas() }, - } - end - server:setup(opts) end) diff --git a/.config/nvim/lua/user/lsp/nlsp.lua b/.config/nvim/lua/user/lsp/nlsp.lua index 0b45199..19a49ac 100644 --- a/.config/nvim/lua/user/lsp/nlsp.lua +++ b/.config/nvim/lua/user/lsp/nlsp.lua @@ -6,5 +6,6 @@ end nlspsettings.setup({ config_home = vim.fn.stdpath("config") .. "/lua/user/lsp/settings", local_settings_root_markers = { ".git" }, - jsonls_append_default_schemas = true, + append_default_schemas = true, + loader = "json", }) diff --git a/.config/nvim/lua/user/lsp/settings/volar.json b/.config/nvim/lua/user/lsp/settings/volar.json index 0db3279..dc08669 100644 --- a/.config/nvim/lua/user/lsp/settings/volar.json +++ b/.config/nvim/lua/user/lsp/settings/volar.json @@ -1,3 +1,3 @@ { - + "volar.takeOverMode.enabled": true } diff --git a/.config/nvim/lua/user/whitespace.lua b/.config/nvim/lua/user/whitespace.lua index d9abc3e..d9d2c5a 100644 --- a/.config/nvim/lua/user/whitespace.lua +++ b/.config/nvim/lua/user/whitespace.lua @@ -11,4 +11,5 @@ vim.g.better_whitespace_filetypes_blacklist = { "help", "markdown", "fugitive", + "toggleterm", } diff --git a/.zshrc b/.zshrc index 0d24cb2..76ec486 100644 --- a/.zshrc +++ b/.zshrc @@ -112,6 +112,10 @@ source /usr/share/nvm/init-nvm.sh # Make GPG work in WSL export GPG_TTY=$(tty) +# Set FUCK +eval $(thefuck --alias fuck) +eval $(thefuck --alias FUCK) + # Set starship Prompt eval "$(starship init zsh)"