mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fixes issues

This commit is contained in:
aliaksandrkotau 2023-12-13 12:41:51 +01:00
parent cf94eeb38c
commit 542c7cd3fb
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init.lua
View File

@ -230,11 +230,7 @@ require('lazy').setup({
branch = '0.1.x', branch = '0.1.x',
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', 'nvim-lua/plenary.nvim',
<<<<<<< HEAD
-- Fuzzy Finder Algorithm which requires local dependencies to be lbuilt.
=======
-- Fuzzy Finder Algorithm which requires local dependencies to be built. -- Fuzzy Finder Algorithm which requires local dependencies to be built.
>>>>>>> origin/master
-- Only load if `make` is available. Make sure you have the system -- Only load if `make` is available. Make sure you have the system
-- requirements installed. -- requirements installed.
{ {
@ -271,12 +267,9 @@ require('lazy').setup({
-- --
-- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
-- { import = 'custom.plugins' }, -- { import = 'custom.plugins' },
<<<<<<< HEAD
{ {
'skywind3000/vim-quickui', 'skywind3000/vim-quickui',
} }
=======
>>>>>>> origin/master
}, {}) }, {})
-- [[ Setting options ]] -- [[ Setting options ]]
@ -284,11 +277,7 @@ require('lazy').setup({
-- NOTE: You can change these options as you wish! -- NOTE: You can change these options as you wish!
-- Set highlight on search -- Set highlight on search
<<<<<<< HEAD
vim.o.hlsearch = true vim.o.hlsearch = true
=======
vim.o.hlsearch = false
>>>>>>> origin/master
-- Make line numbers default -- Make line numbers default
vim.wo.number = true vim.wo.number = true
@ -671,7 +660,6 @@ cmp.setup {
}, },
} }
<<<<<<< HEAD
vim.cmd [[ vim.cmd [[
call quickui#menu#install('&MyMenu', [ call quickui#menu#install('&MyMenu', [
\ ['&MyEntry', 'echo "Hello, world!"'], \ ['&MyEntry', 'echo "Hello, world!"'],
@ -681,7 +669,5 @@ vim.cmd [[
vim.api.nvim_set_keymap('n', '<leader>m', ':call quickui#menu#open()<CR>', { noremap = true }) vim.api.nvim_set_keymap('n', '<leader>m', ':call quickui#menu#open()<CR>', { noremap = true })
vim.g.quickui_color_scheme = 'onedark' vim.g.quickui_color_scheme = 'onedark'
=======
>>>>>>> origin/master
-- The line beneath this is called `modeline`. See `:help modeline` -- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et -- vim: ts=2 sts=2 sw=2 et