Huge update. various bug fixes

This commit is contained in:
juan 2022-04-03 23:22:30 +08:00
parent 3d2df263a3
commit 1f5e687a60
Signed by: juan
GPG Key ID: 5C1E5093C74F1DC7
5 changed files with 33 additions and 31 deletions

View File

@ -17,11 +17,11 @@ require('packer').init {
} }
return require('packer').startup(function(use) return require('packer').startup(function(use)
use {'wbthomason/packer.nvim', event = 'VimEnter'} use {'wbthomason/packer.nvim', event = "VimEnter"}
-- core UI -- core UI
use { use {
'https://github.com/b4skyx/serenade', 'b4skyx/serenade',
after = 'packer.nvim', after = 'packer.nvim',
config = function() config = function()
vim.g.serenade_enable_italic = 1 vim.g.serenade_enable_italic = 1
@ -32,14 +32,9 @@ return require('packer').startup(function(use)
use {'kyazdani42/nvim-web-devicons', after = 'packer.nvim'} use {'kyazdani42/nvim-web-devicons', after = 'packer.nvim'}
use { use {
'hoob3rt/lualine.nvim', 'hoob3rt/lualine.nvim',
after = {'nvim-web-devicons'}, after = {'serenade', 'nvim-web-devicons'},
config = function() require "plugins.statusline" end config = function() require "plugins.statusline" end
} }
-- use {
-- 'RRethy/nvim-base16',
-- after = 'packer.nvim',
-- config = function() require "plugins.base16" end
-- }
-- lsp stuff -- lsp stuff
use {'neovim/nvim-lspconfig', event = "BufEnter"} use {'neovim/nvim-lspconfig', event = "BufEnter"}
@ -52,15 +47,10 @@ return require('packer').startup(function(use)
-- tree sitter -- tree sitter
use { use {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
event = "VimEnter", event = "UIEnter",
config = function() require "plugins.treesitter" end, config = function() require "plugins.treesitter" end,
run = ':TSUpdate' run = ':TSUpdate'
} }
use {
'lewis6991/spellsitter.nvim',
after = "nvim-treesitter",
config = function() require('spellsitter').setup() end
}
-- completer -- completer
use { use {
@ -70,19 +60,19 @@ return require('packer').startup(function(use)
run = ':COQdeps', run = ':COQdeps',
config = function() require "plugins.coq" end config = function() require "plugins.coq" end
} }
-- use { use {
-- 'ms-jpq/coq.artifacts', 'ms-jpq/coq.artifacts',
-- run = ':COQdeps', after = 'coq_nvim',
-- after = 'coq_nvim', branch = 'artifacts'
-- branch = 'artifacts' }
-- }
use { use {
'ms-jpq/coq.thirdparty', 'ms-jpq/coq.thirdparty',
branch = '3p', branch = '3p',
after = 'coq_nvim', after = 'coq_nvim',
config = function() config = function()
require("coq_3p") { require("coq_3p") {
{src = "nvimlua", short_name = "nLUA"}, {src = "repl"} {src = "nvimlua", short_name = "nLUA"}, {src = "repl"},
{src = "vimtex", short_name = "vTEX"}
} }
end end
@ -91,10 +81,10 @@ return require('packer').startup(function(use)
use {"sbdchd/neoformat", cmd = "Neoformat"} use {"sbdchd/neoformat", cmd = "Neoformat"}
use { use {
"mattn/emmet-vim", "mattn/emmet-vim",
event = "FileType html,htmldjango,css,markdown", ft = {'html', 'htmldjango', 'css', 'markdown'},
setup = function() require "plugins.emmet" end setup = function() require "plugins.emmet" end
} }
use {"machakann/vim-sandwich", event = "VimEnter"} use {"machakann/vim-sandwich", event = "BufEnter"}
use { use {
"terrortylor/nvim-comment", "terrortylor/nvim-comment",
@ -103,7 +93,7 @@ return require('packer').startup(function(use)
} }
use { use {
"windwp/nvim-autopairs", "windwp/nvim-autopairs",
after = "coq_nvim", event = "BufEnter",
config = function() require("plugins.nvim-autopairs") end config = function() require("plugins.nvim-autopairs") end
} }
@ -132,7 +122,7 @@ return require('packer').startup(function(use)
use {'preservim/tagbar', cmd = 'TagbarToggle'} use {'preservim/tagbar', cmd = 'TagbarToggle'}
use { use {
'phaazon/hop.nvim', 'phaazon/hop.nvim',
event = "VimEnter", event = "UIEnter",
as = 'hop', as = 'hop',
config = function() config = function()
require'hop'.setup {keys = 'etovxqpdygfblzhckisuran'} require'hop'.setup {keys = 'etovxqpdygfblzhckisuran'}
@ -168,8 +158,8 @@ return require('packer').startup(function(use)
} }
use { use {
'norcalli/nvim-colorizer.lua', 'norcalli/nvim-colorizer.lua',
cmd = 'ColorizerToggle', after = "packer.nvim",
config = function() require'colorizer'.setup() end config = function() require "plugins.nvim-colorizer" end
} }
-- integrations -- integrations

View File

@ -2,6 +2,6 @@ vim.g.coq_settings = {
keymap = {recommended = false}, -- pre_select = true need a way to make tab enter keymap = {recommended = false}, -- pre_select = true need a way to make tab enter
auto_start = true, auto_start = true,
clients = {tabnine = {enabled = true}}, clients = {tabnine = {enabled = true}},
display = {ghost_text = {enabled = false}, icons = {mode = "none"}} display = {ghost_text = {enabled = false}, icons = {mode = "none"}, preview = {border = "NormalFloat"}}
} }
vim.cmd('COQnow -s') vim.cmd('COQnow -s')

View File

@ -1,7 +1,9 @@
local remap = vim.api.nvim_set_keymap local remap = vim.api.nvim_set_keymap
local npairs = require('nvim-autopairs') local npairs = require('nvim-autopairs')
npairs.setup({map_bs = false}) npairs.setup({map_bs = true, map_cr = true})
vim.g.coq_settings = {keymap = {recommended = false}}
-- these mappings are coq recommended mappings unrelated to nvim-autopairs -- these mappings are coq recommended mappings unrelated to nvim-autopairs
remap('i', '<esc>', [[pumvisible() ? "<c-e><esc>" : "<esc>"]], remap('i', '<esc>', [[pumvisible() ? "<c-e><esc>" : "<esc>"]],

View File

@ -0,0 +1,10 @@
-- require'colorizer'.setup ({
-- '*',
-- css = {
-- css = true, -- CSS rgb() and rgba() functions
-- css_fn = true -- CSS hsl() and hsla() functions
-- },
-- html = {names = false} -- Disable parsing "names" like Blue or Gray
-- })
require 'colorizer'.setup()

View File

@ -3,7 +3,7 @@ require'nvim-treesitter.configs'.setup {
enable = true, enable = true,
extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean
max_file_lines = 4096, -- Do not enable for files with more than n lines, int max_file_lines = 4096, -- Do not enable for files with more than n lines, int
colors = { "#84a0c6", "#a093c7", "#89b8c2"}, -- table of hex strings colors = {"#c1bf89", "#87c095", "#82abbc", "#d39bb6", "#acb765"} -- table of hex strings
-- termcolors = {} -- table of colour name strings -- termcolors = {} -- table of colour name strings
} }
} }