apllied config
This commit is contained in:
parent
5978ec3f28
commit
0874dcd113
15 changed files with 343 additions and 121 deletions
|
|
@ -1,2 +1,2 @@
|
|||
vim.api.nvim_set_keymap('i', '<C-k>', 'copilot#Accept("<CR>")', {expr = true, silent = true})
|
||||
-- vim.api.nvim_set_keymap('i', '<C-k>', 'copilot#Accept("<CR>")', {expr = true, silent = true})
|
||||
|
||||
|
|
|
|||
10
lua/plugin/formatter.lua
Normal file
10
lua/plugin/formatter.lua
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
local formatter = require("conform")
|
||||
|
||||
formatter.setup({
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
-- Use a sub-list to run only the first available formatter
|
||||
javascript = { { "prettierd", "prettier" } },
|
||||
typescript = { { "prettier" } },
|
||||
},
|
||||
})
|
||||
|
|
@ -1,40 +1,39 @@
|
|||
require('gitsigns').setup {
|
||||
on_attach = function(bufnr)
|
||||
local gs = package.loaded.gitsigns
|
||||
|
||||
local function map(mode, l, r, opts)
|
||||
opts = opts or {}
|
||||
opts.buffer = bufnr
|
||||
vim.keymap.set(mode, l, r, opts)
|
||||
end
|
||||
|
||||
-- map leader gj to go to next hunk
|
||||
map('n', '<leader>gj', function()
|
||||
if vim.wo.diff then return ']c' end
|
||||
vim.schedule(function() gs.next_hunk() end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true })
|
||||
|
||||
-- map leader gk to go to previous hunk
|
||||
map('n', '<leader>gk', function()
|
||||
if vim.wo.diff then return '[c' end
|
||||
vim.schedule(function() gs.prev_hunk() end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true })
|
||||
|
||||
map('n', '<leader>gp', gs.preview_hunk)
|
||||
map('n', '<leader>gs', gs.stage_hunk)
|
||||
map('v', '<leader>gs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
|
||||
map('n', '<leader>gu', gs.reset_hunk)
|
||||
|
||||
-- nnoremap <leader>glf :!smerge log %<CR>
|
||||
map('n', '<leader>glf', function()
|
||||
vim.fn.system('smerge log ' .. vim.fn.expand('%'))
|
||||
end)
|
||||
-- nnoremap <leader>gbf :!smerge blame % line('.')<CR>
|
||||
map('n', '<leader>gbf', function()
|
||||
vim.fn.system('smerge blame ' .. vim.fn.expand('%') .. ' ' .. vim.fn.line('.'))
|
||||
end)
|
||||
on_attach = function(bufnr)
|
||||
local gs = package.loaded.gitsigns
|
||||
|
||||
local function map(mode, l, r, opts)
|
||||
opts = opts or {}
|
||||
opts.buffer = bufnr
|
||||
vim.keymap.set(mode, l, r, opts)
|
||||
end
|
||||
|
||||
-- map leader gj to go to next hunk
|
||||
map('n', '<leader>gj', function()
|
||||
if vim.wo.diff then return ']c' end
|
||||
vim.schedule(function() gs.next_hunk() end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true })
|
||||
|
||||
-- map leader gk to go to previous hunk
|
||||
map('n', '<leader>gk', function()
|
||||
if vim.wo.diff then return '[c' end
|
||||
vim.schedule(function() gs.prev_hunk() end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true })
|
||||
|
||||
map('n', '<leader>gp', gs.preview_hunk)
|
||||
map('n', '<leader>gs', gs.stage_hunk)
|
||||
map('v', '<leader>gs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
|
||||
map('n', '<leader>gu', gs.reset_hunk)
|
||||
|
||||
-- nnoremap <leader>glf :!smerge log %<CR>
|
||||
map('n', '<leader>glf', function()
|
||||
vim.fn.system('smerge log ' .. vim.fn.expand('%'))
|
||||
end)
|
||||
-- nnoremap <leader>gbf :!smerge blame % line('.')<CR>
|
||||
map('n', '<leader>gbf', function()
|
||||
vim.fn.system('smerge blame ' .. vim.fn.expand('%') .. ' ' .. vim.fn.line('.'))
|
||||
end)
|
||||
end
|
||||
}
|
||||
|
|
|
|||
12
lua/plugin/neo-tree.lua
Normal file
12
lua/plugin/neo-tree.lua
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
local neotree = require("neo-tree")
|
||||
|
||||
neotree.setup({
|
||||
buffers = {
|
||||
follow_current_file = {
|
||||
enabled = true,
|
||||
},
|
||||
},
|
||||
window = {
|
||||
position = "right",
|
||||
},
|
||||
})
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
vim.g.startify_session_persistence = 1
|
||||
vim.g.startify_change_to_dir = 0
|
||||
vim.g.startify_lists = {
|
||||
{ type = 'sessions', header = { ' Sessions' } },
|
||||
{ type = 'bookmarks', header = { ' Bookmarks' } },
|
||||
{ type = 'sessions', header = { ' Sessions' } },
|
||||
{ type = 'bookmarks', header = { ' Bookmarks' } },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,68 @@
|
|||
local telescope = require('telescope')
|
||||
local builtin = require('telescope.builtin')
|
||||
|
||||
telescope.setup({
|
||||
defaults = {
|
||||
vimgrep_arguments = {
|
||||
"rg",
|
||||
"-L",
|
||||
"--color=never",
|
||||
"--no-heading",
|
||||
"--with-filename",
|
||||
"--line-number",
|
||||
"--column",
|
||||
"--smart-case",
|
||||
},
|
||||
prompt_prefix = " ",
|
||||
selection_caret = " ",
|
||||
entry_prefix = " ",
|
||||
initial_mode = "insert",
|
||||
selection_strategy = "reset",
|
||||
sorting_strategy = "ascending",
|
||||
layout_strategy = "horizontal",
|
||||
layout_config = {
|
||||
horizontal = {
|
||||
prompt_position = "top",
|
||||
preview_width = 0.55,
|
||||
results_width = 0.8,
|
||||
},
|
||||
vertical = {
|
||||
mirror = false,
|
||||
},
|
||||
width = 0.87,
|
||||
height = 0.80,
|
||||
preview_cutoff = 120,
|
||||
},
|
||||
file_sorter = require("telescope.sorters").get_fuzzy_file,
|
||||
file_ignore_patterns = { "node_modules", ".git", ".angular" },
|
||||
generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
|
||||
path_display = { "truncate" },
|
||||
winblend = 0,
|
||||
border = {},
|
||||
borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
|
||||
color_devicons = true,
|
||||
set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil,
|
||||
file_previewer = require("telescope.previewers").vim_buffer_cat.new,
|
||||
grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new,
|
||||
qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new,
|
||||
-- Developer configurations: Not meant for general override
|
||||
buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker,
|
||||
mappings = {
|
||||
n = { ["q"] = require("telescope.actions").close },
|
||||
},
|
||||
},
|
||||
|
||||
extensions_list = { "themes", "terms", "fzf" },
|
||||
extensions = {
|
||||
fzf = {
|
||||
fuzzy = true,
|
||||
override_generic_sorter = true,
|
||||
override_file_sorter = true,
|
||||
case_mode = "smart_case",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
||||
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
|
||||
vim.keymap.set('n', '<leader>jj', builtin.buffers, {})
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
local configs = require("nvim-treesitter.configs")
|
||||
|
||||
configs.setup({
|
||||
ensure_installed = {
|
||||
"c",
|
||||
"lua",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
"query",
|
||||
"elixir",
|
||||
"heex",
|
||||
"javascript",
|
||||
"html",
|
||||
"php",
|
||||
},
|
||||
sync_install = false,
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
ensure_installed = {
|
||||
"c",
|
||||
"lua",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
"query",
|
||||
"elixir",
|
||||
"heex",
|
||||
"javascript",
|
||||
"html",
|
||||
"css",
|
||||
"typescript",
|
||||
},
|
||||
sync_install = false,
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue