Fix formatting | Handle a edgecase in telescope config | Misc
* fix formatting in pluginList, luasnip * don't use pcall on highlights * sync and compile fzf and media files only when the error occurs, add a help text telling tbe user to restart neovim
This commit is contained in:
parent
05d57bba29
commit
0023233eef
|
@ -19,7 +19,7 @@ opt.clipboard = "unnamedplus"
|
||||||
opt.shortmess:append("sI")
|
opt.shortmess:append("sI")
|
||||||
|
|
||||||
-- disable tilde on end of buffer: https://github.com/ neovim/neovim/pull/8546#issuecomment-643643758
|
-- disable tilde on end of buffer: https://github.com/ neovim/neovim/pull/8546#issuecomment-643643758
|
||||||
vim.cmd [[let &fcs='eob: ']]
|
vim.cmd("let &fcs='eob: '")
|
||||||
|
|
||||||
-- Numbers
|
-- Numbers
|
||||||
opt.number = true
|
opt.number = true
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
local present, _ = pcall(require, "packerInit")
|
local present, _ = pcall(require, "packerInit")
|
||||||
|
local packer
|
||||||
|
|
||||||
if present then
|
if present then
|
||||||
packer = require "packer"
|
packer = require "packer"
|
||||||
|
@ -10,9 +11,15 @@ local use = packer.use
|
||||||
|
|
||||||
return packer.startup(
|
return packer.startup(
|
||||||
function()
|
function()
|
||||||
use {"wbthomason/packer.nvim", event = "VimEnter"}
|
use {
|
||||||
|
"wbthomason/packer.nvim",
|
||||||
|
event = "VimEnter"
|
||||||
|
}
|
||||||
|
|
||||||
use {"akinsho/nvim-bufferline.lua", after = "nvim-base16.lua"}
|
use {
|
||||||
|
"akinsho/nvim-bufferline.lua",
|
||||||
|
after = "nvim-base16.lua"
|
||||||
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"glepnir/galaxyline.nvim",
|
"glepnir/galaxyline.nvim",
|
||||||
|
@ -76,7 +83,7 @@ return packer.startup(
|
||||||
config = function()
|
config = function()
|
||||||
require "plugins.compe"
|
require "plugins.compe"
|
||||||
end,
|
end,
|
||||||
wants = {"LuaSnip"},
|
wants = "LuaSnip",
|
||||||
requires = {
|
requires = {
|
||||||
{
|
{
|
||||||
"L3MON4D3/LuaSnip",
|
"L3MON4D3/LuaSnip",
|
||||||
|
@ -93,7 +100,10 @@ return packer.startup(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
use {"sbdchd/neoformat", cmd = "Neoformat"}
|
use {
|
||||||
|
"sbdchd/neoformat",
|
||||||
|
cmd = "Neoformat"
|
||||||
|
}
|
||||||
|
|
||||||
-- file managing , picker etc
|
-- file managing , picker etc
|
||||||
use {
|
use {
|
||||||
|
@ -112,8 +122,14 @@ return packer.startup(
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {"nvim-lua/plenary.nvim", event = "BufRead"}
|
use {
|
||||||
use {"nvim-lua/popup.nvim", after = "plenary.nvim"}
|
"nvim-lua/plenary.nvim",
|
||||||
|
event = "BufRead"
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"nvim-lua/popup.nvim",
|
||||||
|
after = "plenary.nvim"
|
||||||
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
|
@ -123,7 +139,11 @@ return packer.startup(
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {"nvim-telescope/telescope-fzf-native.nvim", run = "make", cmd = "Telescope"}
|
use {
|
||||||
|
"nvim-telescope/telescope-fzf-native.nvim",
|
||||||
|
run = "make",
|
||||||
|
cmd = "Telescope"
|
||||||
|
}
|
||||||
use {
|
use {
|
||||||
"nvim-telescope/telescope-media-files.nvim",
|
"nvim-telescope/telescope-media-files.nvim",
|
||||||
cmd = "Telescope"
|
cmd = "Telescope"
|
||||||
|
@ -147,7 +167,10 @@ return packer.startup(
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {"andymass/vim-matchup", event = "CursorMoved"}
|
use {
|
||||||
|
"andymass/vim-matchup",
|
||||||
|
event = "CursorMoved"
|
||||||
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"terrortylor/nvim-comment",
|
"terrortylor/nvim-comment",
|
||||||
|
@ -171,7 +194,10 @@ return packer.startup(
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {"tweekmonster/startuptime.vim", cmd = "StartupTime"}
|
use {
|
||||||
|
"tweekmonster/startuptime.vim",
|
||||||
|
cmd = "StartupTime"
|
||||||
|
}
|
||||||
|
|
||||||
-- load autosave only if its globally enabled
|
-- load autosave only if its globally enabled
|
||||||
use {
|
use {
|
||||||
|
@ -195,7 +221,11 @@ return packer.startup(
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"Pocco81/TrueZen.nvim",
|
"Pocco81/TrueZen.nvim",
|
||||||
cmd = {"TZAtaraxis", "TZMinimalist", "TZFocus"},
|
cmd = {
|
||||||
|
"TZAtaraxis",
|
||||||
|
"TZMinimalist",
|
||||||
|
"TZFocus"
|
||||||
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require "plugins.zenmode"
|
require "plugins.zenmode"
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
local luasnip
|
local present, luasnip = pcall(require, "luasnip")
|
||||||
if
|
if not present then
|
||||||
not pcall(
|
|
||||||
function()
|
|
||||||
luasnip = require "luasnip"
|
|
||||||
end
|
|
||||||
)
|
|
||||||
then
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -76,5 +76,8 @@ if
|
||||||
)
|
)
|
||||||
then
|
then
|
||||||
-- This should only trigger when in need of PackerSync, so better do it
|
-- This should only trigger when in need of PackerSync, so better do it
|
||||||
vim.cmd("PackerSync")
|
print("After completion of PackerSync, restart neovim.")
|
||||||
|
require("packer").sync("telescope-fzf-native.nvim", "telescope-media-files.nvim")
|
||||||
|
-- why compile too ? well, packer is supposed to compile with sync only, but sometimes it doesn't work
|
||||||
|
vim.cmd("PackerCompile")
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,7 +4,7 @@ local present, base16 = pcall(require, "base16")
|
||||||
|
|
||||||
if present then
|
if present then
|
||||||
base16(base16.themes["onedark"], true)
|
base16(base16.themes["onedark"], true)
|
||||||
pcall(require, "highlights")
|
require "highlights"
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
return false
|
return false
|
||||||
|
|
Loading…
Reference in New Issue