mirror of
https://github.com/softinio/nvim-config.git
synced 2025-09-05 09:06:42 -07:00
lint
This commit is contained in:
parent
0d693101c1
commit
f1e4018776
10 changed files with 693 additions and 672 deletions
|
|
@ -1,12 +1,12 @@
|
|||
local installed, gitsigns = pcall(require, 'gitsigns')
|
||||
local installed, gitsigns = pcall(require, "gitsigns")
|
||||
if installed then
|
||||
gitsigns.setup {
|
||||
signs = {
|
||||
add = { text = '+' },
|
||||
change = { text = '~' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
},
|
||||
}
|
||||
gitsigns.setup({
|
||||
signs = {
|
||||
add = { text = "+" },
|
||||
change = { text = "~" },
|
||||
delete = { text = "_" },
|
||||
topdelete = { text = "‾" },
|
||||
changedelete = { text = "~" },
|
||||
},
|
||||
})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
local installed, lualine = pcall(require, 'lualine')
|
||||
local installed, lualine = pcall(require, "lualine")
|
||||
if installed then
|
||||
-- Set lualine as statusline
|
||||
-- See `:help lualine.txt`
|
||||
lualine.setup {
|
||||
options = {
|
||||
icons_enabled = false,
|
||||
theme = 'tokyonight',
|
||||
component_separators = '|',
|
||||
section_separators = '',
|
||||
},
|
||||
}
|
||||
-- Set lualine as statusline
|
||||
-- See `:help lualine.txt`
|
||||
lualine.setup({
|
||||
options = {
|
||||
icons_enabled = false,
|
||||
theme = "tokyonight",
|
||||
component_separators = "|",
|
||||
section_separators = "",
|
||||
},
|
||||
})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
local installed, neogit = pcall(require, 'neogit')
|
||||
local installed, neogit = pcall(require, "neogit")
|
||||
if installed then
|
||||
neogit.setup {
|
||||
integrations = {
|
||||
diffview = true,
|
||||
},
|
||||
}
|
||||
neogit.setup({
|
||||
integrations = {
|
||||
diffview = true,
|
||||
},
|
||||
})
|
||||
|
||||
vim.api.nvim_set_keymap('n', '<leader>ng', [[<cmd>lua require('neogit').open({ kind = "split" })<cr>]], { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap(
|
||||
"n",
|
||||
"<leader>ng",
|
||||
[[<cmd>lua require('neogit').open({ kind = "split" })<cr>]],
|
||||
{ noremap = true, silent = true }
|
||||
)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,26 +1,31 @@
|
|||
local installed, nvim_tree = pcall(require, 'nvim-tree')
|
||||
local installed, nvim_tree = pcall(require, "nvim-tree")
|
||||
if installed then
|
||||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
nvim_tree.setup({
|
||||
sort_by = "case_sensitive",
|
||||
disable_netrw = true,
|
||||
view = {
|
||||
adaptive_size = true,
|
||||
mappings = {
|
||||
list = {
|
||||
{ key = "u", action = "dir_up" },
|
||||
},
|
||||
},
|
||||
},
|
||||
renderer = {
|
||||
highlight_git = true,
|
||||
group_empty = true,
|
||||
},
|
||||
filters = {
|
||||
dotfiles = false,
|
||||
},
|
||||
})
|
||||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
nvim_tree.setup({
|
||||
sort_by = "case_sensitive",
|
||||
disable_netrw = true,
|
||||
view = {
|
||||
adaptive_size = true,
|
||||
mappings = {
|
||||
list = {
|
||||
{ key = "u", action = "dir_up" },
|
||||
},
|
||||
},
|
||||
},
|
||||
renderer = {
|
||||
highlight_git = true,
|
||||
group_empty = true,
|
||||
},
|
||||
filters = {
|
||||
dotfiles = false,
|
||||
},
|
||||
})
|
||||
|
||||
vim.api.nvim_set_keymap('n', '<leader>m', [[<cmd>lua require('nvim-tree').toggle()<cr>]], { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap(
|
||||
"n",
|
||||
"<leader>m",
|
||||
[[<cmd>lua require('nvim-tree').toggle()<cr>]],
|
||||
{ noremap = true, silent = true }
|
||||
)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,37 +1,36 @@
|
|||
local installed, telescope = pcall(require, 'telescope')
|
||||
local installed, telescope = pcall(require, "telescope")
|
||||
if installed then
|
||||
-- [[ Configure Telescope ]]
|
||||
-- See `:help telescope` and `:help telescope.setup()`
|
||||
require('telescope').setup {
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
['<C-u>'] = false,
|
||||
['<C-d>'] = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
-- [[ Configure Telescope ]]
|
||||
-- See `:help telescope` and `:help telescope.setup()`
|
||||
require("telescope").setup({
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
["<C-u>"] = false,
|
||||
["<C-d>"] = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
-- Enable telescope fzf native, if installed
|
||||
pcall(require('telescope').load_extension, 'fzf')
|
||||
pcall(require('telescope').load_extension, 'scaladex')
|
||||
-- Enable telescope fzf native, if installed
|
||||
pcall(require("telescope").load_extension, "fzf")
|
||||
pcall(require("telescope").load_extension, "scaladex")
|
||||
|
||||
-- See `:help telescope.builtin`
|
||||
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
|
||||
vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
|
||||
vim.keymap.set('n', '<leader>/', function()
|
||||
-- You can pass additional configuration to telescope to change theme, layout, etc.
|
||||
require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
|
||||
winblend = 10,
|
||||
previewer = false,
|
||||
})
|
||||
end, { desc = '[/] Fuzzily search in current buffer]' })
|
||||
|
||||
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
|
||||
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
|
||||
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
|
||||
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
|
||||
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
|
||||
-- See `:help telescope.builtin`
|
||||
vim.keymap.set("n", "<leader>?", require("telescope.builtin").oldfiles, { desc = "[?] Find recently opened files" })
|
||||
vim.keymap.set("n", "<leader><space>", require("telescope.builtin").buffers, { desc = "[ ] Find existing buffers" })
|
||||
vim.keymap.set("n", "<leader>/", function()
|
||||
-- You can pass additional configuration to telescope to change theme, layout, etc.
|
||||
require("telescope.builtin").current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
|
||||
winblend = 10,
|
||||
previewer = false,
|
||||
}))
|
||||
end, { desc = "[/] Fuzzily search in current buffer]" })
|
||||
|
||||
vim.keymap.set("n", "<leader>sf", require("telescope.builtin").find_files, { desc = "[S]earch [F]iles" })
|
||||
vim.keymap.set("n", "<leader>sh", require("telescope.builtin").help_tags, { desc = "[S]earch [H]elp" })
|
||||
vim.keymap.set("n", "<leader>sw", require("telescope.builtin").grep_string, { desc = "[S]earch current [W]ord" })
|
||||
vim.keymap.set("n", "<leader>sg", require("telescope.builtin").live_grep, { desc = "[S]earch by [G]rep" })
|
||||
vim.keymap.set("n", "<leader>sd", require("telescope.builtin").diagnostics, { desc = "[S]earch [D]iagnostics" })
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,36 +1,36 @@
|
|||
local installed, texlabconfig = pcall(require, 'texlabconfig')
|
||||
local installed, texlabconfig = pcall(require, "texlabconfig")
|
||||
if installed then
|
||||
-- vimtex
|
||||
vim.g.vimtex_view_method = 'skim'
|
||||
vim.g.vimtex_compiler_method = 'tectonic'
|
||||
-- vimtex
|
||||
vim.g.vimtex_view_method = "skim"
|
||||
vim.g.vimtex_compiler_method = "tectonic"
|
||||
|
||||
-- nvim-texlabconfig
|
||||
local tex_preview_executable = '/Applications/Skim.app/Contents/SharedSupport/displayline'
|
||||
local tex_preview_args = {"%l", "%p", "%f"}
|
||||
local texlab_build_executable = 'tectonic'
|
||||
local texlab_build_args = {
|
||||
'-X',
|
||||
'compile',
|
||||
'%f',
|
||||
'--synctex',
|
||||
'--keep-logs',
|
||||
'--keep-intermediates'
|
||||
}
|
||||
texlabconfig.setup {
|
||||
cache_activate = true,
|
||||
cache_filetypes = { 'tex', 'bib' },
|
||||
reverse_search_edit_cmd = vim.cmd.edit,
|
||||
settings = {
|
||||
texlab = {
|
||||
build = {
|
||||
executable = texlab_build_executable,
|
||||
args = texlab_build_args
|
||||
},
|
||||
forwardSearch = {
|
||||
executable = tex_preview_executable,
|
||||
args = tex_preview_args
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-- nvim-texlabconfig
|
||||
local tex_preview_executable = "/Applications/Skim.app/Contents/SharedSupport/displayline"
|
||||
local tex_preview_args = { "%l", "%p", "%f" }
|
||||
local texlab_build_executable = "tectonic"
|
||||
local texlab_build_args = {
|
||||
"-X",
|
||||
"compile",
|
||||
"%f",
|
||||
"--synctex",
|
||||
"--keep-logs",
|
||||
"--keep-intermediates",
|
||||
}
|
||||
texlabconfig.setup({
|
||||
cache_activate = true,
|
||||
cache_filetypes = { "tex", "bib" },
|
||||
reverse_search_edit_cmd = vim.cmd.edit,
|
||||
settings = {
|
||||
texlab = {
|
||||
build = {
|
||||
executable = texlab_build_executable,
|
||||
args = texlab_build_args,
|
||||
},
|
||||
forwardSearch = {
|
||||
executable = tex_preview_executable,
|
||||
args = tex_preview_args,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,117 +1,116 @@
|
|||
local installed, treesitter = pcall(require, 'nvim-treesitter.configs')
|
||||
local installed, treesitter = pcall(require, "nvim-treesitter.configs")
|
||||
if installed then
|
||||
-- [[ Configure Treesitter ]]
|
||||
-- See `:help nvim-treesitter`
|
||||
treesitter.setup {
|
||||
-- Add languages to be installed here that you want installed for treesitter
|
||||
ensure_installed = {
|
||||
'c',
|
||||
'cpp',
|
||||
'go',
|
||||
'lua',
|
||||
'python',
|
||||
'rust',
|
||||
'typescript',
|
||||
'help',
|
||||
'vim',
|
||||
'scala',
|
||||
'bash',
|
||||
'dockerfile',
|
||||
'fish',
|
||||
'git_rebase',
|
||||
'gitattributes',
|
||||
'gitcommit',
|
||||
'gitignore',
|
||||
'haskell',
|
||||
'hocon',
|
||||
'html',
|
||||
'http',
|
||||
'java',
|
||||
'javascript',
|
||||
'json',
|
||||
'json5',
|
||||
'latex',
|
||||
'make',
|
||||
'markdown_inline',
|
||||
'nix',
|
||||
'sql',
|
||||
'terraform',
|
||||
'yaml'
|
||||
},
|
||||
-- [[ Configure Treesitter ]]
|
||||
-- See `:help nvim-treesitter`
|
||||
treesitter.setup({
|
||||
-- Add languages to be installed here that you want installed for treesitter
|
||||
ensure_installed = {
|
||||
"c",
|
||||
"cpp",
|
||||
"go",
|
||||
"lua",
|
||||
"python",
|
||||
"rust",
|
||||
"typescript",
|
||||
"help",
|
||||
"vim",
|
||||
"scala",
|
||||
"bash",
|
||||
"dockerfile",
|
||||
"fish",
|
||||
"git_rebase",
|
||||
"gitattributes",
|
||||
"gitcommit",
|
||||
"gitignore",
|
||||
"haskell",
|
||||
"hocon",
|
||||
"html",
|
||||
"http",
|
||||
"java",
|
||||
"javascript",
|
||||
"json",
|
||||
"json5",
|
||||
"latex",
|
||||
"make",
|
||||
"markdown_inline",
|
||||
"nix",
|
||||
"sql",
|
||||
"terraform",
|
||||
"yaml",
|
||||
},
|
||||
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true, disable = { 'python' } },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = '<c-space>',
|
||||
node_incremental = '<c-space>',
|
||||
scope_incremental = '<c-s>',
|
||||
node_decremental = '<c-backspace>',
|
||||
},
|
||||
},
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
|
||||
keymaps = {
|
||||
-- You can use the capture groups defined in textobjects.scm
|
||||
['aa'] = '@parameter.outer',
|
||||
['ia'] = '@parameter.inner',
|
||||
['af'] = '@function.outer',
|
||||
['if'] = '@function.inner',
|
||||
['ac'] = '@class.outer',
|
||||
['ic'] = '@class.inner',
|
||||
},
|
||||
},
|
||||
move = {
|
||||
enable = true,
|
||||
set_jumps = true, -- whether to set jumps in the jumplist
|
||||
goto_next_start = {
|
||||
[']m'] = '@function.outer',
|
||||
[']]'] = '@class.outer',
|
||||
},
|
||||
goto_next_end = {
|
||||
[']M'] = '@function.outer',
|
||||
[']['] = '@class.outer',
|
||||
},
|
||||
goto_previous_start = {
|
||||
['[m'] = '@function.outer',
|
||||
['[['] = '@class.outer',
|
||||
},
|
||||
goto_previous_end = {
|
||||
['[M'] = '@function.outer',
|
||||
['[]'] = '@class.outer',
|
||||
},
|
||||
},
|
||||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
['<leader>a'] = '@parameter.inner',
|
||||
},
|
||||
swap_previous = {
|
||||
['<leader>A'] = '@parameter.inner',
|
||||
},
|
||||
playground = {
|
||||
enable = true,
|
||||
disable = {},
|
||||
updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
|
||||
persist_queries = false, -- Whether the query persists across vim sessions
|
||||
keybindings = {
|
||||
toggle_query_editor = 'o',
|
||||
toggle_hl_groups = 'i',
|
||||
toggle_injected_languages = 't',
|
||||
toggle_anonymous_nodes = 'a',
|
||||
toggle_language_display = 'I',
|
||||
focus_language = 'f',
|
||||
unfocus_language = 'F',
|
||||
update = 'R',
|
||||
goto_node = '<cr>',
|
||||
show_help = '?',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true, disable = { "python" } },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = "<c-space>",
|
||||
node_incremental = "<c-space>",
|
||||
scope_incremental = "<c-s>",
|
||||
node_decremental = "<c-backspace>",
|
||||
},
|
||||
},
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
|
||||
keymaps = {
|
||||
-- You can use the capture groups defined in textobjects.scm
|
||||
["aa"] = "@parameter.outer",
|
||||
["ia"] = "@parameter.inner",
|
||||
["af"] = "@function.outer",
|
||||
["if"] = "@function.inner",
|
||||
["ac"] = "@class.outer",
|
||||
["ic"] = "@class.inner",
|
||||
},
|
||||
},
|
||||
move = {
|
||||
enable = true,
|
||||
set_jumps = true, -- whether to set jumps in the jumplist
|
||||
goto_next_start = {
|
||||
["]m"] = "@function.outer",
|
||||
["]]"] = "@class.outer",
|
||||
},
|
||||
goto_next_end = {
|
||||
["]M"] = "@function.outer",
|
||||
["]["] = "@class.outer",
|
||||
},
|
||||
goto_previous_start = {
|
||||
["[m"] = "@function.outer",
|
||||
["[["] = "@class.outer",
|
||||
},
|
||||
goto_previous_end = {
|
||||
["[M"] = "@function.outer",
|
||||
["[]"] = "@class.outer",
|
||||
},
|
||||
},
|
||||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
["<leader>a"] = "@parameter.inner",
|
||||
},
|
||||
swap_previous = {
|
||||
["<leader>A"] = "@parameter.inner",
|
||||
},
|
||||
playground = {
|
||||
enable = true,
|
||||
disable = {},
|
||||
updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
|
||||
persist_queries = false, -- Whether the query persists across vim sessions
|
||||
keybindings = {
|
||||
toggle_query_editor = "o",
|
||||
toggle_hl_groups = "i",
|
||||
toggle_injected_languages = "t",
|
||||
toggle_anonymous_nodes = "a",
|
||||
toggle_language_display = "I",
|
||||
focus_language = "f",
|
||||
unfocus_language = "F",
|
||||
update = "R",
|
||||
goto_node = "<cr>",
|
||||
show_help = "?",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue