refined completion

This commit is contained in:
Ivar Fatland
2024-05-25 19:36:02 +02:00
parent 304161d619
commit 1d1c1f439c
+19 -36
View File
@@ -1,9 +1,4 @@
-- GENERAL SETTINGS -- GENERAL SETTINGS
---@type installed_themes
local colorscheme = 'habamax'
vim.o.termguicolors = true
vim.cmd('colorscheme ' .. colorscheme)
vim.cmd [[ autocmd VimEnter * NoMatchParen ]] vim.cmd [[ autocmd VimEnter * NoMatchParen ]]
do do
local leader_key = ',' local leader_key = ','
@@ -323,29 +318,6 @@ vim.keymap.set(
{ silent = true } { silent = true }
) )
---@alias installed_themes
---| 'blue'
---| 'darkblue'
---| 'default'
---| 'delek'
---| 'desert'
---| 'elflord'
---| 'evening'
---| 'habamax'
---| 'industry'
---| 'koehler'
---| 'lunaperche'
---| 'morning'
---| 'murphy'
---| 'pablo'
---| 'peachpuff'
---| 'quiet'
---| 'ron'
---| 'shine'
---| 'slate'
---| 'torte'
---| 'zellner'
-- LAZY.NVIM BOOTSTRAP -- LAZY.NVIM BOOTSTRAP
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then if not (vim.uv or vim.loop).fs_stat(lazypath) then
@@ -393,13 +365,13 @@ require('lazy').setup(
require('snippy').setup({ require('snippy').setup({
enable_auto = true, enable_auto = true,
mappings = { mappings = {
is = { -- is = {
['<Tab>'] = 'expand_or_advance', -- ['<Tab>'] = 'expand_or_advance',
['<S-Tab>'] = 'previous', -- ['<S-Tab>'] = 'previous',
}, -- },
nx = { -- nx = {
['<leader>x'] = 'cut_text', -- ['<leader>x'] = 'cut_text',
}, -- },
}, },
}) })
end end
@@ -423,7 +395,9 @@ require('lazy').setup(
{name = 'nvim_lsp'}, {name = 'nvim_lsp'},
}, },
mapping = { mapping = {
['<Tab>'] = cmp.mapping.confirm({select = true}), ['<c-j>'] = function (_) cmp.confirm({select = true}) end,
['<c-k>'] = function (_) snippy.next() end,
['<c-h>'] = function (_) snippy.previous() end,
}, },
} }
end, end,
@@ -475,5 +449,14 @@ require('lazy').setup(
end, end,
}, },
{ 'sainnhe/everforest', -- THE THEME SETUP
lazy = false,
priority = 1000,
config = function()
vim.o.termguicolors = true
vim.g.everforest_enable_italic = true
vim.cmd.colorscheme('everforest')
end,
},
} }
) )