From 5becb7c8b521bd32087f0bff4c7efd2db79803b0 Mon Sep 17 00:00:00 2001 From: Job79 Date: Sun, 6 Sep 2026 20:11:38 +0200 Subject: [PATCH] fix: quotes --- init.lua | 16 ++--- nvim-pack-lock.json | 4 +- plugin/10_options.lua | 6 +- plugin/20_keymaps.lua | 162 +++++++++++++++++++++--------------------- plugin/30_mini.lua | 2 +- plugin/40_plugins.lua | 50 ++++++------- 6 files changed, 120 insertions(+), 120 deletions(-) diff --git a/init.lua b/init.lua index 7d1c831..8830459 100644 --- a/init.lua +++ b/init.lua @@ -1,18 +1,18 @@ -- Modules vim.loader.enable() -vim.opt.runtimepath:remove("/usr/share/nvim/site") -for _, m in ipairs({ "netrw", "netrwPlugin", "gzip", "tarPlugin", "zipPlugin", "tutor_mode_plugin", "rplugin" }) do - vim.g["loaded_" .. m] = 1 +vim.opt.runtimepath:remove('/usr/share/nvim/site') +for _, m in ipairs({ 'netrw', 'netrwPlugin', 'gzip', 'tarPlugin', 'zipPlugin', 'tutor_mode_plugin', 'rplugin' }) do + vim.g['loaded_' .. m] = 1 end -- Config Global -vim.pack.add({ "https://github.com/nvim-mini/mini.nvim" }) -local misc = require("mini.misc") -local gr = vim.api.nvim_create_augroup("custom-config", {}) +vim.pack.add({ 'https://github.com/nvim-mini/mini.nvim' }) +local misc = require('mini.misc') +local gr = vim.api.nvim_create_augroup('custom-config', {}) _G.Config = { - now = function(f) misc.safely("now", f) end, - later = function(f) misc.safely("later", f) end, + now = function(f) misc.safely('now', f) end, + later = function(f) misc.safely('later', f) end, on_event = function(ev, f) misc.safely('event:' .. ev, f) end, on_filetype = function(ft, f) misc.safely('filetype:' .. ft, f) end, autocmd = function(event, pattern, callback, desc) vim.api.nvim_create_autocmd(event, { group = gr, pattern = pattern, callback = callback, desc = desc }) end diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 6b013a2..557151a 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -5,7 +5,7 @@ "src": "https://github.com/stevearc/conform.nvim" }, "mini.nvim": { - "rev": "9d01f392b33fb2ba36fbc87fc0bf4453e63ffb0a", + "rev": "ee23d71c02440668cbca5b0cd8640d79d5bc250b", "src": "https://github.com/nvim-mini/mini.nvim" }, "nvim-dap": { @@ -17,7 +17,7 @@ "src": "https://github.com/neovim/nvim-lspconfig" }, "nvim-treesitter": { - "rev": "41416e81a6c7f4af4984395bfe0cd8d174e70976", + "rev": "0d0969030ad955b510d7c8012b40252a25c12a6d", "src": "https://github.com/nvim-treesitter/nvim-treesitter" }, "rose-pine": { diff --git a/plugin/10_options.lua b/plugin/10_options.lua index 15b7f2a..835458e 100644 --- a/plugin/10_options.lua +++ b/plugin/10_options.lua @@ -21,9 +21,9 @@ vim.o.wrap = false -- Don't visually wrap lines vim.o.winborder = 'rounded' -- Use border in floating windows vim.o.pumborder = 'rounded' -- Use border in popup menu vim.o.cmdheight = 0 -- Hide the command line when not in use -vim.g.syntax_on = 0 -- Disable legacy syntax highlighting -require("vim._core.ui2").enable({ -- Enable new ui (requires nightly) - msg = { targets = "msg" } +vim.cmd('syntax off') -- Disable legacy syntax highlighting +require('vim._core.ui2').enable({ -- Enable new ui (requires nightly) + msg = { targets = 'msg' } }) -- Editing diff --git a/plugin/20_keymaps.lua b/plugin/20_keymaps.lua index f960d0b..7de4d59 100644 --- a/plugin/20_keymaps.lua +++ b/plugin/20_keymaps.lua @@ -1,25 +1,25 @@ -- Clues Config.leader_group_clues = { - { mode = "n", keys = "b", desc = "+Buffer" }, - { mode = "n", keys = "d", desc = "+Debug" }, - { mode = "n", keys = "e", desc = "+Explore" }, - { mode = "n", keys = "f", desc = "+Find" }, - { mode = "n", keys = "g", desc = "+Git" }, - { mode = "n", keys = "l", desc = "+Language" }, - { mode = "n", keys = "r", desc = "+Request" }, - { mode = "n", keys = "s", desc = "+Session" }, - { mode = "n", keys = "t", desc = "+Terminal" }, - { mode = "x", keys = "g", desc = "+Git" }, - { mode = "x", keys = "l", desc = "+Language" }, + { mode = 'n', keys = 'b', desc = '+Buffer' }, + { mode = 'n', keys = 'd', desc = '+Debug' }, + { mode = 'n', keys = 'e', desc = '+Explore' }, + { mode = 'n', keys = 'f', desc = '+Find' }, + { mode = 'n', keys = 'g', desc = '+Git' }, + { mode = 'n', keys = 'l', desc = '+Language' }, + { mode = 'n', keys = 'r', desc = '+Request' }, + { mode = 'n', keys = 's', desc = '+Session' }, + { mode = 'n', keys = 't', desc = '+Terminal' }, + { mode = 'x', keys = 'g', desc = '+Git' }, + { mode = 'x', keys = 'l', desc = '+Language' }, } -- Keymap Helpers local nmap_leader = function(suffix, rhs, desc) - vim.keymap.set("n", "" .. suffix, rhs, { desc = desc, silent = true }) + vim.keymap.set('n', '' .. suffix, rhs, { desc = desc, silent = true }) end local xmap_leader = function(suffix, rhs, desc) - vim.keymap.set("x", "" .. suffix, rhs, { desc = desc, silent = true }) + vim.keymap.set('x', '' .. suffix, rhs, { desc = desc, silent = true }) end -- Buffers @@ -34,21 +34,21 @@ local close_invisible_buffers = function() :each(function(buf) pcall(vim.api.nvim_buf_delete, buf, { force = false }) end) end -nmap_leader("bd", "bdelete", "Delete") -nmap_leader("bD", "bdelete!", "Delete!") -nmap_leader("bs", new_scratch_buffer, "Scratch") -nmap_leader("bw", "bwipeout", "Wipeout") -nmap_leader("bW", "bwipeout!", "Wipeout!") -nmap_leader("bo", close_invisible_buffers, "Close invisible buffers") +nmap_leader('bd', 'bdelete', 'Delete') +nmap_leader('bD', 'bdelete!', 'Delete!') +nmap_leader('bs', new_scratch_buffer, 'Scratch') +nmap_leader('bw', 'bwipeout', 'Wipeout') +nmap_leader('bW', 'bwipeout!', 'Wipeout!') +nmap_leader('bo', close_invisible_buffers, 'Close invisible buffers') -- Debug -nmap_leader("db", "lua require('dap').toggle_breakpoint()", "Toggle Breakpoint") -nmap_leader("dl", "lua require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point: '))", "Log point") -nmap_leader("dc", "lua require('dap').continue()", "Run/Continue") -nmap_leader("dC", "lua require('dap').run_to_cursor()", "Run to Cursor") -nmap_leader("de", "lua require('dap.ui.widgets').hover()", "Inspect") -nmap_leader("dr", "lua require('dap').repl.open()", "Open REPL") -nmap_leader("dt", "lua require('dap').terminate()", "Terminate") +nmap_leader('db', 'lua require("dap").toggle_breakpoint()', 'Toggle Breakpoint') +nmap_leader('dl', 'lua require("dap").set_breakpoint(nil, nil, vim.fn.input("Log point: "))', 'Log point') +nmap_leader('dc', 'lua require("dap").continue()', 'Run/Continue') +nmap_leader('dC', 'lua require("dap").run_to_cursor()', 'Run to Cursor') +nmap_leader('de', 'lua require("dap.ui.widgets").hover()', 'Inspect') +nmap_leader('dr', 'lua require("dap").repl.open()', 'Open REPL') +nmap_leader('dt', 'lua require("dap").terminate()', 'Terminate') -- Explore local explore_at_file = function() @@ -56,75 +56,75 @@ local explore_at_file = function() MiniFiles.open(vim.uv.fs_stat(file) and file or nil) end -nmap_leader("ed", "lua MiniFiles.open()", "Directory") -nmap_leader("ef", explore_at_file, "File directory") -nmap_leader("ey", "lua vim.fn.setreg('+', vim.api.nvim_buf_get_name(0))", "Yank absolute path") -nmap_leader("en", "messages", "Notifications") +nmap_leader('ed', 'lua MiniFiles.open()', 'Directory') +nmap_leader('ef', explore_at_file, 'File directory') +nmap_leader('ey', 'lua vim.fn.setreg("+", vim.api.nvim_buf_get_name(0))', 'Yank absolute path') +nmap_leader('en', 'messages', 'Notifications') -- Find -nmap_leader("fb", "lua MiniPick.builtin.buffers()", "Buffers") -nmap_leader("fc", "lua MiniExtra.pickers.git_commits()", "Commits (all)") -nmap_leader("fC", "lua MiniExtra.pickers.git_commits({ path = '%' })", "Commits (buf)") -nmap_leader("fd", "lua MiniExtra.pickers.diagnostic({ scope = 'all' })", "Diagnostic workspace") -nmap_leader("fD", "lua MiniExtra.pickers.diagnostic({ scope = 'current' })", "Diagnostic buffer") -nmap_leader("ff", "lua MiniPick.builtin.files()", "Files") -nmap_leader("fg", "lua MiniPick.builtin.grep_live()", "Grep live") -nmap_leader("fG", "lua MiniPick.builtin.grep({ pattern = vim.fn.expand('') })", "Grep word") -nmap_leader("fh", "lua MiniPick.builtin.help()", "Help tags") -nmap_leader("fl", "lua MiniPick.builtin.buf_lines({ scope = 'all' })", "Lines (all)") -nmap_leader("fL", "lua MiniPick.builtin.buf_lines({ scope = 'current' })", "Lines (buf)") -nmap_leader("fr", "lua MiniPick.builtin.resume()", "Resume") -nmap_leader("fs", "lua MiniExtra.pickers.lsp({ scope = 'workspace_symbol_live' })", "Symbols workspace") -nmap_leader("fS", "lua MiniExtra.pickers.lsp({ scope = 'document_symbol' })", "Symbols document") -nmap_leader("f:", "lua MiniExtra.pickers.history({ scope = ':' })", "Command history") +nmap_leader('fb', 'lua MiniPick.builtin.buffers()', 'Buffers') +nmap_leader('fc', 'lua MiniExtra.pickers.git_commits()', 'Commits (all)') +nmap_leader('fC', 'lua MiniExtra.pickers.git_commits({ path = "%" })', 'Commits (buf)') +nmap_leader('fd', 'lua MiniExtra.pickers.diagnostic({ scope = "all" })', 'Diagnostic workspace') +nmap_leader('fD', 'lua MiniExtra.pickers.diagnostic({ scope = "current" })', 'Diagnostic buffer') +nmap_leader('ff', 'lua MiniPick.builtin.files()', 'Files') +nmap_leader('fg', 'lua MiniPick.builtin.grep_live()', 'Grep live') +nmap_leader('fG', 'lua MiniPick.builtin.grep({ pattern = vim.fn.expand("") })', 'Grep word') +nmap_leader('fh', 'lua MiniPick.builtin.help()', 'Help tags') +nmap_leader('fl', 'lua MiniPick.builtin.buf_lines({ scope = "all" })', 'Lines (all)') +nmap_leader('fL', 'lua MiniPick.builtin.buf_lines({ scope = "current" })', 'Lines (buf)') +nmap_leader('fr', 'lua MiniPick.builtin.resume()', 'Resume') +nmap_leader('fs', 'lua MiniExtra.pickers.lsp({ scope = "workspace_symbol_live" })', 'Symbols workspace') +nmap_leader('fS', 'lua MiniExtra.pickers.lsp({ scope = "document_symbol" })', 'Symbols document') +nmap_leader('f:', 'lua MiniExtra.pickers.history({ scope = ":" })', 'Command history') -- Git local git_log_cmd = [[Git log --pretty=format:\%h\ \%as\ │\ \%s --topo-order]] -local git_log_buf_cmd = git_log_cmd .. " --follow -- %" +local git_log_buf_cmd = git_log_cmd .. ' --follow -- %' -nmap_leader("ga", "Git diff --cached", "Added diff") -nmap_leader("gA", "Git diff --cached -- %", "Added diff buffer") -nmap_leader("gd", "Git diff", "Diff") -nmap_leader("gD", "Git diff -- %", "Diff buffer") -nmap_leader("gl", "" .. git_log_cmd .. "", "Log") -nmap_leader("gL", "" .. git_log_buf_cmd .. "", "Log buffer") -nmap_leader("go", "lua MiniDiff.toggle_overlay()", "Toggle overlay") -nmap_leader("gs", "lua MiniGit.show_at_cursor()", "Show at cursor") -xmap_leader("gs", "lua MiniGit.show_at_cursor()", "Show at selection") +nmap_leader('ga', 'Git diff --cached', 'Added diff') +nmap_leader('gA', 'Git diff --cached -- %', 'Added diff buffer') +nmap_leader('gd', 'Git diff', 'Diff') +nmap_leader('gD', 'Git diff -- %', 'Diff buffer') +nmap_leader('gl', '' .. git_log_cmd .. '', 'Log') +nmap_leader('gL', '' .. git_log_buf_cmd .. '', 'Log buffer') +nmap_leader('go', 'lua MiniDiff.toggle_overlay()', 'Toggle overlay') +nmap_leader('gs', 'lua MiniGit.show_at_cursor()', 'Show at cursor') +xmap_leader('gs', 'lua MiniGit.show_at_cursor()', 'Show at selection') -- Language -nmap_leader("la", "lua vim.lsp.buf.code_action()", "Actions") -nmap_leader("ld", "lua vim.diagnostic.open_float()", "Diagnostic popup") -nmap_leader("lf", "lua require('conform').format({ async = true })", "Format") -xmap_leader("lf", "lua require('conform').format({ async = true })", "Format selection") -nmap_leader("li", "lua vim.lsp.buf.implementation()", "Implementation") -nmap_leader("lh", "lua vim.lsp.buf.hover()", "Hover") -nmap_leader("ll", "lua vim.lsp.codelens.run()", "Lens") -nmap_leader("lr", "lua vim.lsp.buf.rename()", "Rename") -nmap_leader("lR", "lua vim.lsp.buf.references()", "References") -nmap_leader("ls", "lua vim.lsp.buf.definition()", "Source definition") -nmap_leader("lt", "lua vim.lsp.buf.type_definition()", "Type definition") +nmap_leader('la', 'lua vim.lsp.buf.code_action()', 'Actions') +nmap_leader('ld', 'lua vim.diagnostic.open_float()', 'Diagnostic popup') +nmap_leader('lf', 'lua require("conform").format({ async = true })', 'Format') +xmap_leader('lf', 'lua require("conform").format({ async = true })', 'Format selection') +nmap_leader('li', 'lua vim.lsp.buf.implementation()', 'Implementation') +nmap_leader('lh', 'lua vim.lsp.buf.hover()', 'Hover') +nmap_leader('ll', 'lua vim.lsp.codelens.run()', 'Lens') +nmap_leader('lr', 'lua vim.lsp.buf.rename()', 'Rename') +nmap_leader('lR', 'lua vim.lsp.buf.references()', 'References') +nmap_leader('ls', 'lua vim.lsp.buf.definition()', 'Source definition') +nmap_leader('lt', 'lua vim.lsp.buf.type_definition()', 'Type definition') -- Request -nmap_leader("rs", "lua require('kulala').run()", "Send HTTP request") +nmap_leader('rs', 'lua require("kulala").run()', 'Send HTTP request') -- Session -local session_new = "vim.ui.input({ prompt = 'Session name: ' }, MiniSessions.write)" +local session_new = 'vim.ui.input({ prompt = "Session name: " }, MiniSessions.write)' -nmap_leader("sd", "lua MiniSessions.select('delete')", "Delete") -nmap_leader("sn", "lua " .. session_new .. "", "New") -nmap_leader("sr", "lua MiniSessions.select('read')", "Read") -nmap_leader("sR", "lua MiniSessions.restart()", "Restart") -nmap_leader("sw", "lua MiniSessions.write()", "Write current") +nmap_leader('sd', 'lua MiniSessions.select("delete")', 'Delete') +nmap_leader('sn', 'lua ' .. session_new .. '', 'New') +nmap_leader('sr', 'lua MiniSessions.select("read")', 'Read') +nmap_leader('sR', 'lua MiniSessions.restart()', 'Restart') +nmap_leader('sw', 'lua MiniSessions.write()', 'Write current') -- Terminal -nmap_leader("tT", "horizontal term", "Terminal (horizontal)") -nmap_leader("tt", "vertical term", "Terminal (vertical)") -nmap_leader("tc", "vertical term claude", "Claude") -nmap_leader("tf", "lua require('terminal').open_terminal_app('bash')", "Terminal (popup)") -nmap_leader("tg", "lua require('terminal').open_terminal_app('lazygit')", "LazyGit") -nmap_leader("ts", "lua require('terminal').open_terminal_app('lazysql')", "LazySQL") +nmap_leader('tT', 'horizontal term', 'Terminal (horizontal)') +nmap_leader('tt', 'vertical term', 'Terminal (vertical)') +nmap_leader('tc', 'vertical term claude', 'Claude') +nmap_leader('tf', 'lua require("terminal").open_terminal_app("bash")', 'Terminal (popup)') +nmap_leader('tg', 'lua require("terminal").open_terminal_app("lazygit")', 'LazyGit') +nmap_leader('ts', 'lua require("terminal").open_terminal_app("lazysql")', 'LazySQL') -- Overwrites -vim.keymap.set("n", "", "nohlsearch", { desc = "Clear highlights", silent = true }) -vim.keymap.set("t", "", "", { desc = "Terminal window navigation", silent = true }) +vim.keymap.set('n', '', 'nohlsearch', { desc = 'Clear highlights', silent = true }) +vim.keymap.set('t', '', '', { desc = 'Terminal window navigation', silent = true }) diff --git a/plugin/30_mini.lua b/plugin/30_mini.lua index 03cb6e6..33fa227 100644 --- a/plugin/30_mini.lua +++ b/plugin/30_mini.lua @@ -36,7 +36,7 @@ Config.later(function() { mode = { 'n', 'x' }, keys = 'g' }, { mode = { 'n', 'x' }, keys = "'" }, { mode = { 'n', 'x' }, keys = '`' }, - { mode = { 'n', 'x' }, keys = '"' }, + { mode = { 'n', 'x' }, keys = "'" }, { mode = { 'i', 'c' }, keys = '' }, { mode = 'n', keys = '' }, { mode = { 'n', 'x' }, keys = 's' }, diff --git a/plugin/40_plugins.lua b/plugin/40_plugins.lua index 103eb01..8a6760d 100644 --- a/plugin/40_plugins.lua +++ b/plugin/40_plugins.lua @@ -1,10 +1,10 @@ -- Colortheme Config.now(function() - vim.pack.add({ { src = "https://github.com/rose-pine/neovim", name = "rose-pine" } }) - require("rose-pine").setup({ + vim.pack.add({ { src = 'https://github.com/rose-pine/neovim', name = 'rose-pine' } }) + require('rose-pine').setup({ enable = { terminal = false, legacy_highlights = false, migrations = false }, }) - vim.cmd("colorscheme rose-pine") + vim.cmd('colorscheme rose-pine') end) -- Treesitter @@ -20,7 +20,7 @@ Config.now_if_args(function() Config.on_filetype(table.concat(filetypes, ','), function() local buf = vim.api.nvim_get_current_buf() if pcall(vim.treesitter.start, buf) and vim.bo[buf].filetype == 'php' then - vim.bo[buf].indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + vim.bo[buf].indentexpr = 'v:lua.require"nvim-treesitter".indentexpr()' end end) @@ -33,32 +33,32 @@ end) -- LSP Config.now_if_args(function() - vim.pack.add({ "https://github.com/neovim/nvim-lspconfig" }) - vim.lsp.enable({ "ansiblels", "gopls", "intelephense", "lua_ls", "svelte", "tailwindcss", "tsc", "dartls" }) + vim.pack.add({ 'https://github.com/neovim/nvim-lspconfig' }) + vim.lsp.enable({ 'ansiblels', 'gopls', 'intelephense', 'svelte', 'tailwindcss', 'tsc' }) end) -- Formatting Config.later(function() - vim.pack.add({ "https://github.com/stevearc/conform.nvim" }) - require("conform").setup({ - default_format_opts = { lsp_format = "fallback" }, - format_on_save = { lsp_format = "fallback", timeout_ms = 1000 }, + vim.pack.add({ 'https://github.com/stevearc/conform.nvim' }) + require('conform').setup({ + default_format_opts = { lsp_format = 'fallback' }, + format_on_save = { lsp_format = 'fallback', timeout_ms = 1000 }, formatters_by_ft = { - go = { "gofumpt", "goimports" }, - php = { "php_cs_fixer" }, - json = { "jq" }, - javascript = { "biome" }, - typescript = { "biome" }, - javascriptreact = { "biome" }, - typescriptreact = { "biome" }, - svelte = { "biome" }, + go = { 'gofumpt', 'goimports' }, + php = { 'php_cs_fixer' }, + json = { 'jq' }, + javascript = { 'biome' }, + typescript = { 'biome' }, + javascriptreact = { 'biome' }, + typescriptreact = { 'biome' }, + svelte = { 'biome' }, }, }) end) -- DAP Config.later(function() - vim.pack.add({ "https://github.com/mfussenegger/nvim-dap" }) + vim.pack.add({ 'https://github.com/mfussenegger/nvim-dap' }) local dap_signs = { DapBreakpoint = { text = '', texthl = 'DapBreakpoint' }, @@ -71,20 +71,20 @@ Config.later(function() vim.fn.sign_define(name, sign) end - require("dap").adapters.go = { type = "server", host = "127.0.0.1", port = "${port}" } + require('dap').adapters.go = { type = 'server', host = '127.0.0.1', port = '${port}' } end) -- Kulala Config.on_filetype('http', function() - vim.pack.add({ "https://github.com/mistweaverco/kulala.nvim" }) - require("kulala").setup({ default_env = "dev" }) + vim.pack.add({ 'https://github.com/mistweaverco/kulala.nvim' }) + require('kulala').setup({ default_env = 'dev' }) end) -- Flutter Config.on_filetype('dart', function() vim.pack.add({ - "https://github.com/nvim-lua/plenary.nvim", - "https://github.com/nvim-flutter/flutter-tools.nvim", + 'https://github.com/nvim-lua/plenary.nvim', + 'https://github.com/nvim-flutter/flutter-tools.nvim', }) - require("flutter-tools").setup({ lsp = { color_capabilities = true } }) + require('flutter-tools').setup({ lsp = { color_capabilities = true } }) end)