dotfiles

Author: Kyle Fuller <kyle@fuller.li> 2024-03-21 22:43:58 +0000 +0000
Committer: Kyle Fuller <kyle@fuller.li> 2024-03-21 22:43:58 +0000 +0000
Commit: a5974d41ab3a1c89df935c0e91dac7740f8cbb12
Parent: f4bd153ad8c6a1f6b4be12fb9f4b9b715d304d05


refactor(vim): migrate nvim specific config to nvim
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index ea984b44e6d38bf387d9f31a897a3ebe19673d2e..be1b8b6bff60f333fbb9d68ccf49c79da8b6abb4 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -3,3 +3,31 @@ let &packpath = &runtimepath
 source ~/.vim/vimrc
 
 set inccommand=nosplit
+
+lua <<EOF
+  require'lspconfig'.ansiblels.setup{}
+  require'lspconfig'.bashls.setup{}
+  require'lspconfig'.gopls.setup{}
+  require'lspconfig'.pyright.setup{}
+  require'lspconfig'.sourcekit.setup{}
+  require'lspconfig'.terraformls.setup{}
+
+  local cmp = require'cmp'
+  cmp.setup({
+    snippet = {
+      expand = function(args)
+        vim.fn["vsnip#anonymous"](args.body)
+      end,
+    },
+    mapping = {
+      ['<C-Space>'] = cmp.mapping.complete(),
+      ['<C-e>'] = cmp.mapping.abort(),
+      ['<CR>'] = cmp.mapping.confirm({ select = true }),
+    },
+    sources = {
+      { name = 'nvim_lsp' },
+      { name = 'vsnip' },
+      { name = 'buffer' },
+    }
+  })
+EOF
diff --git a/.vim/vimrc b/.vim/vimrc
index 3d3ccad48a464231f89fb9e549e8897a58bebd5e..3fd5de219bae02d6996662cd17a24f4df3169f6b 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -138,31 +138,3 @@ imap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
 smap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
 imap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
 smap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
-
-lua <<EOF
-  require'lspconfig'.ansiblels.setup{}
-  require'lspconfig'.bashls.setup{}
-  require'lspconfig'.gopls.setup{}
-  require'lspconfig'.pyright.setup{}
-  require'lspconfig'.sourcekit.setup{}
-  require'lspconfig'.terraformls.setup{}
-
-  local cmp = require'cmp'
-  cmp.setup({
-    snippet = {
-      expand = function(args)
-        vim.fn["vsnip#anonymous"](args.body)
-      end,
-    },
-    mapping = {
-      ['<C-Space>'] = cmp.mapping.complete(),
-      ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = cmp.mapping.confirm({ select = true }),
-    },
-    sources = {
-      { name = 'nvim_lsp' },
-      { name = 'vsnip' },
-      { name = 'buffer' },
-    }
-  })
-EOF