5 Commits

Author SHA1 Message Date
f38e7720e1 dadbod ui location, enable completion for mysql 2025-10-24 10:13:10 +03:00
0b756ba15f replace helm-ls configuration with the nvim 0.11 2025-10-24 10:12:46 +03:00
bd6f9a6279 replace selected text keymap 2025-10-24 10:11:40 +03:00
6abfea8c60 fix git filepattern for treesitter 2025-10-24 10:11:25 +03:00
0e4c1c54c4 https://github.com/neovim/neovim/issues/22696
remove diffopt to avoid bad experience in 3-way merges
2025-10-24 10:10:24 +03:00
6 changed files with 13 additions and 21 deletions

View File

@@ -76,7 +76,7 @@ autocmd({ 'FileType' }, {
'latex', 'latex',
'json', 'json',
'yaml*', 'yaml*',
'git*', 'git.+',
'make', 'make',
'markdown*', 'markdown*',
}, },

View File

@@ -49,7 +49,8 @@ return {
sources = { sources = {
default = { 'lazydev', 'lsp', 'snippets', 'ripgrep', 'path', 'buffer' }, default = { 'lazydev', 'lsp', 'snippets', 'ripgrep', 'path', 'buffer' },
per_filetype = { per_filetype = {
sql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' } sql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' },
mysql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' },
}, },
providers = { providers = {
lazydev = { lazydev = {

View File

@@ -14,7 +14,7 @@ return {
-- Your DBUI configuration -- Your DBUI configuration
vim.g.db_ui_use_nerd_fonts = 1 vim.g.db_ui_use_nerd_fonts = 1
vim.g.db_ui_auto_execute_table_helpers = 1 vim.g.db_ui_auto_execute_table_helpers = 1
vim.g.db_ui_win_position = 'right' vim.g.db_ui_win_position = 'left'
end, end,
} }

View File

@@ -78,27 +78,14 @@ return {
} }
}) })
-- leave it until it works with lsp.config vim.lsp.config('helm-ls', {
lspconfig.helm_ls.setup {
settings = { settings = {
['helm-ls'] = { ['helm-ls'] = {
yamlls = { helmLint = { enabled = false },
enabled = false, yamlls = { enabled = false },
path = "yaml-language-server", },
}
}
} }
} })
-- vim.lsp.config('helm-ls', {
-- settings = {
-- ['helm-ls'] = {
-- yamlls = {
-- path = "yaml-language-server",
-- enabled = false,
-- }
-- }
-- }
-- })
vim.lsp.config('terraformls', { vim.lsp.config('terraformls', {
filetypes = { 'terraform', 'terraform-vars', 'tf' } filetypes = { 'terraform', 'terraform-vars', 'tf' }

View File

@@ -32,6 +32,8 @@ vim.keymap.set("n", "Q", "<nop>")
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
vim.keymap.set("n", "<leader>S", [[:%s/\<<C-r><C-a>\>/<C-r><C-a>/gI<Left><Left><Left>]]) vim.keymap.set("n", "<leader>S", [[:%s/\<<C-r><C-a>\>/<C-r><C-a>/gI<Left><Left><Left>]])
vim.keymap.set("v", "<leader>s", [["vy:%s/\<<C-r>v\>/<C-r>v/gI<Left><Left><Left>]])
vim.keymap.set("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>") vim.keymap.set("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
vim.keymap.set("n", "<leader><leader>x", "<cmd>source %<CR>") vim.keymap.set("n", "<leader><leader>x", "<cmd>source %<CR>")

View File

@@ -32,3 +32,5 @@ vim.opt.updatetime = 50
vim.opt.colorcolumn = "80" vim.opt.colorcolumn = "80"
vim.opt.diffopt = 'internal,filler,closeoff,algorithm:histogram'