diff --git a/homeConfig/dotfiles/nvim/lua/config/autocmds.lua b/homeConfig/dotfiles/nvim/lua/config/autocmds.lua index a00bc37..0c63cd2 100644 --- a/homeConfig/dotfiles/nvim/lua/config/autocmds.lua +++ b/homeConfig/dotfiles/nvim/lua/config/autocmds.lua @@ -4,7 +4,7 @@ local lsp = require('lsp-zero').preset({}) lsp.on_attach(function(client, bufnr) - lsp.default_keymaps({buffer = bufnr}) + lsp.default_keymaps({ buffer = bufnr }) end) -- When you don't have mason.nvim installed @@ -21,7 +21,9 @@ lsp.setup_servers({ 'jsonls', 'diagnosticls', 'lua_ls', - 'marksman' + 'marksman', + 'purescriptls', + 'tailwindcss' }) -- (Optional) Configure lua language server for neovim @@ -29,7 +31,7 @@ require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls()) lsp.setup() -local cmp = require'cmp' +local cmp = require 'cmp' cmp.setup { snippet = { expand = function(args) @@ -44,7 +46,11 @@ cmp.setup { -- other configurations... } -local luasnip = require'luasnip' +vim.cmd [[ + au BufRead,BufNewFile *.purs set filetype=purescript +]] + +local luasnip = require 'luasnip' cmp.setup { -- other configurations... @@ -69,3 +75,4 @@ cmp.setup { end, { 'i', 's' }), }, } + diff --git a/homeConfig/dotfiles/nvim/lua/plugins/core.lua b/homeConfig/dotfiles/nvim/lua/plugins/core.lua index 429687b..968b02b 100644 --- a/homeConfig/dotfiles/nvim/lua/plugins/core.lua +++ b/homeConfig/dotfiles/nvim/lua/plugins/core.lua @@ -15,7 +15,7 @@ return { }, {'williamboman/mason.nvim', enabled = false }, - + { 'VonHeikemen/lsp-zero.nvim', branch = 'v2.x', @@ -29,31 +29,10 @@ return { {'hrsh7th/cmp-nvim-lsp'}, -- Required {'L3MON4D3/LuaSnip'}, -- Required } -} +}, + + +{ 'raichoo/purescript-vim' }, +{ 'vmchale/dhall-vim'}, --- { --- "neovim/nvim-lspconfig", --- ---@class PluginLspOpts --- opts = { --- ---@type lspconfig.options --- servers = { --- html = {}, --- cssls = {}, --- jsonls = {}, --- marksman = {}, --- tsserver = {}, --- tailwindcss = {}, --- volar = {}, --- --- lua_ls = {}, --- --- nil_ls = {}, --- pyright = {}, --- --- --hls = {}, --- rust_analyzer = {}, --- diagnosticls = {}, --- }, --- }, --- }, } diff --git a/homeConfig/home.nix b/homeConfig/home.nix index d77c6e0..84aa21c 100644 --- a/homeConfig/home.nix +++ b/homeConfig/home.nix @@ -73,6 +73,9 @@ python3 python311Packages.pip + + purescript + spago # LSPs nodePackages.vscode-langservers-extracted @@ -81,6 +84,8 @@ nodePackages.diagnostic-languageserver nodePackages.volar nodePackages.pyright + nodePackages.purescript-language-server + nodePackages."@tailwindcss/language-server" haskell-language-server nil marksman