mirror of
https://github.com/iofq/nvim.nix.git
synced 2026-01-23 08:55:16 -06:00
lint
This commit is contained in:
parent
b33413dd18
commit
9082d546f6
19 changed files with 362 additions and 291 deletions
|
|
@ -1,2 +1,2 @@
|
|||
vim.cmd("colorscheme terafox")
|
||||
vim.keymap.set("n", "<leader>aa", "<cmd>AerialToggle!<CR>", { desc = "Toggle Aerial" })
|
||||
vim.cmd('colorscheme terafox')
|
||||
vim.keymap.set('n', '<leader>aa', '<cmd>AerialToggle!<CR>', { desc = 'Toggle Aerial' })
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
-- vim settings ++ mini.nvim.basics
|
||||
----------------------------------------
|
||||
vim.opt.backspace = "indent,eol,start"
|
||||
vim.opt.completeopt = "menuone"
|
||||
vim.opt.backspace = 'indent,eol,start'
|
||||
vim.opt.completeopt = 'menuone'
|
||||
vim.opt.expandtab = true -- insert tabs as spaces
|
||||
vim.opt.inccommand = "split" -- incremental live completion
|
||||
vim.opt.inccommand = 'split' -- incremental live completion
|
||||
vim.opt.laststatus = 1
|
||||
vim.opt.list = true
|
||||
vim.opt.nrformats:append("alpha") -- let Ctrl-a do letters as well
|
||||
vim.opt.path:append("**") -- enable fuzzy :find ing
|
||||
vim.opt.nrformats:append('alpha') -- let Ctrl-a do letters as well
|
||||
vim.opt.path:append('**') -- enable fuzzy :find ing
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.shadafile = "NONE" -- disable shada
|
||||
vim.opt.shadafile = 'NONE' -- disable shada
|
||||
vim.opt.shiftwidth = 0 -- >> shifts by tabstop
|
||||
vim.opt.showmatch = true -- highlight matching brackets
|
||||
vim.opt.showmode = true
|
||||
|
|
@ -17,7 +17,7 @@ vim.opt.softtabstop = -1 -- backspace removes tabstop
|
|||
vim.opt.swapfile = false
|
||||
vim.opt.tabstop = 2 -- 2 space tabs are based
|
||||
vim.opt.updatetime = 250 -- decrease update time
|
||||
vim.opt.virtualedit = "onemore"
|
||||
vim.opt.virtualedit = 'onemore'
|
||||
|
||||
vim.g.fzf_layout = { window = { width = 0.9, height = 0.6 } }
|
||||
|
||||
|
|
@ -25,16 +25,16 @@ vim.g.fzf_layout = { window = { width = 0.9, height = 0.6 } }
|
|||
vim.cmd([[ hi NormalFloat ctermbg=none ]])
|
||||
|
||||
-- Switch tab length on the fly
|
||||
vim.keymap.set("n", "\\t", function()
|
||||
vim.keymap.set('n', '\\t', function()
|
||||
vim.o.tabstop = vim.o.tabstop == 2 and 4 or 2
|
||||
end, { silent = true, desc = "toggle tabstop"})
|
||||
end, { silent = true, desc = 'toggle tabstop' })
|
||||
|
||||
-- autocmd
|
||||
----------------------------------------
|
||||
local undopath = "~/.local/share/nvim/undo"
|
||||
vim.api.nvim_create_autocmd("VimEnter", {
|
||||
command = "silent !mkdir -p " .. undopath,
|
||||
group = vim.api.nvim_create_augroup("Init", {}),
|
||||
local undopath = '~/.local/share/nvim/undo'
|
||||
vim.api.nvim_create_autocmd('VimEnter', {
|
||||
command = 'silent !mkdir -p ' .. undopath,
|
||||
group = vim.api.nvim_create_augroup('Init', {}),
|
||||
})
|
||||
|
||||
-- Configure Neovim diagnostic messages
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ if vim.g.did_load_aerial_plugin then
|
|||
end
|
||||
vim.g.did_load_aerial_plugin = true
|
||||
|
||||
require("aerial").setup({
|
||||
default_direction = "left",
|
||||
require('aerial').setup {
|
||||
default_direction = 'left',
|
||||
autojump = true,
|
||||
on_attach = function(bufnr)
|
||||
vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
|
||||
vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
|
||||
vim.keymap.set('n', '{', '<cmd>AerialPrev<CR>', { buffer = bufnr })
|
||||
vim.keymap.set('n', '}', '<cmd>AerialNext<CR>', { buffer = bufnr })
|
||||
end,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,17 +3,17 @@ if vim.g.did_load_colors_plugin then
|
|||
end
|
||||
vim.g.did_load_colors_plugin = true
|
||||
|
||||
require("rose-pine").setup({
|
||||
variant = "moon",
|
||||
require('rose-pine').setup {
|
||||
variant = 'moon',
|
||||
styles = {
|
||||
bold = false,
|
||||
italic = false,
|
||||
transparency = true,
|
||||
},
|
||||
})
|
||||
require('nightfox').setup({
|
||||
}
|
||||
require('nightfox').setup {
|
||||
options = {
|
||||
transparent = true, -- Disable setting background
|
||||
terminal_colors = false, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal`
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ if vim.g.did_load_completion_plugin then
|
|||
return
|
||||
end
|
||||
vim.g.did_load_completion_plugin = true
|
||||
local cmp = require'cmp'
|
||||
local cmp = require('cmp')
|
||||
|
||||
cmp.setup({
|
||||
cmp.setup {
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
|
|
@ -14,34 +14,34 @@ cmp.setup({
|
|||
native_menu = false,
|
||||
ghost_text = true,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
mapping = cmp.mapping.preset.insert {
|
||||
['<C-j>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-k>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['q'] = cmp.mapping.abort(),
|
||||
['<C-Space>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||
}),
|
||||
['<C-Space>'] = cmp.mapping.confirm { select = true }, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||
},
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
}, {
|
||||
{ name = 'buffer' },
|
||||
})
|
||||
})
|
||||
}),
|
||||
}
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
{ name = 'buffer' },
|
||||
},
|
||||
})
|
||||
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
{ name = 'path' },
|
||||
}, {
|
||||
{ name = 'cmdline' }
|
||||
{ name = 'cmdline' },
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false }
|
||||
matching = { disallow_symbol_nonprefix_matching = false },
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ if vim.g.did_load_diffview_plugin then
|
|||
end
|
||||
vim.g.did_load_diffview_plugin = true
|
||||
|
||||
require("diffview").setup({ use_icons = false, })
|
||||
require('diffview').setup { use_icons = false }
|
||||
vim.keymap.set('n', '<leader>gdd', vim.cmd.DiffviewOpen, { desc = '[g]it [d]iffview open' })
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ if vim.g.did_load_diffview_plugin then
|
|||
return
|
||||
end
|
||||
vim.g.did_load_diffview_plugin = true
|
||||
require("diffview").setup({
|
||||
require('diffview').setup {
|
||||
use_icons = false,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,22 +9,34 @@ vim.schedule(function()
|
|||
numhl = true,
|
||||
on_attach = function()
|
||||
local gs = package.loaded.gitsigns
|
||||
vim.keymap.set("n", "<leader>gg", gs.preview_hunk, {desc = "git preview hunk"})
|
||||
vim.keymap.set('n', '<leader>gb', function() gs.blame_line{full=true} end, {desc = "git blame_line"})
|
||||
vim.keymap.set('n', '<leader>gr', gs.reset_hunk, {desc = "git reset hunk"})
|
||||
vim.keymap.set('v', '<leader>gr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end, {desc = "git reset hunk"})
|
||||
vim.keymap.set('n', '<leader>gg', gs.preview_hunk, { desc = 'git preview hunk' })
|
||||
vim.keymap.set('n', '<leader>gb', function()
|
||||
gs.blame_line { full = true }
|
||||
end, { desc = 'git blame_line' })
|
||||
vim.keymap.set('n', '<leader>gr', gs.reset_hunk, { desc = 'git reset hunk' })
|
||||
vim.keymap.set('v', '<leader>gr', function()
|
||||
gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') }
|
||||
end, { desc = 'git reset hunk' })
|
||||
-- Navigation
|
||||
vim.keymap.set('n', ']g', function()
|
||||
if vim.wo.diff then return ']c' end
|
||||
vim.schedule(function() gs.next_hunk() end)
|
||||
if vim.wo.diff then
|
||||
return ']c'
|
||||
end
|
||||
vim.schedule(function()
|
||||
gs.next_hunk()
|
||||
end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true })
|
||||
|
||||
vim.keymap.set('n', '[g', function()
|
||||
if vim.wo.diff then return '[c' end
|
||||
vim.schedule(function() gs.prev_hunk() end)
|
||||
if vim.wo.diff then
|
||||
return '[c'
|
||||
end
|
||||
vim.schedule(function()
|
||||
gs.prev_hunk()
|
||||
end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true })
|
||||
end
|
||||
end,
|
||||
}
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
vim.keymap.set("n","gr", "gT", {noremap = true, silent = true})
|
||||
vim.keymap.set("n","n", "nzz", {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "N", "Nzz", {noremap = true, silent = true})
|
||||
vim.keymap.set('n', 'gr', 'gT', { noremap = true, silent = true })
|
||||
vim.keymap.set('n', 'n', 'nzz', { noremap = true, silent = true })
|
||||
vim.keymap.set('n', 'N', 'Nzz', { noremap = true, silent = true })
|
||||
vim.keymap.set('n', '<C-d>', '<C-d>zz')
|
||||
vim.keymap.set('n', '<C-u>', '<C-u>zz')
|
||||
vim.keymap.set('n', '<C-f>', '<C-f>zz')
|
||||
vim.keymap.set('n', '<C-b>', '<C-b>zz')
|
||||
vim.keymap.set("n","<CR>", "m0i<cr><Esc>`0", {noremap = true, silent = true})
|
||||
vim.keymap.set('n', '<CR>', 'm0i<cr><Esc>`0', { noremap = true, silent = true })
|
||||
vim.keymap.set({ 'v', 'i' }, 'wq', '<esc>l', { noremap = true, silent = true })
|
||||
vim.keymap.set({ 'n', 'v', 'i' }, 'qwq', '<esc>l<cmd>wqa<CR>', { noremap = true, silent = true })
|
||||
vim.keymap.set({'n', 'v'}, '<leader>yy', '"+y', {noremap = true, silent = true, desc = "Yank to clip"})
|
||||
vim.keymap.set({'n', 'v'}, '<leader>yp', '"+p', {noremap = true, silent = true, desc = "Paste from clip"})
|
||||
vim.keymap.set({'n', 'v'}, '<leader>yd', '"+d', {noremap = true, silent = true, desc = "Delete to clip"})
|
||||
vim.keymap.set({ 'n', 'v' }, '<leader>yy', '"+y', { noremap = true, silent = true, desc = 'Yank to clip' })
|
||||
vim.keymap.set({ 'n', 'v' }, '<leader>yp', '"+p', { noremap = true, silent = true, desc = 'Paste from clip' })
|
||||
vim.keymap.set({ 'n', 'v' }, '<leader>yd', '"+d', { noremap = true, silent = true, desc = 'Delete to clip' })
|
||||
|
|
|
|||
|
|
@ -7,23 +7,24 @@ vim.g.did_load_lsp_plugin = true
|
|||
local lspconfig = require('lspconfig')
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
lspconfig.gopls.setup { on_attach = function(_, bufnr)
|
||||
lspconfig.gopls.setup {
|
||||
on_attach = function(_, bufnr)
|
||||
capabilities = capabilities
|
||||
vim.api.nvim_command("au BufWritePre <buffer> lua vim.lsp.buf.format { async = false }")
|
||||
end
|
||||
vim.api.nvim_command('au BufWritePre <buffer> lua vim.lsp.buf.format { async = false }')
|
||||
end,
|
||||
}
|
||||
lspconfig.pyright.setup { capabilities = capabilities }
|
||||
lspconfig.nil_ls.setup { capabilities = capabilities }
|
||||
|
||||
vim.keymap.set('n', '<leader>de', vim.diagnostic.open_float, {desc = "Toggle diagnostic"})
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, {desc = "Prev diagnostic"})
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, {desc = "Next diagnostic"})
|
||||
vim.keymap.set('n', '<leader>de', vim.diagnostic.open_float, { desc = 'Toggle diagnostic' })
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Prev diagnostic' })
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Next diagnostic' })
|
||||
|
||||
vim.diagnostic.config({
|
||||
vim.diagnostic.config {
|
||||
virtual_text = true,
|
||||
underline = true,
|
||||
update_in_insert = false,
|
||||
})
|
||||
}
|
||||
-- Use LspAttach autocommand to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
|
|
@ -33,18 +34,58 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
|||
local client = vim.lsp.get_client_by_id(ev.data.client_id)
|
||||
-- Buffer local mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf, noremap = true, silent = true , desc = "LSP hover"})
|
||||
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, { buffer = ev.buf, noremap = true, silent = true , desc = "LSP Rename"})
|
||||
vim.keymap.set({ 'n', 'v' }, '<leader>da', vim.lsp.buf.code_action, { buffer = ev.buf, noremap = true, silent = true , desc = "LSP code action"})
|
||||
vim.keymap.set("n", "<leader>dd", "<cmd>Telescope lsp_definitions<cr>", { buffer = ev.buf, noremap = true, silent = true , desc = "LSP definitions"})
|
||||
vim.keymap.set("n", "<leader>di", "<cmd>Telescope lsp_implementations<cr>", { buffer = ev.buf, noremap = true, silent = true , desc = "LSP implementations"})
|
||||
vim.keymap.set("n", "<leader>dr", "<cmd>Telescope lsp_references<cr>", { buffer = ev.buf, noremap = true, silent = true , desc = "LSP references"})
|
||||
vim.keymap.set("n", "<leader>dt", "<cmd>Telescope lsp_type_definitions<cr>", { buffer = ev.buf, noremap = true, silent = true , desc = "LSP type defs"})
|
||||
vim.keymap.set("n", "<leader>ds", "<cmd>Telescope lsp_document_symbols<cr>", { buffer = ev.buf, noremap = true, silent = true , desc = "LSP symbols"})
|
||||
vim.keymap.set('n', '<leader>dl', vim.lsp.codelens.run, { buffer = ev.buf, noremap = true, silent = true , desc = "LSP codelens"})
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP hover' })
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>rn',
|
||||
vim.lsp.buf.rename,
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP Rename' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
{ 'n', 'v' },
|
||||
'<leader>da',
|
||||
vim.lsp.buf.code_action,
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP code action' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>dd',
|
||||
'<cmd>Telescope lsp_definitions<cr>',
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP definitions' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>di',
|
||||
'<cmd>Telescope lsp_implementations<cr>',
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP implementations' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>dr',
|
||||
'<cmd>Telescope lsp_references<cr>',
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP references' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>dt',
|
||||
'<cmd>Telescope lsp_type_definitions<cr>',
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP type defs' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>ds',
|
||||
'<cmd>Telescope lsp_document_symbols<cr>',
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP symbols' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>dl',
|
||||
vim.lsp.codelens.run,
|
||||
{ buffer = ev.buf, noremap = true, silent = true, desc = 'LSP codelens' }
|
||||
)
|
||||
vim.keymap.set('n', '<space>df', function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end,{ buffer = ev.buf, noremap = true, silent = true , desc = "LSP format"})
|
||||
end, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP format' })
|
||||
-- Auto-refresh code lenses
|
||||
if not client then
|
||||
return
|
||||
|
|
@ -62,4 +103,3 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
|||
end
|
||||
end,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -3,26 +3,26 @@ if vim.g.did_load_luasnip_plugin then
|
|||
end
|
||||
vim.g.did_load_luasnip_plugin = true
|
||||
|
||||
local ls = require("luasnip")
|
||||
local ls = require('luasnip')
|
||||
ls.config.set_config {
|
||||
history = true,
|
||||
updateevents = "TextChanged, TextChangedI",
|
||||
updateevents = 'TextChanged, TextChangedI',
|
||||
}
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
require('luasnip.loaders.from_vscode').lazy_load()
|
||||
|
||||
vim.keymap.set({"i", "s"}, "<C-K>", function()
|
||||
vim.keymap.set({ 'i', 's' }, '<C-K>', function()
|
||||
if ls.expand_or_jumpable() then
|
||||
ls.expand_or_jump()
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set({"i", "s"}, "<C-J>", function()
|
||||
vim.keymap.set({ 'i', 's' }, '<C-J>', function()
|
||||
if ls.jumpable(-1) then
|
||||
ls.jump(-1)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set({"i", "s"}, "<C-L>", function()
|
||||
vim.keymap.set({ 'i', 's' }, '<C-L>', function()
|
||||
if ls.choice_active() then
|
||||
ls.change_choice(1)
|
||||
end
|
||||
|
|
@ -31,7 +31,7 @@ end, {silent = true})
|
|||
--------------------
|
||||
-- Snippets --
|
||||
--------------------
|
||||
local fmta = require("luasnip.extras.fmt").fmta
|
||||
ls.add_snippets("go", {
|
||||
ls.snippet("ie", fmta("if err != nil {\n\treturn <err>\n}", { err = ls.insert_node(1, "err") })),
|
||||
local fmta = require('luasnip.extras.fmt').fmta
|
||||
ls.add_snippets('go', {
|
||||
ls.snippet('ie', fmta('if err != nil {\n\treturn <err>\n}', { err = ls.insert_node(1, 'err') })),
|
||||
})
|
||||
|
|
|
|||
|
|
@ -21,11 +21,9 @@ require('mini.surround').setup()
|
|||
|
||||
-- :Trim
|
||||
require('mini.trailspace').setup()
|
||||
vim.api.nvim_create_user_command('Trim',
|
||||
function()
|
||||
require("mini.trailspace").trim()
|
||||
end, {}
|
||||
)
|
||||
vim.api.nvim_create_user_command('Trim', function()
|
||||
require('mini.trailspace').trim()
|
||||
end, {})
|
||||
|
||||
-- prefix \
|
||||
-- `b` - |'background'|.
|
||||
|
|
@ -39,31 +37,31 @@ vim.api.nvim_create_user_command('Trim',
|
|||
-- `r` - |'relativenumber'|.
|
||||
-- `s` - |'spell'|.
|
||||
-- `w` - |'wrap'|.
|
||||
require('mini.basics').setup({
|
||||
require('mini.basics').setup {
|
||||
mappings = {
|
||||
windows = true
|
||||
windows = true,
|
||||
},
|
||||
}
|
||||
})
|
||||
|
||||
-- gS
|
||||
require('mini.splitjoin').setup({
|
||||
require('mini.splitjoin').setup {
|
||||
detect = {
|
||||
separator = '[,;\n]'
|
||||
separator = '[,;\n]',
|
||||
},
|
||||
}
|
||||
})
|
||||
|
||||
require('mini.pairs').setup()
|
||||
vim.cmd([[ hi MiniCursorwordCurrent ctermfg=240 ]])
|
||||
|
||||
-- f F t T
|
||||
require('mini.jump').setup()
|
||||
require('mini.jump2d').setup({
|
||||
mappings = { start_jumping = '<leader>s' }
|
||||
})
|
||||
require('mini.jump2d').setup {
|
||||
mappings = { start_jumping = '<leader>s' },
|
||||
}
|
||||
|
||||
indent = require('mini.indentscope')
|
||||
indent.setup({
|
||||
indent.setup {
|
||||
options = { try_as_border = false },
|
||||
draw = { delay = 0 }
|
||||
})
|
||||
draw = { delay = 0 },
|
||||
}
|
||||
indent.gen_animation.none()
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@ vim.g.did_load_plugins_plugin = true
|
|||
-- many plugins annoyingly require a call to a 'setup' function to be loaded,
|
||||
-- even with default configs
|
||||
|
||||
require("neogen").setup{}
|
||||
vim.keymap.set("n","<leader>nd", "<cmd>Neogen<CR>", {noremap = true, silent = true, desc = "Neogen - gen comments"})
|
||||
require('neogen').setup {}
|
||||
vim.keymap.set('n', '<leader>nd', '<cmd>Neogen<CR>', { noremap = true, silent = true, desc = 'Neogen - gen comments' })
|
||||
|
||||
require("toggleterm").setup{
|
||||
require('toggleterm').setup {
|
||||
open_mapping = [[<C-\>]],
|
||||
direction = "float",
|
||||
direction = 'float',
|
||||
close_on_exit = true,
|
||||
}
|
||||
|
||||
require('which-key').setup {
|
||||
preset = 'helix'
|
||||
preset = 'helix',
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ neogit.setup {
|
|||
fzf_lua = true,
|
||||
},
|
||||
}
|
||||
vim.keymap.set('n', '<leader>ng', neogit.open, { noremap = true, silent = true, desc = "Neogit"})
|
||||
vim.keymap.set('n', '<leader>ng', neogit.open, { noremap = true, silent = true, desc = 'Neogit' })
|
||||
|
|
|
|||
|
|
@ -4,20 +4,20 @@ end
|
|||
vim.g.did_load_oil_plugin = true
|
||||
|
||||
local oil = require('oil')
|
||||
oil.setup({
|
||||
oil.setup {
|
||||
watch_for_changes = true,
|
||||
columns = {
|
||||
"permissions",
|
||||
"size"
|
||||
'permissions',
|
||||
'size',
|
||||
},
|
||||
view_options = {
|
||||
show_hidden = true
|
||||
show_hidden = true,
|
||||
},
|
||||
keymaps = {
|
||||
["wq"] = "actions.close"
|
||||
['wq'] = 'actions.close',
|
||||
},
|
||||
}
|
||||
})
|
||||
vim.keymap.set("n", "<leader>c", oil.toggle_float, {noremap = true, silent = true});
|
||||
vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<cr>")
|
||||
vim.keymap.set('n', '<leader>c', oil.toggle_float, { noremap = true, silent = true })
|
||||
vim.keymap.set('n', '<leader>u', '<cmd>UndotreeToggle<cr>')
|
||||
vim.g.undotree_ShortIndicators = 1
|
||||
vim.g.undotree_SetFocusWhenToggle = 1
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ if vim.g.did_load_diffview_plugin then
|
|||
return
|
||||
end
|
||||
vim.g.did_load_diffview_plugin = true
|
||||
require("diffview").setup({
|
||||
require('diffview').setup {
|
||||
use_icons = false,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ if vim.g.did_load_telescope_plugin then
|
|||
end
|
||||
vim.g.did_load_telescope_plugin = true
|
||||
|
||||
local telescope = require("telescope.builtin")
|
||||
local telescope = require('telescope.builtin')
|
||||
|
||||
-- Fall back to find_files if not in a git repo
|
||||
local project_files = function()
|
||||
|
|
@ -14,34 +14,54 @@ local project_files = function()
|
|||
end
|
||||
end
|
||||
|
||||
vim.keymap.set("n", "<leader><leader>", telescope.buffers, {noremap = true, silent = true, desc = "Fuzzy find buffers"})
|
||||
vim.keymap.set("n", "<leader>ff", project_files, {noremap = true, silent = true, desc = "Fuzzy find git files"})
|
||||
vim.keymap.set("n", "<leader>fg", telescope.find_files, {noremap = true, silent = true, desc = "Fuzzy find files"})
|
||||
vim.keymap.set("n", "<leader>fc", telescope.command_history, {noremap = true, silent = true, desc = "Fuzzy find command_history"})
|
||||
vim.keymap.set("n", "<leader>fa", telescope.live_grep, {noremap = true, silent = true, desc = "Fuzzy find grep"})
|
||||
vim.keymap.set("n", "<leader>f8", telescope.grep_string, {noremap = true, silent = true, desc = "Fuzzy find grep current word"})
|
||||
vim.keymap.set("n", "<leader>fs", telescope.treesitter, {noremap = true, silent = true, desc = "Fuzzy find treesitter objects"})
|
||||
vim.keymap.set("n", "<leader>fq", telescope.quickfix, {noremap = true, silent = true, desc = "Fuzzy find quickfix"})
|
||||
vim.keymap.set("n", "<leader>f<BS>", telescope.resume, {noremap = true, silent = true, desc = "Fuzzy find resume"})
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader><leader>',
|
||||
telescope.buffers,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find buffers' }
|
||||
)
|
||||
vim.keymap.set('n', '<leader>ff', project_files, { noremap = true, silent = true, desc = 'Fuzzy find git files' })
|
||||
vim.keymap.set('n', '<leader>fg', telescope.find_files, { noremap = true, silent = true, desc = 'Fuzzy find files' })
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>fc',
|
||||
telescope.command_history,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find command_history' }
|
||||
)
|
||||
vim.keymap.set('n', '<leader>fa', telescope.live_grep, { noremap = true, silent = true, desc = 'Fuzzy find grep' })
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>f8',
|
||||
telescope.grep_string,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find grep current word' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>fs',
|
||||
telescope.treesitter,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find treesitter objects' }
|
||||
)
|
||||
vim.keymap.set('n', '<leader>fq', telescope.quickfix, { noremap = true, silent = true, desc = 'Fuzzy find quickfix' })
|
||||
vim.keymap.set('n', '<leader>f<BS>', telescope.resume, { noremap = true, silent = true, desc = 'Fuzzy find resume' })
|
||||
|
||||
local telescope = require("telescope")
|
||||
telescope.setup({
|
||||
local telescope = require('telescope')
|
||||
telescope.setup {
|
||||
defaults = {
|
||||
layout_strategy = "vertical",
|
||||
layout_config = { width = .90, },
|
||||
layout_strategy = 'vertical',
|
||||
layout_config = { width = 0.90 },
|
||||
prompt_title = false,
|
||||
results_title = false,
|
||||
preview_title = false,
|
||||
vimgrep_arguments = {
|
||||
"rg",
|
||||
'rg',
|
||||
'-L',
|
||||
"--color=never",
|
||||
"--no-heading",
|
||||
"--hidden",
|
||||
"--with-filename",
|
||||
"--line-number",
|
||||
"--column",
|
||||
"--smart-case"
|
||||
'--color=never',
|
||||
'--no-heading',
|
||||
'--hidden',
|
||||
'--with-filename',
|
||||
'--line-number',
|
||||
'--column',
|
||||
'--smart-case',
|
||||
},
|
||||
preview = {
|
||||
treesitter = true,
|
||||
|
|
@ -51,12 +71,12 @@ telescope.setup({
|
|||
},
|
||||
mappings = {
|
||||
i = {
|
||||
["wq"] = require("telescope.actions").close,
|
||||
["<Esc>"] = require("telescope.actions").close,
|
||||
["<C-k>"] = require("telescope.actions").move_selection_previous,
|
||||
["<C-j>"] = require("telescope.actions").move_selection_next,
|
||||
['wq'] = require('telescope.actions').close,
|
||||
['<Esc>'] = require('telescope.actions').close,
|
||||
['<C-k>'] = require('telescope.actions').move_selection_previous,
|
||||
['<C-j>'] = require('telescope.actions').move_selection_next,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
telescope.load_extension("fzf")
|
||||
}
|
||||
telescope.load_extension('fzf')
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ if vim.g.did_load_treesitter_plugin then
|
|||
end
|
||||
vim.g.did_load_treesitter_plugin = true
|
||||
|
||||
require("nvim-treesitter.configs").setup {
|
||||
require('nvim-treesitter.configs').setup {
|
||||
ensure_installed = {},
|
||||
highlight = {
|
||||
enable = true,
|
||||
|
|
@ -23,10 +23,10 @@ require("nvim-treesitter.configs").setup {
|
|||
enable = true,
|
||||
lookahead = true,
|
||||
keymaps = {
|
||||
["af"] = "@function.outer",
|
||||
["if"] = "@function.inner",
|
||||
["aa"] = "@statement.outer",
|
||||
["ia"] = "@parameter.inner",
|
||||
['af'] = '@function.outer',
|
||||
['if'] = '@function.inner',
|
||||
['aa'] = '@statement.outer',
|
||||
['ia'] = '@parameter.inner',
|
||||
},
|
||||
},
|
||||
move = {
|
||||
|
|
@ -44,12 +44,13 @@ require("nvim-treesitter.configs").setup {
|
|||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
["s]"] = "@parameter.inner",
|
||||
['s]'] = '@parameter.inner',
|
||||
},
|
||||
swap_previous = {
|
||||
["s["] = "@parameter.inner",
|
||||
['s['] = '@parameter.inner',
|
||||
},
|
||||
},
|
||||
},
|
||||
}, },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
require('which-key').setup {
|
||||
preset = 'helix'
|
||||
preset = 'helix',
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue