diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua index cff2387..78b1ce2 100644 --- a/.config/nvim/after/plugin/lspconfig.lua +++ b/.config/nvim/after/plugin/lspconfig.lua @@ -24,31 +24,31 @@ lspconfig.cssls.setup { capabilities = capabilities, } lspconfig.lua_ls.setup {} -require('roslyn').setup({ - config = { - settings = { - ["csharp|inlay_hints"] = { - csharp_enable_inlay_hints_for_implicit_object_creation = true, - csharp_enable_inlay_hints_for_implicit_variable_types = true, - csharp_enable_inlay_hints_for_lambda_parameter_types = true, - csharp_enable_inlay_hints_for_types = true, - dotnet_enable_inlay_hints_for_indexer_parameters = true, - dotnet_enable_inlay_hints_for_literal_parameters = true, - dotnet_enable_inlay_hints_for_object_creation_parameters = true, - dotnet_enable_inlay_hints_for_other_parameters = true, - dotnet_enable_inlay_hints_for_parameters = true, - dotnet_suppress_inlay_hints_for_parameters_that_differ_only_by_suffix = true, - dotnet_suppress_inlay_hints_for_parameters_that_match_argument_name = true, - dotnet_suppress_inlay_hints_for_parameters_that_match_method_intent = true, - }, - }, - }, - exe = { - "dotnet", - vim.fs.joinpath(vim.fn.stdpath("data"), "roslyn", "Microsoft.CodeAnalysis.LanguageServer.dll"), - }, - filewatching = true, -}) +-- require('roslyn').setup({ +-- config = { +-- settings = { +-- ["csharp|inlay_hints"] = { +-- csharp_enable_inlay_hints_for_implicit_object_creation = true, +-- csharp_enable_inlay_hints_for_implicit_variable_types = true, +-- csharp_enable_inlay_hints_for_lambda_parameter_types = true, +-- csharp_enable_inlay_hints_for_types = true, +-- dotnet_enable_inlay_hints_for_indexer_parameters = true, +-- dotnet_enable_inlay_hints_for_literal_parameters = true, +-- dotnet_enable_inlay_hints_for_object_creation_parameters = true, +-- dotnet_enable_inlay_hints_for_other_parameters = true, +-- dotnet_enable_inlay_hints_for_parameters = true, +-- dotnet_suppress_inlay_hints_for_parameters_that_differ_only_by_suffix = true, +-- dotnet_suppress_inlay_hints_for_parameters_that_match_argument_name = true, +-- dotnet_suppress_inlay_hints_for_parameters_that_match_method_intent = true, +-- }, +-- }, +-- }, +-- exe = { +-- "dotnet", +-- vim.fs.joinpath(vim.fn.stdpath("data"), "roslyn", "Microsoft.CodeAnalysis.LanguageServer.dll"), +-- }, +-- filewatching = true, +-- }) vim.api.nvim_create_autocmd('LspAttach', { @@ -71,12 +71,32 @@ vim.api.nvim_create_autocmd('LspAttach', { end, }) +-- require('blink').setup({ +-- cmp = { +-- sources = { +-- { name = 'lsp' }, +-- { name = 'buffer' }, +-- { name = 'path' }, +-- { name = 'snippets' }, +-- }, +-- mapping = { +-- [''] = 'select_next', +-- [''] = 'select_prev', +-- [''] = 'confirm', +-- [''] = 'trigger', +-- }, +-- snippets = { +-- expand = function(args) +-- -- Optional: integrate with luasnip if you still use it +-- require('luasnip').lsp_expand(args.body) +-- end +-- } +-- } +-- }) + local cmp = require('cmp') local cmp_select = { behavior = cmp.SelectBehavior.Select } --- this is the function that loads the extra snippets to luasnip --- from rafamadriz/friendly-snippets -require('luasnip.loaders.from_vscode').lazy_load() cmp.setup({ sources = { diff --git a/.config/nvim/after/plugin/mason-lspconfig.lua b/.config/nvim/after/plugin/mason-lspconfig.lua index 280ae45..7baee14 100644 --- a/.config/nvim/after/plugin/mason-lspconfig.lua +++ b/.config/nvim/after/plugin/mason-lspconfig.lua @@ -3,6 +3,7 @@ require("mason-lspconfig").setup { ensure_installed = { "lua_ls", "cssls", "angularls", + "gopls", "ts_ls", "eslint" }, } diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index ad95526..2598172 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,24 +1,23 @@ { - "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dotnet.nvim": { "branch": "main", "commit": "8c35ce02f8a4b785cd9b5ce6c8bb1cf934ccc3da" }, - "everforest-nvim": { "branch": "main", "commit": "308c024bc1fcb7e179eb9551ba5f69dae1737d2b" }, + "dotnet.nvim": { "branch": "main", "commit": "f5c52f9f52a3d8ca8dff6916c2228fb41a075274" }, + "everforest-nvim": { "branch": "main", "commit": "2eb7c348f880ba93de4d98cae049c9441f5d4d49" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, - "lsp-zero.nvim": { "branch": "v4.x", "commit": "b8411704591ae8e1501f1b9b31c801c09927baac" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neogit": { "branch": "master", "commit": "9959b58a897036ce89d47385021db1f716613399" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "dd329912c8d446240584a2dbcd3802af3a19105a" }, - "nvim-treesitter": { "branch": "master", "commit": "621f5901f0b3e762cc4c5ed0f9246cf1495193ad" }, - "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, - "packer.nvim": { "branch": "master", "commit": "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "roslyn.nvim": { "branch": "main", "commit": "d36bc977177c919c191f9f0190d71417ba0b055c" }, - "telescope.nvim": { "branch": "master", "commit": "b324469959908c1c7434eb65d80e87895e6828f7" }, - "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, - "vim-merginal": { "branch": "develop", "commit": "9ae2f12132d3ab8871d9dd6f8371149e826b7818" } + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2cb844268288ccc06b8d0f368ef3c2b195e8278c" }, + "mason.nvim": { "branch": "main", "commit": "1aceba8bc158b5aaf90649077cad06744bc23ac4" }, + "neogit": { "branch": "master", "commit": "6de4b9f9a92917f9aea3a0dbdc3dbbedc11d26be" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" }, + "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "roslyn.nvim": { "branch": "main", "commit": "8dc729a651ae980088246caf651e5ff24e21077a" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" }, + "vim-merginal": { "branch": "develop", "commit": "3dca10fd8bce10edbc2024651db4ffb6dd2d89de" } } diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua index 9818682..79524fd 100644 --- a/.config/nvim/lua/wicked/lazy.lua +++ b/.config/nvim/lua/wicked/lazy.lua @@ -18,7 +18,6 @@ vim.opt.rtp:prepend(lazypath) -- Setup lazy.nvim require("lazy").setup({ spec = { - 'wbthomason/packer.nvim', { 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } @@ -49,22 +48,29 @@ require("lazy").setup({ 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons', lazy = true } }, + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-buffer', + 'hrsh7th/nvim-cmp', + 'L3MON4D3/LuaSnip', + -- { + -- "saghen/blink.nvim", + -- config = function() + -- require("blink").setup({ + -- modules = { + -- cmp = true, + -- luasnip = true, + -- -- optionally enable more: lsp, luasnip, etc. + -- }, + -- }) + -- end + -- }, - { - 'VonHeikemen/lsp-zero.nvim', - dependencies = { - { 'hrsh7th/nvim-cmp' }, - { 'hrsh7th/cmp-nvim-lsp' }, - { 'L3MON4D3/LuaSnip' }, - } - }, { 'MoaidHathot/dotnet.nvim', config = function() require("dotnet").setup({}) end }, - -- add your plugins here }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. diff --git a/.vim/undodir/%Users%radumaco%.local%share%nvim%lazy%nvim-cmp%lua%cmp%context.lua b/.vim/undodir/%Users%radumaco%.local%share%nvim%lazy%nvim-cmp%lua%cmp%context.lua new file mode 100644 index 0000000..a7d8a9f Binary files /dev/null and b/.vim/undodir/%Users%radumaco%.local%share%nvim%lazy%nvim-cmp%lua%cmp%context.lua differ diff --git a/.vim/undodir/%Users%radumaco%GolandProjects%goboy%cpu%cpu_test.go b/.vim/undodir/%Users%radumaco%GolandProjects%goboy%cpu%cpu_test.go new file mode 100644 index 0000000..e61057e Binary files /dev/null and b/.vim/undodir/%Users%radumaco%GolandProjects%goboy%cpu%cpu_test.go differ diff --git a/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%after%plugin%lspconfig.lua b/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%after%plugin%lspconfig.lua new file mode 100644 index 0000000..9946c6f Binary files /dev/null and b/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%after%plugin%lspconfig.lua differ diff --git a/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%after%plugin%mason-lspconfig.lua b/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%after%plugin%mason-lspconfig.lua new file mode 100644 index 0000000..c68459c Binary files /dev/null and b/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%after%plugin%mason-lspconfig.lua differ diff --git a/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%lua%wicked%lazy.lua b/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%lua%wicked%lazy.lua new file mode 100644 index 0000000..a9a559f Binary files /dev/null and b/.vim/undodir/%Users%radumaco%Projects%setup%.config%nvim%lua%wicked%lazy.lua differ diff --git a/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%DocumentPostRequest.cs b/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%DocumentPostRequest.cs index 5af0c60..5f25005 100644 Binary files a/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%DocumentPostRequest.cs and b/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%DocumentPostRequest.cs differ diff --git a/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%ExpensePostRequest.cs b/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%ExpensePostRequest.cs index dcca6af..96a0536 100644 Binary files a/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%ExpensePostRequest.cs and b/.vim/undodir/%home%rmaco%projects%homefull-api%Homefull.API%ViewModels%request%ExpensePostRequest.cs differ