fixed bad merge
This commit is contained in:
parent
824a3679e7
commit
05fb616c60
55
init.lua
55
init.lua
|
@ -91,7 +91,7 @@ vim.g.mapleader = ' '
|
|||
vim.g.maplocalleader = ' '
|
||||
|
||||
-- Set to true if you have a Nerd Font installed
|
||||
vim.g.have_nerd_font = false
|
||||
vim.g.have_nerd_font = true
|
||||
|
||||
-- [[ Setting options ]]
|
||||
-- See `:help vim.opt`
|
||||
|
@ -237,7 +237,7 @@ vim.opt.rtp:prepend(lazypath)
|
|||
-- :Lazy update
|
||||
--
|
||||
-- NOTE: Here is where you install your plugins.
|
||||
require('lazy').setup({
|
||||
require('lazy').setup {
|
||||
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
|
||||
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
|
||||
|
||||
|
@ -331,15 +331,12 @@ require('lazy').setup({
|
|||
},
|
||||
{ 'nvim-telescope/telescope-ui-select.nvim' },
|
||||
|
||||
<<<<<<< HEAD
|
||||
-- Useful for getting pretty icons, but requires special font.
|
||||
-- If you already have a Nerd Font, or terminal set up with fallback fonts
|
||||
-- you can enable this
|
||||
{ 'nvim-tree/nvim-web-devicons' },
|
||||
=======
|
||||
-- Useful for getting pretty icons, but requires a Nerd Font.
|
||||
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
|
||||
>>>>>>> upstream/master
|
||||
},
|
||||
config = function()
|
||||
-- Telescope is a fuzzy finder that comes with a lot of different things that
|
||||
|
@ -840,35 +837,31 @@ require('lazy').setup({
|
|||
-- This is the easiest way to modularize your config.
|
||||
--
|
||||
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
||||
<<<<<<< HEAD
|
||||
-- For additional information see: :help lazy.nvim-lazy.nvim-structuring-your-plugins
|
||||
{ import = 'custom.plugins' },
|
||||
-- Doesnt need to work
|
||||
-- {
|
||||
-- ui = {
|
||||
-- -- If you have a Nerd Font, set icons to an empty table which will use the
|
||||
-- -- default lazy.nvim defined Nerd Font icons otherwise define a unicode icons table
|
||||
-- icons = vim.g.have_nerd_font and {} or {
|
||||
-- cmd = '⌘',
|
||||
-- config = '🛠',
|
||||
-- event = '📅',
|
||||
-- ft = '📂',
|
||||
-- init = '⚙',
|
||||
-- keys = '🗝',
|
||||
-- plugin = '🔌',
|
||||
-- runtime = '💻',
|
||||
-- require = '🌙',
|
||||
-- source = '📄',
|
||||
-- start = '🚀',
|
||||
-- task = '📌',
|
||||
-- lazy = '💤 ',
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
}
|
||||
=======
|
||||
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
|
||||
-- { import = 'custom.plugins' },
|
||||
}, {
|
||||
ui = {
|
||||
-- If you have a Nerd Font, set icons to an empty table which will use the
|
||||
-- default lazy.nvim defined Nerd Font icons otherwise define a unicode icons table
|
||||
icons = vim.g.have_nerd_font and {} or {
|
||||
cmd = '⌘',
|
||||
config = '🛠',
|
||||
event = '📅',
|
||||
ft = '📂',
|
||||
init = '⚙',
|
||||
keys = '🗝',
|
||||
plugin = '🔌',
|
||||
runtime = '💻',
|
||||
require = '🌙',
|
||||
source = '📄',
|
||||
start = '🚀',
|
||||
task = '📌',
|
||||
lazy = '💤 ',
|
||||
},
|
||||
},
|
||||
})
|
||||
>>>>>>> upstream/master
|
||||
|
||||
-- The line beneath this is called `modeline`. See `:help modeline`
|
||||
-- vim: ts=2 sts=2 sw=2 et
|
||||
|
|
Loading…
Reference in New Issue