Author: Kyle Fuller <kyle@fuller.li> 2024-04-03 21:29:35 +0100 +0100
Committer: Kyle Fuller <kyle@fuller.li> 2024-04-03 21:33:03 +0100 +0100
Commit: 6a9a09e230581237e72a7b559d226266aef2cd2c
Parent: abe89aef3820e1c75cc98317c602190387171eff
refactor(nvim): separation of configuration files
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5bf0c5c269d69a17c5f0abb85d1cca375e183380..05cda075c24a7131ccd8f6a92e7908163cc6237e 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -5,38 +5,5 @@
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{}
- require('lspconfig').yamlls.setup {
- settings = {
- yaml = {
- schemas = {
- ["https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"] = "docker-compose.yaml",
- },
- },
- }
- }
-
- 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' },
- }
- })
+ require 'kyle'
EOF
diff --git a/.config/nvim/lua/kyle/init.lua b/.config/nvim/lua/kyle/init.lua
new file mode 100644
index 0000000000000000000000000000000000000000..0c4b72417795826db5f69a85581b93c0be8aa3d5
--- /dev/null
+++ b/.config/nvim/lua/kyle/init.lua
@@ -0,0 +1 @@
+require('kyle.lspconfig')
diff --git a/.config/nvim/lua/kyle/lspconfig.lua b/.config/nvim/lua/kyle/lspconfig.lua
new file mode 100644
index 0000000000000000000000000000000000000000..2f0e2a54d4324e299b8f16c0e5dd7acaa9c75335
--- /dev/null
+++ b/.config/nvim/lua/kyle/lspconfig.lua
@@ -0,0 +1,36 @@
+require'lspconfig'.ansiblels.setup{}
+require'lspconfig'.bashls.setup{}
+require'lspconfig'.gopls.setup{}
+require'lspconfig'.pyright.setup{}
+require'lspconfig'.sourcekit.setup{}
+require'lspconfig'.terraformls.setup{}
+require('lspconfig').yamlls.setup {
+ settings = {
+ yaml = {
+ schemas = {
+ ["https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"] = "docker-compose.yaml",
+ },
+ },
+ }
+}
+
+local cmp = require'cmp'
+cmp.setup({
+ snippet = {
+ expand = function(args)
+ vim.fn["vsnip#anonymous"](args.body)
+ end,
+ },
+ mapping = {
+ ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
+ ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
+ ['<C-y>'] = cmp.mapping.confirm({ select = true }),
+ ['<C-Space>'] = cmp.mapping.complete(),
+ ['<C-e>'] = cmp.mapping.abort(),
+ },
+ sources = {
+ { name = 'nvim_lsp' },
+ { name = 'vsnip' },
+ { name = 'buffer' },
+ }
+})