update blankline and formatter.
This commit is contained in:
juan
parent
44eda22d9b
commit
bff6f5e613
@ -1,6 +1,6 @@
|
||||
-- Core Settings
|
||||
|
||||
local opt = vim.o
|
||||
local global = vim.g
|
||||
|
||||
-- look and feel
|
||||
opt.relativenumber = true
|
||||
@ -9,6 +9,7 @@ opt.showmode = false
|
||||
opt.scrolloff = 10
|
||||
opt.ruler = true
|
||||
opt.termguicolors = true
|
||||
opt.tabstop = 2
|
||||
opt.shiftwidth = 2
|
||||
|
||||
-- controlling
|
||||
@ -19,3 +20,7 @@ opt.mouse = "i"
|
||||
|
||||
-- completion for lua
|
||||
opt.completeopt = 'menuone,noselect'
|
||||
|
||||
-- neoformat settings.
|
||||
global.neoformat_basic_format_align = 1
|
||||
global.neoformat_basic_format_trim = 1
|
||||
|
||||
@ -2,147 +2,147 @@
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
|
||||
require('packer').init {
|
||||
display = {
|
||||
open_fn = function()
|
||||
return require("packer.util").float {border = "single"}
|
||||
end,
|
||||
prompt_border = "single"
|
||||
},
|
||||
git = {
|
||||
clone_timeout = 600 -- Timeout, in seconds, for git clones
|
||||
},
|
||||
auto_clean = true,
|
||||
compile_on_sync = true
|
||||
-- auto_reload_compiled = true
|
||||
display = {
|
||||
open_fn = function()
|
||||
return require("packer.util").float {border = "single"}
|
||||
end,
|
||||
prompt_border = "single"
|
||||
},
|
||||
git = {
|
||||
clone_timeout = 600 -- Timeout, in seconds, for git clones
|
||||
},
|
||||
auto_clean = true,
|
||||
compile_on_sync = true
|
||||
-- auto_reload_compiled = true
|
||||
}
|
||||
|
||||
return require('packer').startup(function(use)
|
||||
use {'wbthomason/packer.nvim', event = 'VimEnter'}
|
||||
use {'wbthomason/packer.nvim', event = 'VimEnter'}
|
||||
|
||||
-- core UI
|
||||
use {'kyazdani42/nvim-web-devicons', after = 'packer.nvim'}
|
||||
use {
|
||||
'hoob3rt/lualine.nvim',
|
||||
after = 'nvim-web-devicons',
|
||||
config = function() require "plugins.statusline" end
|
||||
}
|
||||
use {
|
||||
'RRethy/nvim-base16',
|
||||
event = 'VimEnter',
|
||||
config = function() require "plugins.base16" end
|
||||
}
|
||||
-- core UI
|
||||
use {'kyazdani42/nvim-web-devicons', after = 'packer.nvim'}
|
||||
use {
|
||||
'hoob3rt/lualine.nvim',
|
||||
after = 'nvim-web-devicons',
|
||||
config = function() require "plugins.statusline" end
|
||||
}
|
||||
use {
|
||||
'RRethy/nvim-base16',
|
||||
event = 'VimEnter',
|
||||
config = function() require "plugins.base16" end
|
||||
}
|
||||
|
||||
-- lsp stuff
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
event = 'VimEnter',
|
||||
config = function() require "plugins.treesitter" end,
|
||||
run = ':TSUpdate'
|
||||
}
|
||||
use {
|
||||
'lewis6991/spellsitter.nvim',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require('spellsitter').setup() end
|
||||
}
|
||||
use {'neovim/nvim-lspconfig', after = "coq_nvim"}
|
||||
use {
|
||||
'kabouzeid/nvim-lspinstall',
|
||||
config = function() require "plugins.lspinstall" end,
|
||||
after = 'nvim-lspconfig'
|
||||
}
|
||||
use {
|
||||
'ms-jpq/coq_nvim',
|
||||
branch = 'coq',
|
||||
event = 'BufEnter',
|
||||
config = function() require "plugins.coq" end
|
||||
}
|
||||
use {'ms-jpq/coq.artifacts', after = 'coq_nvim', branch = 'artifacts'}
|
||||
-- lsp stuff
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
event = 'VimEnter',
|
||||
config = function() require "plugins.treesitter" end,
|
||||
run = ':TSUpdate'
|
||||
}
|
||||
use {
|
||||
'lewis6991/spellsitter.nvim',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require('spellsitter').setup() end
|
||||
}
|
||||
use {'neovim/nvim-lspconfig', after = "coq_nvim"}
|
||||
use {
|
||||
'kabouzeid/nvim-lspinstall',
|
||||
config = function() require "plugins.lspinstall" end,
|
||||
after = 'nvim-lspconfig'
|
||||
}
|
||||
use {
|
||||
'ms-jpq/coq_nvim',
|
||||
branch = 'coq',
|
||||
event = 'BufEnter',
|
||||
config = function() require "plugins.coq" end
|
||||
}
|
||||
use {'ms-jpq/coq.artifacts', after = 'coq_nvim', branch = 'artifacts'}
|
||||
|
||||
-- formating and editing
|
||||
use {"sbdchd/neoformat", cmd = "Neoformat"}
|
||||
use {
|
||||
"mattn/emmet-vim",
|
||||
event = "FileType html,css",
|
||||
setup = function() require "plugins.emmet" end
|
||||
}
|
||||
use {"machakann/vim-sandwich", event = "BufRead"}
|
||||
-- formating and editing
|
||||
use {"sbdchd/neoformat", cmd = "Neoformat"}
|
||||
use {
|
||||
"mattn/emmet-vim",
|
||||
event = "FileType html,css",
|
||||
setup = function() require "plugins.emmet" end
|
||||
}
|
||||
use {"machakann/vim-sandwich", event = "BufRead"}
|
||||
|
||||
use {
|
||||
"terrortylor/nvim-comment",
|
||||
config = function() require('nvim_comment').setup() end,
|
||||
cmd = "CommentToggle"
|
||||
}
|
||||
use {
|
||||
"windwp/nvim-autopairs",
|
||||
after = "coq_nvim",
|
||||
config = function() require("plugins.nvim-autopairs") end
|
||||
}
|
||||
use {
|
||||
"terrortylor/nvim-comment",
|
||||
config = function() require('nvim_comment').setup() end,
|
||||
cmd = "CommentToggle"
|
||||
}
|
||||
use {
|
||||
"windwp/nvim-autopairs",
|
||||
after = "coq_nvim",
|
||||
config = function() require("plugins.nvim-autopairs") end
|
||||
}
|
||||
|
||||
-- navigation
|
||||
use {
|
||||
'kyazdani42/nvim-tree.lua',
|
||||
cmd = 'NvimTreeToggle',
|
||||
requires = 'kyazdani42/nvim-web-devicons'
|
||||
}
|
||||
use {
|
||||
"vimwiki/vimwiki",
|
||||
cmd = "VimwikiIndex",
|
||||
setup = function() require "plugins.vimwiki" end
|
||||
}
|
||||
use {
|
||||
'andymass/vim-matchup',
|
||||
after = 'nvim-treesitter',
|
||||
config = function() require "plugins.matchup" end
|
||||
}
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = {{'nvim-lua/plenary.nvim'}},
|
||||
cmd = 'Telescope'
|
||||
}
|
||||
use {
|
||||
'phaazon/hop.nvim',
|
||||
event = "BufRead",
|
||||
as = 'hop',
|
||||
config = function()
|
||||
require'hop'.setup {keys = 'etovxqpdygfblzhckisuran'}
|
||||
end
|
||||
}
|
||||
-- navigation
|
||||
use {
|
||||
'kyazdani42/nvim-tree.lua',
|
||||
cmd = 'NvimTreeToggle',
|
||||
requires = 'kyazdani42/nvim-web-devicons'
|
||||
}
|
||||
use {
|
||||
"vimwiki/vimwiki",
|
||||
cmd = "VimwikiIndex",
|
||||
setup = function() require "plugins.vimwiki" end
|
||||
}
|
||||
use {
|
||||
'andymass/vim-matchup',
|
||||
after = 'nvim-treesitter',
|
||||
config = function() require "plugins.matchup" end
|
||||
}
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = {{'nvim-lua/plenary.nvim'}},
|
||||
cmd = 'Telescope'
|
||||
}
|
||||
use {
|
||||
'phaazon/hop.nvim',
|
||||
event = "BufRead",
|
||||
as = 'hop',
|
||||
config = function()
|
||||
require'hop'.setup {keys = 'etovxqpdygfblzhckisuran'}
|
||||
end
|
||||
}
|
||||
|
||||
-- eye-candy
|
||||
use {
|
||||
'sunjon/shade.nvim',
|
||||
event = "BufAdd",
|
||||
config = function() require "plugins.shade" end
|
||||
}
|
||||
use {
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
after = {"nvim-treesitter", "nvim-base16"},
|
||||
config = function() require "plugins.indent-blankline" end
|
||||
}
|
||||
use {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
requires = {'nvim-lua/plenary.nvim'},
|
||||
config = function() require('gitsigns').setup() end
|
||||
}
|
||||
use {
|
||||
'p00f/nvim-ts-rainbow',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require "plugins.nvim-ts-rainbow" end
|
||||
}
|
||||
use {
|
||||
'winston0410/range-highlight.nvim',
|
||||
event = "BufRead",
|
||||
config = function() require("range-highlight").setup {} end,
|
||||
requires = 'winston0410/cmd-parser.nvim'
|
||||
}
|
||||
use {
|
||||
'norcalli/nvim-colorizer.lua',
|
||||
event = "BufRead",
|
||||
config = function() require'colorizer'.setup() end
|
||||
}
|
||||
-- eye-candy
|
||||
use {
|
||||
'sunjon/shade.nvim',
|
||||
event = "BufAdd",
|
||||
config = function() require "plugins.shade" end
|
||||
}
|
||||
use {
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
after = {"nvim-treesitter", "nvim-base16"},
|
||||
config = function() require "plugins.indent-blankline" end
|
||||
}
|
||||
use {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
requires = {'nvim-lua/plenary.nvim'},
|
||||
config = function() require('gitsigns').setup() end
|
||||
}
|
||||
use {
|
||||
'p00f/nvim-ts-rainbow',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require "plugins.nvim-ts-rainbow" end
|
||||
}
|
||||
use {
|
||||
'winston0410/range-highlight.nvim',
|
||||
event = "BufRead",
|
||||
config = function() require("range-highlight").setup {} end,
|
||||
requires = 'winston0410/cmd-parser.nvim'
|
||||
}
|
||||
use {
|
||||
'norcalli/nvim-colorizer.lua',
|
||||
event = "BufRead",
|
||||
config = function() require'colorizer'.setup() end
|
||||
}
|
||||
|
||||
-- integrations
|
||||
use {'michaelb/sniprun', run = 'bash ./install.sh', cmd = "SnipRun"}
|
||||
use {"tpope/vim-fugitive", cmd = "G"}
|
||||
-- integrations
|
||||
use {'michaelb/sniprun', run = 'bash ./install.sh', cmd = "SnipRun"}
|
||||
use {"tpope/vim-fugitive", cmd = "G"}
|
||||
|
||||
end)
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
require("indent_blankline").setup {
|
||||
buftype_exclude = {"terminal", "help", "packer"},
|
||||
indent_blankline_buftype_exclude = {"terminal"},
|
||||
indentLine_enabled = 1,
|
||||
indent_blankline_char = "▏",
|
||||
char = "▏",
|
||||
show_current_context = true
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user