Cheeky sync

5 files changed, 63 insertions, 24 deletions

diff --git a/.config/nvim/lua/autocomplete.lua b/.config/nvim/lua/autocomplete.lua
index 1f8798d..775a407 100644
--- a/.config/nvim/lua/autocomplete.lua
+++ b/.config/nvim/lua/autocomplete.lua
@@ -49,4 +49,12 @@
       { name = 'buffer' }
     }
   })
-
+  -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+  cmp.setup.cmdline(':', {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = cmp.config.sources({
+      { name = 'path' }
+    }, {
+      { name = 'cmdline' }
+    })
+  })
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 8a8d603..3e60028 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -39,14 +39,55 @@ require("rust-tools").setup({
 	server = {
 		capabilities = capabilities,
 		on_attach = on_attach,
+    settings = {
+      ['rust-analyzer'] = {
+        cargo = {
+          features = "all"
+        }
+      }
+    }
 	}
 })
 
+-- https://github.com/ray-x/go.nvim#lsp-cmp-support
+require('go').setup({
+  lsp_cfg = {
+    capabilities = capabilities,
+    on_attach = on_attach
+  }
+})
+
+-- https://github.com/nikeee/dot-language-server
+-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#dotls
+require("lspconfig")['dotls'].setup({
+	server = {
+		capabilities = capabilities,
+		on_attach = on_attach,
+	}
+})
+
+
+require('lspconfig').yamlls.setup{
+  settings = {
+    yaml = {
+      -- FIX mapKeyOrder warning
+      keyOrdering = false,
+    },
+  }
+}
 
 -- close quickfix menu after selecting choice
 vim.api.nvim_create_autocmd(
   "FileType", {
   pattern={"qf"},
   command=[[nnoremap <buffer> <CR> <CR>:cclose<CR>]]})
+
+vim.api.nvim_create_autocmd('BufWritePre', {
+  pattern = '*.go',
+  callback = function()
+    vim.lsp.buf.code_action({ context = { only = { 'source.organizeImports' } }, apply = true })
+  end
+})
+
 -- local autocmd = vim.api.nvim_create_autocmd
 -- autocmd({ "BufLeave" }, { pattern = { "*" }, command = "if &buftype == 'quickfix'|q|endif" })
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index 5a0050f..5cf1654 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -27,26 +27,6 @@ end
 
 
 -- PLUGINS
--- Keymaps for Luasnip
-local ls = require("luasnip")
-vim.keymap.set({ "i", "s" }, "<C-k>", function()
-	if ls.expand_or_jumpable() then
-		ls.expand_or_jump()
-	end
-end, { silent = true })
-
-vim.keymap.set({ "i", "s" }, "<C-j>", function()
-	if ls.jumpable(-1) then
-		ls.jump(-1)
-	end
-end, { silent = true })
-
-vim.keymap.set("i", "<C-l>", function()
-	if ls.choice_active() then
-		ls.change_choice(1)
-	end
-end)
-
 -- Find files using Telescope command-line sugar.
 nmap("<C-p>", "<cmd>Telescope find_files<cr>")
 nmap("<leader>f", "<cmd>Telescope live_grep<cr>")
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index d1d671f..36e43ad 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -54,7 +54,9 @@ return require('packer').startup(function()
   use 'hrsh7th/cmp-nvim-lsp'
   use 'hrsh7th/cmp-nvim-lsp-signature-help'
   use "hrsh7th/cmp-path"
-  use 'L3MON4D3/LuaSnip'
+  use 'hrsh7th/cmp-vsnip'
+  use 'hrsh7th/vim-vsnip'
+
   use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
   use 'scrooloose/nerdcommenter' -- commenting shortcuts
   use {
@@ -77,13 +79,22 @@ return require('packer').startup(function()
   use 'kyazdani42/nvim-web-devicons' -- icons when searching
 
   -- go
-  use 'fatih/vim-go'
+  use 'ray-x/go.nvim'
 
   -- rust
   use 'rust-lang/rust.vim'
   use 'simrat39/rust-tools.nvim'
 
+  -- ember
+  use 'joukevandermaas/vim-ember-hbs'
+
   -- debugging
   use 'nvim-lua/plenary.nvim'
   use 'mfussenegger/nvim-dap'
+
+  use { "johmsalas/text-case.nvim",
+  config = function()
+    require('textcase').setup {}
+  end
+}
 end)
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index cdeb772..dab30f7 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -99,7 +99,6 @@ vim.o.wildignore = 'deps,.svn,CVS,.git,.hg,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,
 -- https://sharksforarms.dev/posts/neovim-rust/
 local format_sync_grp = vim.api.nvim_create_augroup("Format", {})
 vim.api.nvim_create_autocmd("BufWritePre", {
-  pattern = "*.rs",
   callback = function()
     vim.lsp.buf.format({ timeout_ms = 200 })
   end,