Neovim updates

5 files changed, 45 insertions, 45 deletions

diff --git a/.config/nvim/lua/opt.lua b/.config/nvim/lua/opt.lua
index ebb99e2..d062a61 100644
--- a/.config/nvim/lua/opt.lua
+++ b/.config/nvim/lua/opt.lua
@@ -1,5 +1,3 @@
-vim.cmd("colorscheme mine")
-
 vim.o.termguicolors = true
 vim.o.relativenumber = true
 vim.o.number = true
diff --git a/.config/nvim/lua/plugin/init.lua b/.config/nvim/lua/plugin/init.lua
index 8dc2b6f..4e60f98 100644
--- a/.config/nvim/lua/plugin/init.lua
+++ b/.config/nvim/lua/plugin/init.lua
@@ -1,2 +1,3 @@
 require("plugin.packer")
 require("plugin.setup")
+require("plugin.lsp")
diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua
index 6563a6f..51e116e 100644
--- a/.config/nvim/lua/plugin/lsp.lua
+++ b/.config/nvim/lua/plugin/lsp.lua
@@ -3,26 +3,29 @@ local lspconfig = require("lspconfig")
 
 lsp.preset("recommended")
 
-lsp.ensure_installed {
-  "lua_ls",
-  "clangd",
-  "cmake",
-}
-
-local cmp = require("cmp")
-local cmp_select = { behavior = cmp.SelectBehavior.Select }
-local cmp_mappings = lsp.defaults.cmp_mappings {
-  ["<down>"] = cmp.mapping.select_next_item(cmp_select),
-  ["<up>"] = cmp.mapping.select_prev_item(cmp_select),
-  ["<C-a>"] = cmp.mapping.confirm({ select = true }),
-  ["<CR>"] = cmp.mapping.confirm({ select = true }),
-}
+lspconfig.lua_ls.setup {}
+lspconfig.clangd.setup {}
 
-lsp.setup_nvim_cmp {
-  mapping = cmp_mappings
+require('mason').setup {}
+require('mason-lspconfig').setup {
+  ensure_installed = {
+    "lua_ls",
+    "clangd",
+  },
+  handlers = {
+    lsp.default_setup,
+  },
 }
 
-lsp.set_preferences {
+local cmp = require('cmp')
+cmp.setup {
+  mapping = cmp.mapping.preset.insert({
+    -- `Enter` key to confirm completion
+    ['<CR>'] = cmp.mapping.confirm({select = false}),
+    -- `Tab` key to navigate
+    ['<S-Tab>'] = cmp.mapping.select_prev_item({behavior = 'select'}),
+    ['<Tab>'] = cmp.mapping.select_next_item({behavior = 'select'}),
+  })
 }
 
 lsp.on_attach(function(_, buffer)
diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua
index a2ac451..a78e85a 100644
--- a/.config/nvim/lua/plugin/packer.lua
+++ b/.config/nvim/lua/plugin/packer.lua
@@ -1,27 +1,27 @@
 return require("packer").startup(function(use)
-  use { "wbthomason/packer.nvim" }
+  use {"wbthomason/packer.nvim"}
   
   use {
     "nvim-telescope/telescope.nvim",
     requires = {
-      { "nvim-lua/plenary.nvim" }
+      { "nvim-lua/plenary.nvim"}
     },
   }
 
-  use { "Yggdroot/indentLine" }
-  use { "windwp/nvim-autopairs" }
-  use { "airblade/vim-gitgutter" }
+  use {"Yggdroot/indentLine"}
+  use {"windwp/nvim-autopairs"}
+  use {"airblade/vim-gitgutter"}
 
   use {
     "folke/trouble.nvim",
     requires = {
-      { "nvim-tree/nvim-web-devicons" },
+      { "nvim-tree/nvim-web-devicons"},
     }
   }
 
-  use { "tpope/vim-fugitive" }
-  use { "numToStr/Comment.nvim" }
-  use { "HiPhish/nvim-ts-rainbow2" }
+  use {"tpope/vim-fugitive"}
+  use {"numToStr/Comment.nvim"}
+  use {"HiPhish/nvim-ts-rainbow2"}
   
   use {
     "VonHeikemen/lsp-zero.nvim",
@@ -45,9 +45,9 @@ return require("packer").startup(function(use)
     }
   }
 
-  use { "tikhomirov/vim-glsl" }
+  use {"tikhomirov/vim-glsl"}
 
-  use { "michaeljsmith/vim-indent-object" }
+  use {"michaeljsmith/vim-indent-object"}
 
   use {
     "nvim-treesitter/nvim-treesitter",
@@ -55,6 +55,13 @@ return require("packer").startup(function(use)
   }
 
   use {
+    "loctvl842/monokai-pro.nvim",
+    config = function()
+      vim.cmd("colorscheme monokai-pro-spectrum")
+    end
+  }
+
+  use {
     "danymat/neogen",
     requires = "nvim-treesitter/nvim-treesitter"
   }
diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua
index 4cce77b..4e0bf01 100644
--- a/.config/nvim/lua/plugin/setup.lua
+++ b/.config/nvim/lua/plugin/setup.lua
@@ -17,35 +17,26 @@ local neogen = require("neogen")
 
 neogen.setup {
   snippet_engine = "luasnip",
-  languages = {
-    cs = {
-      template = {
-        annotation_convention = "xmldoc",
-      },
-    },
-  },
 }
 
-local opts = {
+vim.keymap.set("n", "<leader>df", "<CMD>Neogen<CR>", {
   silent = true,
-}
-
-vim.keymap.set("n", "<leader>df", "<CMD>Neogen<CR>", opts)
+})
 
 require("nvim-treesitter.configs").setup {
-  ensure_installed = { "c", "rust", "lua", "vimdoc" },
-  sync_install = false,
+  ensure_installed = { "c", "cpp", "lua", "vimdoc" },
+  sync_install = true,
   highlight = {
     enable = true,
     additional_vim_regex_highlighting = true,
   },
-  indent = { enable = false },
+  indent = { enable = true },
   rainbow = {
     enable = true,
   }
 }
 
-do 
+do
   local builtin = require("telescope.builtin")
   vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
   vim.keymap.set("n", "<leader>fg", builtin.git_files, {})