commit f90a6596186b42319e41dd244da8359d6705d539
parent fceab2f88635eeb128477264110b04be898fa2cc
Author: Tomas Nemec <nemi@skaut.cz>
Date: Fri, 16 Dec 2022 15:12:59 +0100
update
Diffstat:
12 files changed, 69 insertions(+), 142 deletions(-)
diff --git a/after/plugin/comment.lua b/after/plugin/comment.lua
@@ -3,10 +3,13 @@ if not pcall(require, 'Comment') then
end
local comment = require('Comment')
-comment.setup({
+local setup = {
ignore = '^$',
- pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook(),
-})
+}
+if pcall(require, 'ts_context_commentstring') then
+ setup.pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook()
+end
+comment.setup(setup)
local ft = require('Comment.ft')
ft.dart = { '//%s', '/*%s*/' }
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
@@ -18,6 +18,8 @@ vim.api.nvim_create_autocmd('LspAttach', {
return { buffer = buf, desc = desc }
end
+ cap.semanticTokensProvider = nil
+
if cap.hoverProvider then
vim.keymap.set('n', 'K', lb.hover, opt 'LSP Hover')
end
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
@@ -19,10 +19,10 @@ telescope.setup {
}
-- extensions
-_ = telescope.load_extension('fzy_native')
-_ = telescope.load_extension('dap')
-_ = telescope.load_extension('zk')
-_ = telescope.load_extension('git_worktree')
+pcall(telescope.load_extension, 'fzy_native')
+pcall(telescope.load_extension, 'dap')
+pcall(telescope.load_extension, 'zk')
+pcall(telescope.load_extension, 'git_worktree')
vim.cmd [[packadd packer.nvim]]
require('packer').init()
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
@@ -31,7 +31,7 @@ parser_configs.norg_table = {
require'nvim-treesitter.configs'.setup {
ensure_intalled = 'all',
ignore_install = { 'lua', 'vim', 'c' },
- highlight = { enable = true, disable = { 'lua', 'vim' } },
+ highlight = { enable = true, disable = { 'lua', 'vim', 'c' } },
indent = { enable = true },
diff --git a/colors/base16.lua b/colors/base16.lua
@@ -5,23 +5,22 @@
-- base16-vim (https://github.com/chriskempson/base16-vim)
-- by Chris Kempson (https://github.com/chriskempson)
-- Gruvbox dark, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
-
-local gui00 = "#1d2021"
-local gui01 = "#3c3836"
-local gui02 = "#504945"
-local gui03 = "#665c54"
-local gui04 = "#bdae93"
-local gui05 = "#d5c4a1"
-local gui06 = "#ebdbb2"
-local gui07 = "#fbf1c7"
-local gui08 = "#fb4934"
-local gui09 = "#fe8019"
-local gui0A = "#fabd2f"
-local gui0B = "#b8bb26"
-local gui0C = "#8ec07c"
-local gui0D = "#83a598"
-local gui0E = "#d3869b"
-local gui0F = "#d65d0e"
+local gui00 = '#1d2021'
+local gui01 = '#3c3836'
+local gui02 = '#504945'
+local gui03 = '#665c54'
+local gui04 = '#bdae93'
+local gui05 = '#d5c4a1'
+local gui06 = '#ebdbb2'
+local gui07 = '#fbf1c7'
+local gui08 = '#fb4934'
+local gui09 = '#fe8019'
+local gui0A = '#fabd2f'
+local gui0B = '#b8bb26'
+local gui0C = '#8ec07c'
+local gui0D = '#83a598'
+local gui0E = '#d3869b'
+local gui0F = '#d65d0e'
local cterm00 = 0
local cterm03 = 8
@@ -44,7 +43,7 @@ vim.cmd [[
highlight clear
syntax reset
]]
-vim.g.colors_name = "base16-gruvbox-dark-hard"
+vim.g.colors_name = 'base16-gruvbox-dark-hard'
-- Vim editor colors fg bg ctermfg ctermbg attr guisp
vim.api.nvim_set_hl(0, 'Normal', { fg = gui05, bg = gui00, ctermfg = cterm05, ctermbg = cterm00 })
@@ -140,15 +139,15 @@ vim.api.nvim_set_hl(0, 'cssClassName', { fg = gui0E, ctermfg = cterm0E })
vim.api.nvim_set_hl(0, 'cssColor', { fg = gui0C, ctermfg = cterm0C })
-- Diff highlighting
-vim.api.nvim_set_hl(0, 'DiffAdd', { fg = gui0B, bg = gui01, ctermfg = cterm0B, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffChange', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffDelete', { fg = gui08, bg = gui01, ctermfg = cterm08, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffText', { fg = gui0D, bg = gui01, ctermfg = cterm0D, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffAdded', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffFile', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffNewFile', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffLine', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffRemoved', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffAdd', { fg = gui0B, bg = gui01, ctermfg = cterm0B, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffChange', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffDelete', { fg = gui08, bg = gui01, ctermfg = cterm08, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffText', { fg = gui0D, bg = gui01, ctermfg = cterm0D, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffAdded', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffFile', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffNewFile', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffLine', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffRemoved', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
-- Git highlighting
vim.api.nvim_set_hl(0, 'gitcommitOverflow', { fg = gui08, ctermfg = cterm08 })
@@ -283,112 +282,33 @@ vim.api.nvim_set_hl(0, 'javaOperator', { fg = gui0D, ctermfg = cterm0D })
-- vim: filetype=lua
-- end color
-vim.api.nvim_set_hl(0, 'LineNr', {
- fg = gui03,
- bg = gui00,
- ctermfg = cterm03,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'SignColumn', {
- fg = gui03,
- bg = gui00,
- ctermfg = cterm03,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'StatusLine', {
- fg = gui04,
- bg = gui01,
- ctermfg = cterm05,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'TreesitterContext', {bg = gui01, ctermbg = cterm01})
+vim.api.nvim_set_hl(0, 'LineNr', { fg = gui03, bg = gui00 })
+vim.api.nvim_set_hl(0, 'SignColumn', { fg = gui03, bg = gui00 })
+vim.api.nvim_set_hl(0, 'StatusLine', { fg = gui04, bg = gui01 })
+vim.api.nvim_set_hl(0, 'TreesitterContext', { bg = gui01 })
vim.api.nvim_set_hl(0, 'NormalFloat', {})
vim.api.nvim_set_hl(0, 'WinSeparator', {})
vim.api.nvim_set_hl(0, 'FloatBorder', {})
-vim.api.nvim_set_hl(0, 'Beacon', {bg = 'fg'})
+vim.api.nvim_set_hl(0, 'Beacon', { bg = 'fg' })
+vim.api.nvim_set_hl(0, 'LspInlayHint', { fg = gui03 })
-- Diff highlighting
-vim.api.nvim_set_hl(0, 'DiffAdd', {
- fg = gui0B,
- bg = gui00,
- ctermfg = cterm0B,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffChange', {
- fg = gui03,
- bg = gui00,
- ctermfg = cterm03,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffDelete', {
- fg = gui08,
- bg = gui00,
- ctermfg = cterm08,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffText', {
- fg = gui0D,
- bg = gui00,
- ctermfg = cterm0D,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffAdded', {
- fg = gui0B,
- bg = gui00,
- ctermfg = cterm0B,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffFile', {
- fg = gui08,
- bg = gui00,
- ctermfg = cterm08,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffNewFile', {
- fg = gui0B,
- bg = gui00,
- ctermfg = cterm0B,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffLine', {
- fg = gui0D,
- bg = gui00,
- ctermfg = cterm0D,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'DiffRemoved', {
- fg = gui08,
- bg = gui00,
- ctermfg = cterm08,
- ctermbg = cterm00
-})
+vim.api.nvim_set_hl(0, 'DiffAdd', { fg = gui0B, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffChange', { fg = gui03, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffDelete', { fg = gui08, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffText', { fg = gui0D, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffAdded', { fg = gui0B, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffFile', { fg = gui08, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffNewFile', { fg = gui0B, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffLine', { fg = gui0D, bg = gui00 })
+vim.api.nvim_set_hl(0, 'DiffRemoved', { fg = gui08, bg = gui00 })
-- GitGutter highlighting
-vim.api.nvim_set_hl(0, 'GitGutterAdd', {
- fg = gui0B,
- bg = gui00,
- ctermfg = cterm0B,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'GitGutterChange', {
- fg = gui0D,
- bg = gui00,
- ctermfg = cterm0D,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'GitGutterDelete', {
- fg = gui08,
- bg = gui00,
- ctermfg = cterm08,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'GitGutterChangeDelete', {
- fg = gui0E,
- bg = gui00,
- ctermfg = cterm0E,
- ctermbg = cterm00
-})
+vim.api.nvim_set_hl(0, 'GitGutterAdd', { fg = gui0B, bg = gui00 })
+vim.api.nvim_set_hl(0, 'GitGutterChange', { fg = gui0D, bg = gui00 })
+vim.api.nvim_set_hl(0, 'GitGutterDelete', { fg = gui08, bg = gui00 })
+vim.api.nvim_set_hl(0, 'GitGutterChangeDelete', { fg = gui0E, bg = gui00 })
-- local highlights = {
-- ['@string.regex'] = {link = 'String', default = true},
diff --git a/ftplugin/c.lua b/ftplugin/c.lua
@@ -0,0 +1 @@
+vim.treesitter.start()
diff --git a/ftplugin/cpp.lua b/ftplugin/cpp.lua
@@ -1 +0,0 @@
-vim.wo.foldmethod = 'syntax'
diff --git a/ftplugin/h.lua b/ftplugin/h.lua
@@ -1 +0,0 @@
-cpp.lua
-\ No newline at end of file
diff --git a/ftplugin/lua.lua b/ftplugin/lua.lua
@@ -1,3 +1,3 @@
vim.cmd [[comp lua]]
vim.treesitter.start()
--- vim.bo.syntax = 'ON'
+
diff --git a/ftplugin/vim.lua b/ftplugin/vim.lua
@@ -0,0 +1,2 @@
+vim.cmd[[syntax off]]
+vim.treesitter.start()
diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -14,7 +14,6 @@ return packer.startup({
-- meta
use 'tweekmonster/startuptime.vim'
- use 'nathom/filetype.nvim'
use 'lewis6991/impatient.nvim'
use 'MunifTanjim/exrc.nvim'
@@ -114,9 +113,9 @@ return packer.startup({
use 'rcarriga/nvim-notify'
-- lsp
- use 'neovim/nvim-lspconfig'
- use 'williamboman/mason.nvim'
- use 'williamboman/mason-lspconfig.nvim'
+ use 'neovim/nvim-lspconfig'
+ use 'williamboman/mason.nvim'
+ use 'williamboman/mason-lspconfig.nvim'
use 'b0o/schemastore.nvim'
use 'folke/neodev.nvim'
use { 'jose-elias-alvarez/null-ls.nvim', requires = { 'nvim-lua/plenary.nvim' } }
diff --git a/lua/tms/lsp/servers.lua b/lua/tms/lsp/servers.lua
@@ -2,7 +2,10 @@
local M = {}
function M.jsonls(opts)
- opts.settings = { json = { schemas = require('schemastore').json.schemas() } }
+ if pcall(require, 'schemastor') then
+ opts.settings = { json = { schemas = require('schemastore').json.schemas() } }
+ end
+
return opts
end
