Added previous vim config autocommand to neovim, Updated lua-snip and argwrap plugins configurations

3 files changed, 37 insertions, 29 deletions

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index d046567..4e050a9 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -54,8 +54,8 @@ local augroup = vim.api.nvim_create_augroup("cacharle_init_group", {})
 vim.api.nvim_create_autocmd(
     "BufWritePost",
     {
-        command = "source <afile> | PackerCompile",
         pattern = "plugins.lua",
+        command = "source <afile> | PackerCompile",
         group = augroup
     }
 )
@@ -63,13 +63,28 @@ vim.api.nvim_create_autocmd(
 -- remove trailing white space on save
 vim.api.nvim_create_autocmd(
     "BufWritePre",
-    { command = [[ %s/\s\+$//e ]], pattern = "*", group = augroup }
+    { pattern = "*", command = [[ %s/\s\+$//e ]], group = augroup }
 )
 
 -- set filttype for *.sql.j2 files
 vim.api.nvim_create_autocmd(
     "BufReadPre",
-    { command = "set ft=sql", pattern = "*.sql.j2", group = augroup }
+    { pattern = "*.sql.j2", command = "set ft=sql", group = augroup }
+)
+
+-- -- Format go files on save
+-- vim.api.nvim_create_autocmd(
+--     "BufWritePre",
+--     { command = [[ !go fmt % ]], pattern = "*.go", group = augroup }
+-- )
+
+vim.api.nvim_create_autocmd(
+    "FileType",
+    { pattern = "haskell", command = [[ set formatprg=stylish-haskell ]], group = augroup }
+)
+vim.api.nvim_create_autocmd(
+    "FileType",
+    { pattern = "lisp,html,css,htmldjango", command = [[ setlocal shiftwidth=2 ]], group = augroup }
 )
 
 require("mappings")
diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua
index 50c57e2..5373a4e 100644
--- a/config/nvim/lua/mappings.lua
+++ b/config/nvim/lua/mappings.lua
@@ -26,25 +26,6 @@ map('n', ' ?', '?\v', {})
 map('c', '<C-j>', '<down>', {})
 map('c', '<C-k>', '<up>', {})
 
--- -- hook
--- -- remove trailing white space on save
--- autocmd vimrc BufWritePre * %s/\s\+$//e
--- -- dirty hack to disable this feature on markdown (autocmd! wouldn't work)
--- autocmd vimrc BufReadPre *.md autocmd! BufWritePre
-
-
--- augroup vimrc_files
---     autocmd!
---     -- school c
---     autocmd Filetype c setlocal noexpandtab
---     autocmd Filetype c setlocal comments=s:/**,m:**,e:*/,s:/*,m:**,e:*/
---     -- std::cout << ... << std::endl; shortcut
---     autocmd Filetype cpp nnoremap <leader>cout istd::cout <<  << std::endl;<ESC>2F<hi
---     autocmd Filetype vim setlocal foldmethod=marker -- vim fold method to marker
---     autocmd FileType haskell set formatprg=stylish-haskell
---     autocmd FileType lisp,html,css,htmldjango setlocal shiftwidth=2
--- augroup END
-
 -- python breakpoints
 vim.cmd [[ autocmd FileType python nmap <leader>bd mq:g/^\s*breakpoint()$/d<cr>`q ]]
 vim.cmd [[ autocmd FileType python nmap <leader>ba mqobreakpoint()<esc>`q ]]
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 3cb003a..a4b4f0c 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -4,11 +4,18 @@ return require("packer").startup(function()
     use "wbthomason/packer.nvim"    -- plugin manager (can manage itself)
     use "junegunn/vim-easy-align"   -- align
     use "AndrewRadev/sideways.vim"  -- Move arguments sideways
-    use "FooSoft/vim-argwrap"       -- Put arguments on multiple lines
     use "tpope/vim-eunuch"          -- basic commands on current file (Rename/Remove)
     use "romainl/vim-cool"          -- only highlight search matches when searching
     use "lukas-reineke/indent-blankline.nvim"
 
+    -- Put arguments on multiple lines
+    use {
+        "FooSoft/vim-argwrap",
+        config = function()
+            vim.g.argwrap_tail_comma = 1
+        end
+    }
+
     use {
         "jpalardy/vim-slime",
         config = function()
@@ -195,12 +202,12 @@ return require("packer").startup(function()
             local luasnip = require("luasnip")
             cmp.setup {
                 mapping = cmp.mapping.preset.insert({
-                    ["<C-n>"] = cmp.mapping.select_next_item(),
-                    ["<C-p>"] = cmp.mapping.select_prev_item(),
+                    -- ["<C-n>"] = cmp.mapping.select_next_item(),
+                    -- ["<C-p>"] = cmp.mapping.select_prev_item(),
                     ["<C-b>"] = cmp.mapping.scroll_docs(-4),
                     ["<C-f>"] = cmp.mapping.scroll_docs(4),
-
-                    ["<Tab>"] = cmp.mapping(function(fallback)
+                    ["<Tab>"] = cmp.mapping.confirm({ select = true }),
+                    ["<C-n>"] = cmp.mapping(function(fallback)
                         if cmp.visible() then
                             cmp.select_next_item()
                         elseif luasnip.expand_or_jumpable() then
@@ -211,8 +218,7 @@ return require("packer").startup(function()
                             fallback()
                         end
                     end, { "i", "s" }),
-
-                    ["<S-Tab>"] = cmp.mapping(function(fallback)
+                    ["<C-p>"] = cmp.mapping(function(fallback)
                         if cmp.visible() then
                             cmp.select_prev_item()
                         elseif luasnip.jumpable(-1) then
@@ -224,6 +230,7 @@ return require("packer").startup(function()
                 }),
                 -- order of the sources matter (first are higher priority)
                 sources = {
+                    { name = "luasnip" },
                     { name = "nvim_lsp" },
                     { name = "nvim_lsp_signature_help" },
                     { name = "path" },
@@ -245,6 +252,11 @@ return require("packer").startup(function()
                 experimental = {
                     ghost_text = true,
                 },
+                snippet = {
+                    expand = function(args)
+                        luasnip.lsp_expand(args.body)
+                    end
+                }
             }
         end
     }