fix: quotes
This commit is contained in:
@@ -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
|
||||
|
||||
+2
-2
@@ -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": {
|
||||
|
||||
@@ -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
|
||||
|
||||
+81
-81
@@ -1,25 +1,25 @@
|
||||
-- Clues
|
||||
Config.leader_group_clues = {
|
||||
{ mode = "n", keys = "<Leader>b", desc = "+Buffer" },
|
||||
{ mode = "n", keys = "<Leader>d", desc = "+Debug" },
|
||||
{ mode = "n", keys = "<Leader>e", desc = "+Explore" },
|
||||
{ mode = "n", keys = "<Leader>f", desc = "+Find" },
|
||||
{ mode = "n", keys = "<Leader>g", desc = "+Git" },
|
||||
{ mode = "n", keys = "<Leader>l", desc = "+Language" },
|
||||
{ mode = "n", keys = "<Leader>r", desc = "+Request" },
|
||||
{ mode = "n", keys = "<Leader>s", desc = "+Session" },
|
||||
{ mode = "n", keys = "<Leader>t", desc = "+Terminal" },
|
||||
{ mode = "x", keys = "<Leader>g", desc = "+Git" },
|
||||
{ mode = "x", keys = "<Leader>l", desc = "+Language" },
|
||||
{ mode = 'n', keys = '<Leader>b', desc = '+Buffer' },
|
||||
{ mode = 'n', keys = '<Leader>d', desc = '+Debug' },
|
||||
{ mode = 'n', keys = '<Leader>e', desc = '+Explore' },
|
||||
{ mode = 'n', keys = '<Leader>f', desc = '+Find' },
|
||||
{ mode = 'n', keys = '<Leader>g', desc = '+Git' },
|
||||
{ mode = 'n', keys = '<Leader>l', desc = '+Language' },
|
||||
{ mode = 'n', keys = '<Leader>r', desc = '+Request' },
|
||||
{ mode = 'n', keys = '<Leader>s', desc = '+Session' },
|
||||
{ mode = 'n', keys = '<Leader>t', desc = '+Terminal' },
|
||||
{ mode = 'x', keys = '<Leader>g', desc = '+Git' },
|
||||
{ mode = 'x', keys = '<Leader>l', desc = '+Language' },
|
||||
}
|
||||
|
||||
-- Keymap Helpers
|
||||
local nmap_leader = function(suffix, rhs, desc)
|
||||
vim.keymap.set("n", "<Leader>" .. suffix, rhs, { desc = desc, silent = true })
|
||||
vim.keymap.set('n', '<Leader>' .. suffix, rhs, { desc = desc, silent = true })
|
||||
end
|
||||
|
||||
local xmap_leader = function(suffix, rhs, desc)
|
||||
vim.keymap.set("x", "<Leader>" .. suffix, rhs, { desc = desc, silent = true })
|
||||
vim.keymap.set('x', '<Leader>' .. 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", "<Cmd>bdelete<CR>", "Delete")
|
||||
nmap_leader("bD", "<Cmd>bdelete!<CR>", "Delete!")
|
||||
nmap_leader("bs", new_scratch_buffer, "Scratch")
|
||||
nmap_leader("bw", "<Cmd>bwipeout<CR>", "Wipeout")
|
||||
nmap_leader("bW", "<Cmd>bwipeout!<CR>", "Wipeout!")
|
||||
nmap_leader("bo", close_invisible_buffers, "Close invisible buffers")
|
||||
nmap_leader('bd', '<Cmd>bdelete<CR>', 'Delete')
|
||||
nmap_leader('bD', '<Cmd>bdelete!<CR>', 'Delete!')
|
||||
nmap_leader('bs', new_scratch_buffer, 'Scratch')
|
||||
nmap_leader('bw', '<Cmd>bwipeout<CR>', 'Wipeout')
|
||||
nmap_leader('bW', '<Cmd>bwipeout!<CR>', 'Wipeout!')
|
||||
nmap_leader('bo', close_invisible_buffers, 'Close invisible buffers')
|
||||
|
||||
-- Debug
|
||||
nmap_leader("db", "<Cmd>lua require('dap').toggle_breakpoint()<CR>", "Toggle Breakpoint")
|
||||
nmap_leader("dl", "<Cmd>lua require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point: '))<CR>", "Log point")
|
||||
nmap_leader("dc", "<Cmd>lua require('dap').continue()<CR>", "Run/Continue")
|
||||
nmap_leader("dC", "<Cmd>lua require('dap').run_to_cursor()<CR>", "Run to Cursor")
|
||||
nmap_leader("de", "<Cmd>lua require('dap.ui.widgets').hover()<CR>", "Inspect")
|
||||
nmap_leader("dr", "<Cmd>lua require('dap').repl.open()<CR>", "Open REPL")
|
||||
nmap_leader("dt", "<Cmd>lua require('dap').terminate()<CR>", "Terminate")
|
||||
nmap_leader('db', '<Cmd>lua require("dap").toggle_breakpoint()<CR>', 'Toggle Breakpoint')
|
||||
nmap_leader('dl', '<Cmd>lua require("dap").set_breakpoint(nil, nil, vim.fn.input("Log point: "))<CR>', 'Log point')
|
||||
nmap_leader('dc', '<Cmd>lua require("dap").continue()<CR>', 'Run/Continue')
|
||||
nmap_leader('dC', '<Cmd>lua require("dap").run_to_cursor()<CR>', 'Run to Cursor')
|
||||
nmap_leader('de', '<Cmd>lua require("dap.ui.widgets").hover()<CR>', 'Inspect')
|
||||
nmap_leader('dr', '<Cmd>lua require("dap").repl.open()<CR>', 'Open REPL')
|
||||
nmap_leader('dt', '<Cmd>lua require("dap").terminate()<CR>', '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", "<Cmd>lua MiniFiles.open()<CR>", "Directory")
|
||||
nmap_leader("ef", explore_at_file, "File directory")
|
||||
nmap_leader("ey", "<Cmd>lua vim.fn.setreg('+', vim.api.nvim_buf_get_name(0))<CR>", "Yank absolute path")
|
||||
nmap_leader("en", "<Cmd>messages<CR>", "Notifications")
|
||||
nmap_leader('ed', '<Cmd>lua MiniFiles.open()<CR>', 'Directory')
|
||||
nmap_leader('ef', explore_at_file, 'File directory')
|
||||
nmap_leader('ey', '<Cmd>lua vim.fn.setreg("+", vim.api.nvim_buf_get_name(0))<CR>', 'Yank absolute path')
|
||||
nmap_leader('en', '<Cmd>messages<CR>', 'Notifications')
|
||||
|
||||
-- Find
|
||||
nmap_leader("fb", "<Cmd>lua MiniPick.builtin.buffers()<CR>", "Buffers")
|
||||
nmap_leader("fc", "<Cmd>lua MiniExtra.pickers.git_commits()<CR>", "Commits (all)")
|
||||
nmap_leader("fC", "<Cmd>lua MiniExtra.pickers.git_commits({ path = '%' })<CR>", "Commits (buf)")
|
||||
nmap_leader("fd", "<Cmd>lua MiniExtra.pickers.diagnostic({ scope = 'all' })<CR>", "Diagnostic workspace")
|
||||
nmap_leader("fD", "<Cmd>lua MiniExtra.pickers.diagnostic({ scope = 'current' })<CR>", "Diagnostic buffer")
|
||||
nmap_leader("ff", "<Cmd>lua MiniPick.builtin.files()<CR>", "Files")
|
||||
nmap_leader("fg", "<Cmd>lua MiniPick.builtin.grep_live()<CR>", "Grep live")
|
||||
nmap_leader("fG", "<Cmd>lua MiniPick.builtin.grep({ pattern = vim.fn.expand('<cword>') })<CR>", "Grep word")
|
||||
nmap_leader("fh", "<Cmd>lua MiniPick.builtin.help()<CR>", "Help tags")
|
||||
nmap_leader("fl", "<Cmd>lua MiniPick.builtin.buf_lines({ scope = 'all' })<CR>", "Lines (all)")
|
||||
nmap_leader("fL", "<Cmd>lua MiniPick.builtin.buf_lines({ scope = 'current' })<CR>", "Lines (buf)")
|
||||
nmap_leader("fr", "<Cmd>lua MiniPick.builtin.resume()<CR>", "Resume")
|
||||
nmap_leader("fs", "<Cmd>lua MiniExtra.pickers.lsp({ scope = 'workspace_symbol_live' })<CR>", "Symbols workspace")
|
||||
nmap_leader("fS", "<Cmd>lua MiniExtra.pickers.lsp({ scope = 'document_symbol' })<CR>", "Symbols document")
|
||||
nmap_leader("f:", "<Cmd>lua MiniExtra.pickers.history({ scope = ':' })<CR>", "Command history")
|
||||
nmap_leader('fb', '<Cmd>lua MiniPick.builtin.buffers()<CR>', 'Buffers')
|
||||
nmap_leader('fc', '<Cmd>lua MiniExtra.pickers.git_commits()<CR>', 'Commits (all)')
|
||||
nmap_leader('fC', '<Cmd>lua MiniExtra.pickers.git_commits({ path = "%" })<CR>', 'Commits (buf)')
|
||||
nmap_leader('fd', '<Cmd>lua MiniExtra.pickers.diagnostic({ scope = "all" })<CR>', 'Diagnostic workspace')
|
||||
nmap_leader('fD', '<Cmd>lua MiniExtra.pickers.diagnostic({ scope = "current" })<CR>', 'Diagnostic buffer')
|
||||
nmap_leader('ff', '<Cmd>lua MiniPick.builtin.files()<CR>', 'Files')
|
||||
nmap_leader('fg', '<Cmd>lua MiniPick.builtin.grep_live()<CR>', 'Grep live')
|
||||
nmap_leader('fG', '<Cmd>lua MiniPick.builtin.grep({ pattern = vim.fn.expand("<cword>") })<CR>', 'Grep word')
|
||||
nmap_leader('fh', '<Cmd>lua MiniPick.builtin.help()<CR>', 'Help tags')
|
||||
nmap_leader('fl', '<Cmd>lua MiniPick.builtin.buf_lines({ scope = "all" })<CR>', 'Lines (all)')
|
||||
nmap_leader('fL', '<Cmd>lua MiniPick.builtin.buf_lines({ scope = "current" })<CR>', 'Lines (buf)')
|
||||
nmap_leader('fr', '<Cmd>lua MiniPick.builtin.resume()<CR>', 'Resume')
|
||||
nmap_leader('fs', '<Cmd>lua MiniExtra.pickers.lsp({ scope = "workspace_symbol_live" })<CR>', 'Symbols workspace')
|
||||
nmap_leader('fS', '<Cmd>lua MiniExtra.pickers.lsp({ scope = "document_symbol" })<CR>', 'Symbols document')
|
||||
nmap_leader('f:', '<Cmd>lua MiniExtra.pickers.history({ scope = ":" })<CR>', '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", "<Cmd>Git diff --cached<CR>", "Added diff")
|
||||
nmap_leader("gA", "<Cmd>Git diff --cached -- %<CR>", "Added diff buffer")
|
||||
nmap_leader("gd", "<Cmd>Git diff<CR>", "Diff")
|
||||
nmap_leader("gD", "<Cmd>Git diff -- %<CR>", "Diff buffer")
|
||||
nmap_leader("gl", "<Cmd>" .. git_log_cmd .. "<CR>", "Log")
|
||||
nmap_leader("gL", "<Cmd>" .. git_log_buf_cmd .. "<CR>", "Log buffer")
|
||||
nmap_leader("go", "<Cmd>lua MiniDiff.toggle_overlay()<CR>", "Toggle overlay")
|
||||
nmap_leader("gs", "<Cmd>lua MiniGit.show_at_cursor()<CR>", "Show at cursor")
|
||||
xmap_leader("gs", "<Cmd>lua MiniGit.show_at_cursor()<CR>", "Show at selection")
|
||||
nmap_leader('ga', '<Cmd>Git diff --cached<CR>', 'Added diff')
|
||||
nmap_leader('gA', '<Cmd>Git diff --cached -- %<CR>', 'Added diff buffer')
|
||||
nmap_leader('gd', '<Cmd>Git diff<CR>', 'Diff')
|
||||
nmap_leader('gD', '<Cmd>Git diff -- %<CR>', 'Diff buffer')
|
||||
nmap_leader('gl', '<Cmd>' .. git_log_cmd .. '<CR>', 'Log')
|
||||
nmap_leader('gL', '<Cmd>' .. git_log_buf_cmd .. '<CR>', 'Log buffer')
|
||||
nmap_leader('go', '<Cmd>lua MiniDiff.toggle_overlay()<CR>', 'Toggle overlay')
|
||||
nmap_leader('gs', '<Cmd>lua MiniGit.show_at_cursor()<CR>', 'Show at cursor')
|
||||
xmap_leader('gs', '<Cmd>lua MiniGit.show_at_cursor()<CR>', 'Show at selection')
|
||||
|
||||
-- Language
|
||||
nmap_leader("la", "<Cmd>lua vim.lsp.buf.code_action()<CR>", "Actions")
|
||||
nmap_leader("ld", "<Cmd>lua vim.diagnostic.open_float()<CR>", "Diagnostic popup")
|
||||
nmap_leader("lf", "<Cmd>lua require('conform').format({ async = true })<CR>", "Format")
|
||||
xmap_leader("lf", "<Cmd>lua require('conform').format({ async = true })<CR>", "Format selection")
|
||||
nmap_leader("li", "<Cmd>lua vim.lsp.buf.implementation()<CR>", "Implementation")
|
||||
nmap_leader("lh", "<Cmd>lua vim.lsp.buf.hover()<CR>", "Hover")
|
||||
nmap_leader("ll", "<Cmd>lua vim.lsp.codelens.run()<CR>", "Lens")
|
||||
nmap_leader("lr", "<Cmd>lua vim.lsp.buf.rename()<CR>", "Rename")
|
||||
nmap_leader("lR", "<Cmd>lua vim.lsp.buf.references()<CR>", "References")
|
||||
nmap_leader("ls", "<Cmd>lua vim.lsp.buf.definition()<CR>", "Source definition")
|
||||
nmap_leader("lt", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", "Type definition")
|
||||
nmap_leader('la', '<Cmd>lua vim.lsp.buf.code_action()<CR>', 'Actions')
|
||||
nmap_leader('ld', '<Cmd>lua vim.diagnostic.open_float()<CR>', 'Diagnostic popup')
|
||||
nmap_leader('lf', '<Cmd>lua require("conform").format({ async = true })<CR>', 'Format')
|
||||
xmap_leader('lf', '<Cmd>lua require("conform").format({ async = true })<CR>', 'Format selection')
|
||||
nmap_leader('li', '<Cmd>lua vim.lsp.buf.implementation()<CR>', 'Implementation')
|
||||
nmap_leader('lh', '<Cmd>lua vim.lsp.buf.hover()<CR>', 'Hover')
|
||||
nmap_leader('ll', '<Cmd>lua vim.lsp.codelens.run()<CR>', 'Lens')
|
||||
nmap_leader('lr', '<Cmd>lua vim.lsp.buf.rename()<CR>', 'Rename')
|
||||
nmap_leader('lR', '<Cmd>lua vim.lsp.buf.references()<CR>', 'References')
|
||||
nmap_leader('ls', '<Cmd>lua vim.lsp.buf.definition()<CR>', 'Source definition')
|
||||
nmap_leader('lt', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', 'Type definition')
|
||||
|
||||
-- Request
|
||||
nmap_leader("rs", "<Cmd>lua require('kulala').run()<CR>", "Send HTTP request")
|
||||
nmap_leader('rs', '<Cmd>lua require("kulala").run()<CR>', '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", "<Cmd>lua MiniSessions.select('delete')<CR>", "Delete")
|
||||
nmap_leader("sn", "<Cmd>lua " .. session_new .. "<CR>", "New")
|
||||
nmap_leader("sr", "<Cmd>lua MiniSessions.select('read')<CR>", "Read")
|
||||
nmap_leader("sR", "<Cmd>lua MiniSessions.restart()<CR>", "Restart")
|
||||
nmap_leader("sw", "<Cmd>lua MiniSessions.write()<CR>", "Write current")
|
||||
nmap_leader('sd', '<Cmd>lua MiniSessions.select("delete")<CR>', 'Delete')
|
||||
nmap_leader('sn', '<Cmd>lua ' .. session_new .. '<CR>', 'New')
|
||||
nmap_leader('sr', '<Cmd>lua MiniSessions.select("read")<CR>', 'Read')
|
||||
nmap_leader('sR', '<Cmd>lua MiniSessions.restart()<CR>', 'Restart')
|
||||
nmap_leader('sw', '<Cmd>lua MiniSessions.write()<CR>', 'Write current')
|
||||
|
||||
-- Terminal
|
||||
nmap_leader("tT", "<Cmd>horizontal term<CR>", "Terminal (horizontal)")
|
||||
nmap_leader("tt", "<Cmd>vertical term<CR>", "Terminal (vertical)")
|
||||
nmap_leader("tc", "<Cmd>vertical term claude<CR>", "Claude")
|
||||
nmap_leader("tf", "<Cmd>lua require('terminal').open_terminal_app('bash')<CR>", "Terminal (popup)")
|
||||
nmap_leader("tg", "<Cmd>lua require('terminal').open_terminal_app('lazygit')<CR>", "LazyGit")
|
||||
nmap_leader("ts", "<Cmd>lua require('terminal').open_terminal_app('lazysql')<CR>", "LazySQL")
|
||||
nmap_leader('tT', '<Cmd>horizontal term<CR>', 'Terminal (horizontal)')
|
||||
nmap_leader('tt', '<Cmd>vertical term<CR>', 'Terminal (vertical)')
|
||||
nmap_leader('tc', '<Cmd>vertical term claude<CR>', 'Claude')
|
||||
nmap_leader('tf', '<Cmd>lua require("terminal").open_terminal_app("bash")<CR>', 'Terminal (popup)')
|
||||
nmap_leader('tg', '<Cmd>lua require("terminal").open_terminal_app("lazygit")<CR>', 'LazyGit')
|
||||
nmap_leader('ts', '<Cmd>lua require("terminal").open_terminal_app("lazysql")<CR>', 'LazySQL')
|
||||
|
||||
-- Overwrites
|
||||
vim.keymap.set("n", "<Esc>", "<Cmd>nohlsearch<CR>", { desc = "Clear highlights", silent = true })
|
||||
vim.keymap.set("t", "<C-w>", "<C-\\><C-n><C-w>", { desc = "Terminal window navigation", silent = true })
|
||||
vim.keymap.set('n', '<Esc>', '<Cmd>nohlsearch<CR>', { desc = 'Clear highlights', silent = true })
|
||||
vim.keymap.set('t', '<C-w>', '<C-\\><C-n><C-w>', { desc = 'Terminal window navigation', silent = true })
|
||||
|
||||
+1
-1
@@ -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 = '<C-r>' },
|
||||
{ mode = 'n', keys = '<C-w>' },
|
||||
{ mode = { 'n', 'x' }, keys = 's' },
|
||||
|
||||
+25
-25
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user