Skip to content

Commit

Permalink
chore(nvim): bump lazy and fixes for breaking changes
Browse files Browse the repository at this point in the history
  • Loading branch information
silveiralexf committed Nov 11, 2024
1 parent daab954 commit 966b587
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 85 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@
All notable changes to this project will be documented in this file.


## 2024-11-11

### 📦 Dependencies

- *(deps)* \[[2580f334](https://github.com/silveiralexf/.dotfiles/commit/2580f334b8bcbeccd0f4005420d0262a6c7c944e)\] bump lazy and fixes for breaking changes


## 2024-11-09

### ⚙️ Chores

- *(profile)* \[[d015f0ac](https://github.com/silveiralexf/.dotfiles/commit/d015f0ac2b8af6c0ebe945da5b2b6e37aa154809)\] fix exports for mise and brew for mason
- *(profile)* \[[daab954b](https://github.com/silveiralexf/.dotfiles/commit/daab954bdb24986500ea3f3376eb1066a6506428)\] fix exports for mise and brew for mason


## 2024-11-05
Expand Down
105 changes: 53 additions & 52 deletions nvim/lazy-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions nvim/lazyvim.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"lazyvim.plugins.extras.vscode"
],
"news": {
"NEWS.md": "6520"
"NEWS.md": "7107"
},
"version": 6
}
}
26 changes: 25 additions & 1 deletion nvim/lua/lsp/servers/eslint.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,30 @@ return {
settings = {
-- helps eslint find the eslintrc when it's placed in a subfolder instead of the cwd root
workingDirectories = { mode = 'auto' },
format = true,
showDocumentation = {
enable = true,
},
command = { 'vscode-eslint-language-server', '--stdio' },
init_options = {
configurationSection = { 'html', 'css', 'javascript' },
embeddedLanguages = {
css = true,
javascript = true,
},
provideFormatter = true,
},
filetypes = {
'javascript',
'javascriptreact',
'javascript.jsx',
'typescript',
'typescriptreact',
'typescript.tsx',
'vue',
'svelte',
'astro',
},
},
},
},
Expand All @@ -21,7 +45,7 @@ return {

local formatter = require('lazyvim.util').lsp.formatter({
name = 'eslint: lsp',
primary = false,
primary = true,
priority = 200,
filter = 'eslint',
})
Expand Down
4 changes: 2 additions & 2 deletions nvim/lua/lsp/servers/html.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ return {
config = function()
local lspconfig = require('lspconfig')
lspconfig.html.setup({
filetypes = { 'htmldjango', 'gohtmltmpl' },
filetypes = { 'htmldjango', 'gohtmltmpl', 'gotmpl' },
})
end,
}, {
'neovim/nvim-lspconfig',
config = function()
local lspconfig = require('lspconfig')
lspconfig.htmx.setup({
filetypes = { 'htmldjango', 'gohtmltmpl' },
filetypes = { 'htmldjango', 'gohtmltmpl', 'gotmpl' },
})
end,
}
90 changes: 68 additions & 22 deletions nvim/lua/plugins/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -109,27 +109,73 @@ return {
})
end,
},
{ 'kosayoda/nvim-lightbulb' },
config = function()
require('nvim-lightbulb').setup({
--ignore = { "null-ls" },
status_test = {
enabled = true,
text = '💡',
text_unavailable = 'no actions',
},
float = {
enabled = true,
},
line = {
enabled = true,
statusline = {
enabled = true,
text = '💡',
text_unavailable = 'no actions',
{
'lukas-reineke/indent-blankline.nvim',
tag = 'v3.8.3',
enabled = true,
main = 'ibl',
opts = {},
dependencies = {
{ 'HiPhish/rainbow-delimiters.nvim', lazy = true },
},

config = function(_)
local highlight = {
'RainbowRed',
'RainbowYellow',
'RainbowBlue',
'RainbowOrange',
'RainbowGreen',
'RainbowViolet',
'RainbowCyan',
'CursorColumn',
'WhiteSpace',
}
local hooks = require('ibl.hooks')
hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
vim.api.nvim_set_hl(0, 'RainbowRed', { fg = '#E06C75' })
vim.api.nvim_set_hl(0, 'RainbowYellow', { fg = '#E5C07B' })
vim.api.nvim_set_hl(0, 'RainbowBlue', { fg = '#61AFEF' })
vim.api.nvim_set_hl(0, 'RainbowOrange', { fg = '#D19A66' })
vim.api.nvim_set_hl(0, 'RainbowGreen', { fg = '#98C379' })
vim.api.nvim_set_hl(0, 'RainbowViolet', { fg = '#C678DD' })
vim.api.nvim_set_hl(0, 'RainbowCyan', { fg = '#56B6C2' })
end)

vim.g.rainbow_delimiters = { highlight = highlight }

require('ibl').setup({
indent = {
highlight = highlight,
char = '',
tab_char = '|',
},
},
})
vim.cmd([[autocmd CursorHold,CursorHoldI * lua require'nvim-lightbulb'.update_lightbulb()]])
end,
scope = {
enabled = false,
show_start = false,
show_end = false,
highlight = highlight,
},
whitespace = {
remove_blankline_trail = false,
},
exclude = {
filetypes = {
'NvimTree',
'Trouble',
'dashboard',
'git',
'help',
'markdown',
'notify',
'packer',
'sagahover',
'terminal',
'undotree',
},
buftypes = { 'terminal', 'nofile', 'prompt', 'quickfix' },
},
})
end,
},
}
8 changes: 4 additions & 4 deletions nvim/lua/plugins/formatting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ return {
cwd = require('conform.util').root_file({ '.git' }),
stdin = false,
},
javascript = { 'prettierd', 'prettier' },
svelte = { 'prettier' },
yamlfmt = {
prepend_args = {
Expand All @@ -27,16 +28,16 @@ return {
opts.formatters_by_ft = {
bash = { 'prettierd' },
css = { { 'prettierd' } },
cue = { 'cue_fmt' },
dagger = { 'cue_fmt' },
erb = { 'prettierd' },
go = { 'goimports', 'gofumpt' },
graphql = { { 'prettierd' } },
groovy = { 'npm_groovy_lint' },
hcl = { 'terraform_fmt' },
html = { 'prettierd' },
java = { 'prettierd' },
cue = { 'cue_fmt' },
dagger = { 'cue_fmt' },
javascript = { 'prettierd' },
javascript = { 'prettierd', 'prettier' },
javascriptreact = { 'prettierd' },
json = { 'prettierd' },
lua = { 'stylua' },
Expand All @@ -53,7 +54,6 @@ return {
typescript = { 'prettierd' },
typescriptreact = { 'prettierd' },
yaml = { 'yamlfmt' },
-- yaml = { 'yamlfix' },
zsh = { 'shfmt' },
['*.md'] = { 'codespell' },
['_'] = { 'trim_whitespace' },
Expand Down
2 changes: 1 addition & 1 deletion nvim/lua/plugins/go.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ return {
require('go').setup()
end,
event = { 'CmdlineEnter' },
ft = { 'go', 'gomod' },
ft = { 'go', 'gomod', 'gowork', 'gosum', 'gotmpl', 'gohtmltmpl', 'gotexttmpl' },

-- if you need to install/update all binaries
build = ':lua require("go.install").update_all_sync()',
Expand Down
19 changes: 19 additions & 0 deletions nvim/spell/en.utf-8.add
Original file line number Diff line number Diff line change
Expand Up @@ -340,3 +340,22 @@ KafkaMirrorMaker
KafkaRebalance
timestamps
MD033
Observability
Ansible
Distro
Kibana
Logstash
ASG
EC2
AMIs
GoCD
SSO
AMI
Telegraf
InfluxDB
MD029
elasticsearch
IAM
automations
Novo
Banco

0 comments on commit 966b587

Please sign in to comment.