Skip to content

Commit e7b6bcc

Browse files
jakubreronjakubreron
committed
refactor: simplify config
1 parent c857a0a commit e7b6bcc

File tree

4 files changed

+77
-271
lines changed

4 files changed

+77
-271
lines changed

‎init.lua‎

Lines changed: 28 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ require('lazy').setup {
9898
---@type snacks.Config
9999
---@diagnostic disable-next-line: missing-fields
100100
opts = {
101-
lazygit = { enabled = true },
102-
git = { enabled = true },
103101
picker = {
104102
hidden = true,
105103
matcher = {
@@ -109,8 +107,6 @@ require('lazy').setup {
109107
win = {
110108
input = {
111109
keys = {
112-
['<C-u>'] = { 'preview_scroll_up', mode = { 'i', 'n' } },
113-
['<C-d>'] = { 'preview_scroll_down', mode = { 'i', 'n' } },
114110
['<C-k>'] = { 'history_back', mode = { 'i', 'n' } },
115111
['<C-j>'] = { 'history_forward', mode = { 'i', 'n' } },
116112
},
@@ -305,13 +301,6 @@ require('lazy').setup {
305301
{ -- NOTE: Must be loaded before dependants
306302
'mason-org/mason.nvim',
307303
config = true,
308-
keys = {
309-
{
310-
'<leader>lm',
311-
'<cmd>Mason<cr>',
312-
desc = '[m]ason',
313-
},
314-
},
315304
},
316305

317306
{ 'mason-org/mason-lspconfig.nvim' },
@@ -346,9 +335,6 @@ require('lazy').setup {
346335
auto_show_delay_ms = 0,
347336
},
348337
},
349-
signature = {
350-
enabled = true,
351-
},
352338
},
353339
},
354340

@@ -467,63 +453,38 @@ require('lazy').setup {
467453
{
468454
'<leader>lf',
469455
function()
470-
require('conform').format { async = true, lsp_format = 'never' }
456+
require('conform').format { lsp_format = 'prefer' }
471457
end,
472458
desc = '[f]ormat buffer',
473459
},
474460
},
475-
config = function()
476-
-- WARNING: eslint-lsp is not a formatter, so we cannot return it, but it provides a command for formatting,
477-
local prettier_paths = { vim.g.monorepo_name }
478-
479-
local js_ts_formatters_callback = function(bufnr)
480-
local buf_modified = vim.api.nvim_get_option_value('modified', { buf = bufnr })
481-
482-
if buf_modified then
483-
vim.cmd 'silent! EslintFixAll'
484-
end
485-
486-
for i = 1, #prettier_paths do
487-
if string.find(vim.api.nvim_buf_get_name(bufnr), prettier_paths[i]) then
488-
return { 'prettierd' }
489-
end
490-
491-
return {}
492-
end
493-
end
494-
495-
require('conform').setup {
496-
notify_on_error = false,
497-
format_on_save = function()
498-
return {
499-
timeout_ms = 500,
500-
lsp_format = 'never',
501-
}
502-
end,
503-
formatters_by_ft = {
504-
lua = { 'stylua' },
505-
506-
javascript = js_ts_formatters_callback,
507-
javascriptreact = js_ts_formatters_callback,
508-
vue = js_ts_formatters_callback,
509-
typescript = js_ts_formatters_callback,
510-
typescriptreact = js_ts_formatters_callback,
511-
512-
css = { 'prettierd' },
513-
scss = { 'prettierd' },
514-
less = { 'prettierd' },
515-
sass = { 'prettierd' },
516-
517-
markdown = { 'markdownlint' },
518-
vimwiki = { 'markdownlint' },
519-
520-
html = { 'prettierd' },
521-
php = { 'prettier' },
522-
yaml = { 'prettierd' },
523-
json = { 'prettier' }, -- NOTE: nice to have prettierd, but it creates bugs in japanese characters
524-
},
525-
}
526-
end,
461+
-- This will provide type hinting with LuaLS
462+
---@module "conform"
463+
---@type conform.setupOpts
464+
opts = {
465+
format_on_save = { lsp_format = 'prefer' },
466+
formatters_by_ft = {
467+
lua = { 'stylua' },
468+
469+
javascript = { 'prettierd' },
470+
javascriptreact = { 'prettierd' },
471+
vue = { 'prettierd' },
472+
typescript = { 'prettierd' },
473+
typescriptreact = { 'prettierd' },
474+
475+
css = { 'prettierd' },
476+
scss = { 'prettierd' },
477+
less = { 'prettierd' },
478+
sass = { 'prettierd' },
479+
html = { 'prettierd' },
480+
php = { 'prettier' },
481+
yaml = { 'prettierd' },
482+
json = { 'prettier' }, -- NOTE: nice to have prettierd, but it creates bugs in japanese characters
483+
484+
markdown = { 'markdownlint' },
485+
vimwiki = { 'markdownlint' },
486+
},
487+
},
527488
},
528489

529490
{ -- Highlight, edit, and navigate code

‎lua/custom/ftplugin-keymaps/javascript-and-typescript.lua‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
local M = {}
22

33
M.config = function(bufnr)
4-
local set_normal_keymap = function(keybind, command, desc)
5-
vim.keymap.set('n', keybind, command, {
6-
buffer = bufnr,
7-
desc = desc,
8-
})
9-
end
4+
local neotest_status_ok = pcall(require, 'neotest')
105

11-
set_normal_keymap(
12-
'<leader>cp',
13-
"yiwOconst t0 = performance.now();<ESC>oconst t1 = performance.now();<ESC>oconsole.log(`%c <ESC>pa call took ${t1 - t0} milliseconds`, 'font-size: 24px; color: green;');<ESC>dkp",
14-
'[p]erformance console.log'
15-
)
6+
if neotest_status_ok then
7+
local set_normal_keymap = function(keybind, command, desc)
8+
vim.keymap.set('n', keybind, command, {
9+
buffer = bufnr,
10+
desc = desc,
11+
})
12+
end
1613

17-
set_normal_keymap(']u', "<cmd>lua require('neotest').jump.next({ status = 'failed' })<cr>", 'next failed [u]nit test')
18-
set_normal_keymap('[u', "<cmd>lua require('neotest').jump.prev({ status = 'failed' })<cr>", 'previous failed [u]nit test')
19-
set_normal_keymap('<leader>ur', function()
20-
vim.cmd "lua require('neotest').output_panel.clear()"
21-
vim.cmd "lua require('neotest').run.run()"
22-
end, '[r]un nearest')
23-
set_normal_keymap('<leader>uf', function()
24-
vim.cmd "lua require('neotest').output_panel.clear()"
25-
vim.cmd "lua require('neotest').run.run(vim.fn.expand('%'))"
26-
end, 'run [f]ile')
27-
set_normal_keymap('<leader>ul', function()
28-
vim.cmd "lua require('neotest').output_panel.clear()"
29-
vim.cmd "lua require('neotest').run.run_last()"
30-
end, 'run [l]ast')
31-
set_normal_keymap('<leader>uc', function()
32-
vim.cmd "lua require('neotest').summary.toggle()"
33-
vim.cmd "lua require('neotest').output_panel.toggle()"
34-
end, '[c]ombo: summary tree + output panel')
35-
set_normal_keymap('<leader>us', '<cmd>lua require("neotest").run.stop()<cr>', '[s]top')
36-
set_normal_keymap('<leader>ut', '<cmd>lua require("neotest").summary.toggle()<cr>', 'summary [t]ree')
37-
set_normal_keymap('<leader>uw', '<cmd>lua require("neotest").run.run({ jestCommand = "jest --watch " })<cr>', '[w]atch')
38-
set_normal_keymap('<leader>ua', '<cmd>lua require("neotest").run.attach()<cr>', '[a]ttach')
39-
set_normal_keymap('<leader>up', '<cmd>lua require("neotest").output_panel.toggle()<cr>', '[p]anel toggle')
40-
set_normal_keymap('<leader>uo', '<cmd>lua require("neotest").output.open({ enter = true })<cr>', '[o]utput')
41-
end
14+
set_normal_keymap(']u', "<cmd>lua require('neotest').jump.next({ status = 'failed' })<cr>", 'next failed [u]nit test')
15+
set_normal_keymap('[u', "<cmd>lua require('neotest').jump.prev({ status = 'failed' })<cr>", 'previous failed [u]nit test')
16+
17+
set_normal_keymap('<leader>ur', function()
18+
vim.cmd "lua require('neotest').output_panel.clear()"
19+
vim.cmd "lua require('neotest').run.run()"
20+
end, '[r]un nearest')
21+
set_normal_keymap('<leader>uf', function()
22+
vim.cmd "lua require('neotest').output_panel.clear()"
23+
vim.cmd "lua require('neotest').run.run(vim.fn.expand('%'))"
24+
end, 'run [f]ile')
25+
set_normal_keymap('<leader>ul', function()
26+
vim.cmd "lua require('neotest').output_panel.clear()"
27+
vim.cmd "lua require('neotest').run.run_last()"
28+
end, 'run [l]ast')
29+
set_normal_keymap('<leader>uc', function()
30+
vim.cmd "lua require('neotest').summary.toggle()"
31+
vim.cmd "lua require('neotest').output_panel.toggle()"
32+
end, '[c]ombo: summary tree + output panel')
4233

34+
set_normal_keymap('<leader>us', '<cmd>lua require("neotest").run.stop()<cr>', '[s]top')
35+
set_normal_keymap('<leader>ut', '<cmd>lua require("neotest").summary.toggle()<cr>', 'summary [t]ree')
36+
set_normal_keymap('<leader>uw', '<cmd>lua require("neotest").run.run({ jestCommand = "jest --watch " })<cr>', '[w]atch')
37+
set_normal_keymap('<leader>ua', '<cmd>lua require("neotest").run.attach()<cr>', '[a]ttach')
38+
set_normal_keymap('<leader>up', '<cmd>lua require("neotest").output_panel.toggle()<cr>', '[p]anel toggle')
39+
set_normal_keymap('<leader>uo', '<cmd>lua require("neotest").output.open({ enter = true })<cr>', '[o]utput')
40+
end
41+
end
4342
return M

‎lua/custom/keymaps.lua‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ vim.keymap.set('n', 'p', ']p', { desc = '[p]aste' }) -- paste with indent
33

44
-- NOTE: toggle
55
vim.keymap.set('n', 'yor', '<cmd>setlocal relativenumber!<cr>', { desc = '[r]elativenumber toggle' })
6-
vim.keymap.set('n', 'yow', '<cmd>setlocal wrap!<cr>', { desc = '[w]rap toggle' })
7-
vim.keymap.set('n', 'yoss', '<cmd>setlocal spell!<cr>', { desc = '[s]pelling toggle' })
8-
vim.keymap.set('n', 'yosp', '<cmd>setlocal spell! spelllang=pl<cr>', { desc = '[p]olish' })
9-
vim.keymap.set('n', 'yose', '<cmd>setlocal spell! spelllang=en<cr>', { desc = '[e]nglish' })
106

117
-- NOTE: jumplist every 5 lines jump with j/k
128
vim.keymap.set('n', 'k', 'v:count > 5 ? "m\'" .. v:count .. "k" : "k"', { expr = true, silent = true })
@@ -21,24 +17,5 @@ vim.keymap.set('c', '<C-d>', '<Delete>')
2117
vim.keymap.set('c', '<A-f>', '<C-Right>')
2218
vim.keymap.set('c', '<A-b>', '<C-Left>')
2319

24-
-- NOTE: navigation
25-
vim.keymap.set('t', '<C-h>', '<C-\\><C-N><C-w>h')
26-
vim.keymap.set('t', '<C-j>', '<C-\\><C-N><C-w>j')
27-
vim.keymap.set('t', '<C-k>', '<C-\\><C-N><C-w>k')
28-
vim.keymap.set('t', '<C-l>', '<C-\\><C-N><C-w>l')
29-
30-
-- NOTE: lazy
31-
vim.keymap.set('n', '<leader>ph', '<cmd>Lazy<cr>', { desc = '[h]ome' })
32-
vim.keymap.set('n', '<leader>ps', '<cmd>Lazy sync<cr>', { desc = '[s]ync' })
33-
vim.keymap.set('n', '<leader>px', '<cmd>Lazy clean<cr>', { desc = '[x]clean' })
34-
vim.keymap.set('n', '<leader>pr', '<cmd>Lazy restore<cr>', { desc = '[r]estore' })
35-
3620
-- NOTE: replace
3721
vim.keymap.set('n', '<leader>ru', [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], { desc = '[u]nder cursor' })
38-
39-
-- NOTE: switch to last tab
40-
vim.api.nvim_create_autocmd('TabLeave', {
41-
callback = function()
42-
vim.api.nvim_set_keymap('n', '<leader><leader>', '<cmd>tabn ' .. vim.api.nvim_tabpage_get_number(0) .. '<cr>', { desc = '[ ] last tab' })
43-
end,
44-
})

0 commit comments

Comments
 (0)