nvim: add GuessIndent

nix-components
pegasust 2022-09-02 07:00:54 -07:00
parent c5bf754ec8
commit 019a04c5b2
1 changed files with 244 additions and 229 deletions

View File

@ -65,7 +65,7 @@ Plug('nvim-treesitter/nvim-treesitter') -- language parser engine for highlighti
Plug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects Plug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects
Plug('nvim-telescope/telescope.nvim', { tag = '0.1.0' }) -- file browser Plug('nvim-telescope/telescope.nvim', { tag = '0.1.0' }) -- file browser
Plug('nvim-telescope/telescope-fzf-native.nvim', Plug('nvim-telescope/telescope-fzf-native.nvim',
{ ['do'] = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=release && cmake --build build --config Release && cmake --install build --prefix build' }) { ['do'] = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=release && cmake --build build --config Release && cmake --install build --prefix build' })
Plug('nvim-telescope/telescope-file-browser.nvim') Plug('nvim-telescope/telescope-file-browser.nvim')
-- cmp: auto-complete/suggestions -- cmp: auto-complete/suggestions
Plug('neovim/nvim-lspconfig') -- built-in LSP configurations Plug('neovim/nvim-lspconfig') -- built-in LSP configurations
@ -76,6 +76,7 @@ Plug('onsails/lspkind-nvim')
-- DevExp -- DevExp
Plug('windwp/nvim-autopairs') -- matches pairs like [] (),... Plug('windwp/nvim-autopairs') -- matches pairs like [] (),...
Plug('windwp/nvim-ts-autotag') -- matches tags <body>hello</body> Plug('windwp/nvim-ts-autotag') -- matches tags <body>hello</body>
Plug('NMAC427/guess-indent.nvim') -- guesses the indentation of an opened buffer
Plug('numToStr/Comment.nvim') -- "gc" to comment visual regions/lines Plug('numToStr/Comment.nvim') -- "gc" to comment visual regions/lines
Plug('lewis6991/gitsigns.nvim') -- add git info to sign columns Plug('lewis6991/gitsigns.nvim') -- add git info to sign columns
Plug('tpope/vim-fugitive') -- git commands in nvim Plug('tpope/vim-fugitive') -- git commands in nvim
@ -102,8 +103,8 @@ vim.cmd([[ colorscheme gruvbox ]])
-- plugin keymaps -- plugin keymaps
local function remap(mode, key_cmd, binded_fn, opts) local function remap(mode, key_cmd, binded_fn, opts)
opts = opts or { remap = true } opts = opts or { remap = true }
return vim.keymap.set(mode, key_cmd, binded_fn, opts) return vim.keymap.set(mode, key_cmd, binded_fn, opts)
end end
-- Comment.nvim -- Comment.nvim
@ -114,50 +115,50 @@ vim.opt.listchars:append "space:⋅"
vim.opt.listchars:append "eol:↴" vim.opt.listchars:append "eol:↴"
require("indent_blankline").setup { require("indent_blankline").setup {
show_end_of_line = true, show_end_of_line = true,
space_char_blankline = " ", space_char_blankline = " ",
} }
-- telescope -- telescope
local fb_actions = require "telescope".extensions.file_browser.actions local fb_actions = require "telescope".extensions.file_browser.actions
require('telescope').setup { require('telescope').setup {
defaults = { defaults = {
mappings = { mappings = {
i = { i = {
['<C-u>'] = false, ['<C-u>'] = false,
['<C-d>'] = false, ['<C-d>'] = false,
}, },
},
}, },
extensions = { },
fzf = { extensions = {
fuzzy = true, -- allow fuzzy matches fzf = {
override_generic_sorter = true, fuzzy = true, -- allow fuzzy matches
override_file_sorter = true, override_generic_sorter = true,
case_mode = 'smart_case' override_file_sorter = true,
}, case_mode = 'smart_case'
file_browser = { },
theme = "ivy", file_browser = {
hiject_netrw = true, -- disables netrw and use file-browser instead theme = "ivy",
mappings = { hiject_netrw = true, -- disables netrw and use file-browser instead
["i"] = {}, -- disable any shortcut in insert mode for now mappings = {
["n"] = { ["i"] = {}, -- disable any shortcut in insert mode for now
["c"] = fb_actions.create, ["n"] = {
["r"] = fb_actions.rename, ["c"] = fb_actions.create,
["m"] = fb_actions.move, ["r"] = fb_actions.rename,
["y"] = fb_actions.copy, ["m"] = fb_actions.move,
["d"] = fb_actions.remove, ["y"] = fb_actions.copy,
["o"] = fb_actions.open, ["d"] = fb_actions.remove,
["g"] = fb_actions.goto_parent_dir, ["o"] = fb_actions.open,
["e"] = fb_actions.goto_home_dir, ["g"] = fb_actions.goto_parent_dir,
["w"] = fb_actions.goto_cwd, ["e"] = fb_actions.goto_home_dir,
["t"] = fb_actions.change_cwd, ["w"] = fb_actions.goto_cwd,
["f"] = fb_actions.toggle_browser, ["t"] = fb_actions.change_cwd,
["h"] = fb_actions.toggle_hidden, ["f"] = fb_actions.toggle_browser,
["s"] = fb_actions.toggle_all, ["h"] = fb_actions.toggle_hidden,
} ["s"] = fb_actions.toggle_all,
}
} }
}
} }
}
} }
pcall(require('telescope').load_extension, 'fzf') pcall(require('telescope').load_extension, 'fzf')
@ -165,85 +166,99 @@ pcall(require('telescope').load_extension, 'file_browser')
remap('n', '<C-p>', '<cmd>Telescope<cr>', { desc = 'Open Telescope general search' }) remap('n', '<C-p>', '<cmd>Telescope<cr>', { desc = 'Open Telescope general search' })
remap('n', '<leader>fm', function() remap('n', '<leader>fm', function()
require("telescope").extensions.file_browser.file_browser() require("telescope").extensions.file_browser.file_browser()
end, { desc = '[F]ile [M]utation' }) end, { desc = '[F]ile [M]utation' })
remap('n', '<leader>ff', function() remap('n', '<leader>ff', function()
require('telescope.builtin').find_files({ require('telescope.builtin').find_files({
hidden = false, hidden = false,
no_ignore = false, no_ignore = false,
follow = false, follow = false,
}) })
end, { desc = '[F]ind [F]ile' }) end, { desc = '[F]ind [F]ile' })
remap('n', '<leader>fa', function() remap('n', '<leader>fa', function()
require('telescope.builtin').find_files({ require('telescope.builtin').find_files({
hidden = true, hidden = true,
no_ignore = true, no_ignore = true,
follow = true, follow = true,
}) })
end, { desc = '[F]ind [A]ll files' }) end, { desc = '[F]ind [A]ll files' })
remap('n', '<leader>fg', function() remap('n', '<leader>fg', function()
require('telescope.builtin').live_grep() require('telescope.builtin').live_grep()
end, { desc = '[F]ind by [G]rep' }) end, { desc = '[F]ind by [G]rep' })
remap('n', '<leader>fb', function() remap('n', '<leader>fb', function()
require('telescope.builtin').buffers() require('telescope.builtin').buffers()
end, { desc = '[F]ind existing [B]uffers' }) end, { desc = '[F]ind existing [B]uffers' })
remap('n', '<leader>fh', function() remap('n', '<leader>fh', function()
require('telescope.builtin').help_tags() require('telescope.builtin').help_tags()
end, { desc = '[F]ind [H]elp' }) end, { desc = '[F]ind [H]elp' })
remap('n', '<leader>fd', function() remap('n', '<leader>fd', function()
require('telescope.builtin').diagnostics() require('telescope.builtin').diagnostics()
end, { desc = '[F]ind [D]iagnostics' }) end, { desc = '[F]ind [D]iagnostics' })
-- treesitter -- treesitter
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
ensure_installed = { 'lua', 'typescript', 'rust', 'go', 'python', 'prisma' }, ensure_installed = { 'lua', 'typescript', 'rust', 'go', 'python', 'prisma' },
sync_install = false, sync_install = false,
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true },
incremental_selection = { incremental_selection = {
enable = true, enable = true,
keymaps = { keymaps = {
init_selection = '<c-space>', init_selection = '<c-space>',
node_incremental = '<c-space>', node_incremental = '<c-space>',
node_decremental = '<c-backspace>', node_decremental = '<c-backspace>',
scope_incremental = '<c-S>' scope_incremental = '<c-S>'
} }
}, },
textobjects = { textobjects = {
select = { select = {
enable = true, enable = true,
lookahead = true, lookahead = true,
keymaps = { keymaps = {
['af'] = '@function.outer', ['af'] = '@function.outer',
['if'] = '@function.inner', ['if'] = '@function.inner',
['ac'] = '@class.outer', ['ac'] = '@class.outer',
['ic'] = '@class.inner', ['ic'] = '@class.inner',
}, },
},
},
-- automatically close and modify HTML and TSX tags
autotag = {
enable = true,
}, },
},
-- automatically close and modify HTML and TSX tags
autotag = {
enable = true,
},
} }
require('nvim-autopairs').setup { require('nvim-autopairs').setup {
check_ts = true, check_ts = true,
}
require('guess-indent').setup {
auto_cmd = true, -- Set to false to disable automatic execution
filetype_exclude = { -- A list of filetypes for which the auto command gets disabled
"netrw",
"tutor",
},
buftype_exclude = { -- A list of buffer types for which the auto command gets disabled
"help",
"nofile",
"terminal",
"prompt",
},
} }
-- harpoon: mark significant files & switch between them -- harpoon: mark significant files & switch between them
remap('n', '<leader>m', function() require('harpoon.mark').add_file() end) remap('n', '<leader>m', function() require('harpoon.mark').add_file() end)
local function harpoon_nav(key, nav_file_index, lead_keybind) local function harpoon_nav(key, nav_file_index, lead_keybind)
lead_keybind = lead_keybind or '<leader>h' lead_keybind = lead_keybind or '<leader>h'
assert(type(key) == "string", "expect key to be string(keybind)") assert(type(key) == "string", "expect key to be string(keybind)")
assert(type(nav_file_index) == "number" and nav_file_index >= 1, "expect 1-indexed number for file index") assert(type(nav_file_index) == "number" and nav_file_index >= 1, "expect 1-indexed number for file index")
return remap('n', lead_keybind .. key, function() require('harpoon.ui').nav_file(nav_file_index) end) return remap('n', lead_keybind .. key, function() require('harpoon.ui').nav_file(nav_file_index) end)
end end
-- remap letters to index. Inspired by alternating number of Dvorak programmer -- remap letters to index. Inspired by alternating number of Dvorak programmer
@ -268,115 +283,115 @@ harpoon_nav('0', 10)
-- LSP settings -- LSP settings
-- This function gets run when an LSP connects to a particular buffer. -- This function gets run when an LSP connects to a particular buffer.
local on_attach = function(_, bufnr) local on_attach = function(_, bufnr)
-- NOTE: Remember that lua is a real programming language, and as such it is possible -- NOTE: Remember that lua is a real programming language, and as such it is possible
-- to define small helper and utility functions so you don't have to repeat yourself -- to define small helper and utility functions so you don't have to repeat yourself
-- many times. -- many times.
-- --
-- In this case, we create a function that lets us more easily define mappings specific -- In this case, we create a function that lets us more easily define mappings specific
-- for LSP related items. It sets the mode, buffer and description for us each time. -- for LSP related items. It sets the mode, buffer and description for us each time.
local nmap = function(keys, func, desc) local nmap = function(keys, func, desc)
if desc then if desc then
desc = 'LSP: ' .. desc desc = 'LSP: ' .. desc
end
vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
end end
nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame') vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction') end
-- symbols and gotos nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
nmap('gi', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
nmap('gr', require('telescope.builtin').lsp_references)
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-- documentations. See `:help K` for why this keymap -- symbols and gotos
nmap('K', vim.lsp.buf.hover, 'Hover Documentation') nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation') nmap('gi', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
nmap('gr', require('telescope.builtin').lsp_references)
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-- Lesser used LSP functionality -- documentations. See `:help K` for why this keymap
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition') nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
nmap('<leader>ja', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
nmap('<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, '[W]orkspace [L]ist Folders')
-- Create a command `:Format` local to the LSP buffer -- Lesser used LSP functionality
vim.api.nvim_buf_create_user_command(bufnr, 'Format', vim.lsp.buf.format or vim.lsp.buf.formatting, nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
{ desc = 'Format current buffer with LSP' }) nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
nmap('<leader>ja', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
nmap('<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, '[W]orkspace [L]ist Folders')
-- Create a command `:Format` local to the LSP buffer
vim.api.nvim_buf_create_user_command(bufnr, 'Format', vim.lsp.buf.format or vim.lsp.buf.formatting,
{ desc = 'Format current buffer with LSP' })
end end
-- nvim-cmp supports additional completion capabilities -- nvim-cmp supports additional completion capabilities
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
-- default language servers -- default language servers
local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', "prisma-language-server" } local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', "prisma-language-server" }
require("mason").setup({ require("mason").setup({
ui = { ui = {
icons = { icons = {
package_installed = "", package_installed = "",
package_pending = "", package_pending = "",
package_uninstalled = "" package_uninstalled = ""
}
} }
}
}) })
require('mason-lspconfig').setup({ require('mason-lspconfig').setup({
ensure_installed = servers, ensure_installed = servers,
automatic_installation = true automatic_installation = true
}) })
require('mason-lspconfig').setup_handlers({ require('mason-lspconfig').setup_handlers({
-- default handler -- default handler
function(server_name) function(server_name)
require('lspconfig')[server_name].setup { require('lspconfig')[server_name].setup {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
}
end,
["sumneko_lua"] = function()
require('lspconfig').sumneko_lua.setup {
on_attach = on_attach,
capabilities = capabilities,
settings = {
Lua = {
runtime = {
version = "LuaJIT",
path = vim.split(package.path, ";"),
},
diagnostics = {
globals = { "vim" }
},
workspace = {
library = vim.api.nvim_get_runtime_file('', true)
},
telemetry = { enable = false }
} }
end, }
["sumneko_lua"] = function() }
require('lspconfig').sumneko_lua.setup { end
on_attach = on_attach,
capabilities = capabilities,
settings = {
Lua = {
runtime = {
version = "LuaJIT",
path = vim.split(package.path, ";"),
},
diagnostics = {
globals = { "vim" }
},
workspace = {
library = vim.api.nvim_get_runtime_file('', true)
},
telemetry = { enable = false }
}
}
}
end
}) })
require('zk').setup({ require('zk').setup({
picker = "telescope", picker = "telescope",
lsp = { lsp = {
config = { config = {
cmd = { "zk", "lsp" }, cmd = { "zk", "lsp" },
name = "zk", name = "zk",
on_attach = on_attach, on_attach = on_attach,
}, },
auto_attach = { auto_attach = {
enable = true, enable = true,
filetypes = { "markdown" } filetypes = { "markdown" }
},
}, },
},
}) })
-- Custom ZkOrphans that determines unlinked notes -- Custom ZkOrphans that determines unlinked notes
-- `:ZkOrphans {tags = {"work"}}` -- `:ZkOrphans {tags = {"work"}}`
require('zk.commands').add("ZkOrphans", function(options) require('zk.commands').add("ZkOrphans", function(options)
options = vim.tbl_extend("force", { orphan = true }, options or {}) options = vim.tbl_extend("force", { orphan = true }, options or {})
-- zk.edit opens notes picker -- zk.edit opens notes picker
require('zk').edit(options, { title = "Zk Orphans (unlinked notes)" }) require('zk').edit(options, { title = "Zk Orphans (unlinked notes)" })
end) end)
-- ZkGrep: opens file picker -- ZkGrep: opens file picker
-- In the case where `match_ctor` is falsy, create a prompt. -- In the case where `match_ctor` is falsy, create a prompt.
@ -384,18 +399,18 @@ end)
-- Params: -- Params:
-- match_ctor: string | {match= :string,...} | "" | nil -- match_ctor: string | {match= :string,...} | "" | nil
require('zk.commands').add("ZkGrep", function(match_ctor) require('zk.commands').add("ZkGrep", function(match_ctor)
-- handle polymorphic `match_ctor` -- handle polymorphic `match_ctor`
local grep_str = match_ctor local grep_str = match_ctor
local match local match
if match_ctor == nil or match_ctor == '' then if match_ctor == nil or match_ctor == '' then
vim.fn.inputsave() vim.fn.inputsave()
grep_str = vim.fn.input('Grep string: >') grep_str = vim.fn.input('Grep string: >')
vim.fn.inputrestore() vim.fn.inputrestore()
match = { match = grep_str } match = { match = grep_str }
elseif type(match_ctor) == 'string' then elseif type(match_ctor) == 'string' then
match = { match = grep_str } match = { match = grep_str }
end end
require('zk').edit(match, { title = "Grep: '" .. grep_str .. "'" }) require('zk').edit(match, { title = "Grep: '" .. grep_str .. "'" })
end) end)
-- nvim-cmp -- nvim-cmp
@ -403,56 +418,56 @@ local cmp = require 'cmp'
local luasnip = require 'luasnip' local luasnip = require 'luasnip'
cmp.setup { cmp.setup {
snippet = { snippet = {
expand = function(args) expand = function(args)
luasnip.lsp_expand(args.body) luasnip.lsp_expand(args.body)
end, end,
}, },
mapping = cmp.mapping.preset.insert { mapping = cmp.mapping.preset.insert {
['<C-u>'] = cmp.mapping.scroll_docs(-4), ['<C-u>'] = cmp.mapping.scroll_docs(-4),
['<C-d>'] = cmp.mapping.scroll_docs(4), ['<C-d>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(), ['<C-Space>'] = cmp.mapping.complete(),
['<CR>'] = cmp.mapping.confirm { ['<CR>'] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace, behavior = cmp.ConfirmBehavior.Replace,
select = true, select = true,
}, },
['<Tab>'] = cmp.mapping(function(fallback) ['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump() luasnip.expand_or_jump()
else else
fallback() fallback()
end end
end, { 'i', 's' }), end, { 'i', 's' }),
['<S-Tab>'] = cmp.mapping(function(fallback) ['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_prev_item() cmp.select_prev_item()
elseif luasnip.jumpable(-1) then elseif luasnip.jumpable(-1) then
luasnip.jump(-1) luasnip.jump(-1)
else else
fallback() fallback()
end end
end, { 'i', 's' }), end, { 'i', 's' }),
}, },
sources = { sources = {
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'luasnip' },
}, },
} }
-- Gitsigns -- Gitsigns
require('gitsigns').setup { require('gitsigns').setup {
signs = { signs = {
add = { text = '+' }, add = { text = '+' },
change = { text = '~' }, change = { text = '~' },
delete = { text = '_' }, delete = { text = '_' },
topdelete = { text = '' }, topdelete = { text = '' },
changedelete = { text = '~' }, changedelete = { text = '~' },
} }
} }
require('lualine').setup { require('lualine').setup {
options = { options = {
icons_enabled = true, icons_enabled = true,
}, },
} }