diff --git a/nvim/dot-config/nvim/after/plugin/catppuccin.lua b/nvim/dot-config/nvim/after/plugin/catppuccin.lua index 2bf14af..0d46507 100644 --- a/nvim/dot-config/nvim/after/plugin/catppuccin.lua +++ b/nvim/dot-config/nvim/after/plugin/catppuccin.lua @@ -3,17 +3,13 @@ if not ok then return end -vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha - catppuccin.setup { - compile = { - enabled = true, - path = vim.fn.stdpath "cache" .. "/catppuccin", - }, + flavour = "mocha", -- latte, frappe, macchiato, mocha + transparent_background = true, dim_inactive = { - enabled = true, - shade = "dark", - percentage = 0.15, + enabled = false, + -- shade = "dark", + -- percentage = 0.15, }, integrations = { cmp = true, @@ -23,6 +19,7 @@ catppuccin.setup { enabled = true, colored_indent_levels = false, }, + mason = true, native_lsp = { enabled = true, virtual_text = { @@ -43,4 +40,4 @@ catppuccin.setup { }, } -vim.cmd [[colorscheme catppuccin ]] +vim.cmd.colorscheme "catppuccin" diff --git a/nvim/dot-config/nvim/after/plugin/lspconfig.lua b/nvim/dot-config/nvim/after/plugin/lspconfig.lua index 21c7036..c574f63 100644 --- a/nvim/dot-config/nvim/after/plugin/lspconfig.lua +++ b/nvim/dot-config/nvim/after/plugin/lspconfig.lua @@ -148,6 +148,9 @@ local servers = { cmd = { "elixir-ls" } }, tsserver = {}, + psalm = { + cmd = { "vendor/bin/psalm-language-server" }, + }, } for lsp, settings in pairs(servers) do diff --git a/nvim/dot-config/nvim/after/plugin/null-ls.lua b/nvim/dot-config/nvim/after/plugin/null-ls.lua index a65ff54..e7fce19 100644 --- a/nvim/dot-config/nvim/after/plugin/null-ls.lua +++ b/nvim/dot-config/nvim/after/plugin/null-ls.lua @@ -7,6 +7,9 @@ null.setup { sources = { null.builtins.diagnostics.eslint, null.builtins.diagnostics.shellcheck, - null.builtins.formatting.prettierd + -- null.builtins.diagnostics.psalm.with { + -- prefer_local = "vendor/bin", + -- }, + null.builtins.formatting.prettierd, } }