Add support for more formatter's, stylua config.
This commit is contained in:
parent
24f7bb50b6
commit
ccc9ffa2db
@ -1,44 +1,44 @@
|
||||
require("nvim-autopairs").setup {}
|
||||
require("nvim-autopairs").setup({})
|
||||
|
||||
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
|
||||
local cmp = require('cmp')
|
||||
local handlers = require('nvim-autopairs.completion.handlers')
|
||||
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
||||
local cmp = require("cmp")
|
||||
local handlers = require("nvim-autopairs.completion.handlers")
|
||||
|
||||
cmp.event:on(
|
||||
'confirm_done',
|
||||
cmp_autopairs.on_confirm_done({
|
||||
filetypes = {
|
||||
-- "*" is a alias to all filetypes
|
||||
["*"] = {
|
||||
["("] = {
|
||||
kind = {
|
||||
cmp.lsp.CompletionItemKind.Function,
|
||||
cmp.lsp.CompletionItemKind.Method,
|
||||
},
|
||||
handler = handlers["*"]
|
||||
}
|
||||
},
|
||||
lua = {
|
||||
["("] = {
|
||||
kind = {
|
||||
cmp.lsp.CompletionItemKind.Function,
|
||||
cmp.lsp.CompletionItemKind.Method
|
||||
},
|
||||
---@param char string
|
||||
---@param item table item completion
|
||||
---@param bufnr number buffer number
|
||||
---@param rules table
|
||||
---@param commit_character table<string>
|
||||
handler = function(char, item, bufnr, rules, commit_character)
|
||||
-- Your handler function. Inpect with print(vim.inspect{char, item, bufnr, rules, commit_character})
|
||||
end
|
||||
}
|
||||
},
|
||||
-- Disable for tex
|
||||
tex = false,
|
||||
sh = false,
|
||||
bash = false,
|
||||
zsh = false,
|
||||
}
|
||||
})
|
||||
"confirm_done",
|
||||
cmp_autopairs.on_confirm_done({
|
||||
filetypes = {
|
||||
-- "*" is a alias to all filetypes
|
||||
["*"] = {
|
||||
["("] = {
|
||||
kind = {
|
||||
cmp.lsp.CompletionItemKind.Function,
|
||||
cmp.lsp.CompletionItemKind.Method,
|
||||
},
|
||||
handler = handlers["*"],
|
||||
},
|
||||
},
|
||||
lua = {
|
||||
["("] = {
|
||||
kind = {
|
||||
cmp.lsp.CompletionItemKind.Function,
|
||||
cmp.lsp.CompletionItemKind.Method,
|
||||
},
|
||||
---@param char string
|
||||
---@param item table item completion
|
||||
---@param bufnr number buffer number
|
||||
---@param rules table
|
||||
---@param commit_character table<string>
|
||||
handler = function(char, item, bufnr, rules, commit_character)
|
||||
-- Your handler function. Inpect with print(vim.inspect{char, item, bufnr, rules, commit_character})
|
||||
end,
|
||||
},
|
||||
},
|
||||
-- Disable for tex
|
||||
tex = false,
|
||||
sh = false,
|
||||
bash = false,
|
||||
zsh = false,
|
||||
},
|
||||
})
|
||||
)
|
||||
|
@ -1,57 +1,57 @@
|
||||
require("catppuccin").setup({
|
||||
flavour = "frappe",
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
conditionals = { "italic" },
|
||||
loops = {},
|
||||
functions = { "bold" },
|
||||
keywords = { "bold" },
|
||||
strings = {},
|
||||
variables = {},
|
||||
numbers = {},
|
||||
booleans = {},
|
||||
properties = {},
|
||||
types = {},
|
||||
operators = {},
|
||||
},
|
||||
integrations = {
|
||||
cmp = true,
|
||||
gitsigns = true,
|
||||
harpoon = true,
|
||||
indent_blankline = {
|
||||
enabled = true,
|
||||
},
|
||||
markdown = true,
|
||||
mason = true,
|
||||
mini = {
|
||||
enabled = true
|
||||
},
|
||||
dap = {
|
||||
enabled = true,
|
||||
},
|
||||
native_lsp = {
|
||||
enabled = true,
|
||||
virtual_text = {
|
||||
errors = { "italic" },
|
||||
hints = { "italic" },
|
||||
warnings = { "italic" },
|
||||
information = { "italic" },
|
||||
},
|
||||
underlines = {
|
||||
errors = { "undercurl" },
|
||||
hints = { "undercurl" },
|
||||
warnings = { "undercurl" },
|
||||
information = { "undercurl" },
|
||||
},
|
||||
},
|
||||
notify = true,
|
||||
telescope = {
|
||||
enabled = true,
|
||||
},
|
||||
treesitter = true,
|
||||
which_key = true,
|
||||
fidget = true,
|
||||
},
|
||||
flavour = "frappe",
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
conditionals = { "italic" },
|
||||
loops = {},
|
||||
functions = { "bold" },
|
||||
keywords = { "bold" },
|
||||
strings = {},
|
||||
variables = {},
|
||||
numbers = {},
|
||||
booleans = {},
|
||||
properties = {},
|
||||
types = {},
|
||||
operators = {},
|
||||
},
|
||||
integrations = {
|
||||
cmp = true,
|
||||
gitsigns = true,
|
||||
harpoon = true,
|
||||
indent_blankline = {
|
||||
enabled = true,
|
||||
},
|
||||
markdown = true,
|
||||
mason = true,
|
||||
mini = {
|
||||
enabled = true,
|
||||
},
|
||||
dap = {
|
||||
enabled = true,
|
||||
},
|
||||
native_lsp = {
|
||||
enabled = true,
|
||||
virtual_text = {
|
||||
errors = { "italic" },
|
||||
hints = { "italic" },
|
||||
warnings = { "italic" },
|
||||
information = { "italic" },
|
||||
},
|
||||
underlines = {
|
||||
errors = { "undercurl" },
|
||||
hints = { "undercurl" },
|
||||
warnings = { "undercurl" },
|
||||
information = { "undercurl" },
|
||||
},
|
||||
},
|
||||
notify = true,
|
||||
telescope = {
|
||||
enabled = true,
|
||||
},
|
||||
treesitter = true,
|
||||
which_key = true,
|
||||
fidget = true,
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd.colorscheme 'catppuccin'
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
|
@ -1,25 +1,25 @@
|
||||
require("colorizer").setup({
|
||||
filetypes = { "*" },
|
||||
user_default_options = {
|
||||
RGB = true, -- #RGB hex codes
|
||||
RRGGBB = true, -- #RRGGBB hex codes
|
||||
names = false, -- "Name" codes like Blue or blue
|
||||
RRGGBBAA = true, -- #RRGGBBAA hex codes
|
||||
AARRGGBB = true, -- 0xAARRGGBB hex codes
|
||||
rgb_fn = true, -- CSS rgb() and rgba() functions
|
||||
hsl_fn = true, -- CSS hsl() and hsla() functions
|
||||
css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
|
||||
css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn
|
||||
-- Available modes for `mode`: foreground, background, virtualtext
|
||||
mode = "background", -- Set the display mode.
|
||||
-- Available methods are false / true / "normal" / "lsp" / "both"
|
||||
-- True is same as normal
|
||||
tailwind = false, -- Enable tailwind colors
|
||||
-- parsers can contain values used in |user_default_options|
|
||||
sass = { enable = false, parsers = { "css" } }, -- Enable sass colors
|
||||
virtualtext = "■",
|
||||
-- update color values even if buffer is not focused
|
||||
-- example use: cmp_menu, cmp_docs
|
||||
always_update = true,
|
||||
},
|
||||
filetypes = { "*" },
|
||||
user_default_options = {
|
||||
RGB = true, -- #RGB hex codes
|
||||
RRGGBB = true, -- #RRGGBB hex codes
|
||||
names = false, -- "Name" codes like Blue or blue
|
||||
RRGGBBAA = true, -- #RRGGBBAA hex codes
|
||||
AARRGGBB = true, -- 0xAARRGGBB hex codes
|
||||
rgb_fn = true, -- CSS rgb() and rgba() functions
|
||||
hsl_fn = true, -- CSS hsl() and hsla() functions
|
||||
css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
|
||||
css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn
|
||||
-- Available modes for `mode`: foreground, background, virtualtext
|
||||
mode = "background", -- Set the display mode.
|
||||
-- Available methods are false / true / "normal" / "lsp" / "both"
|
||||
-- True is same as normal
|
||||
tailwind = false, -- Enable tailwind colors
|
||||
-- parsers can contain values used in |user_default_options|
|
||||
sass = { enable = false, parsers = { "css" } }, -- Enable sass colors
|
||||
virtualtext = "■",
|
||||
-- update color values even if buffer is not focused
|
||||
-- example use: cmp_menu, cmp_docs
|
||||
always_update = true,
|
||||
},
|
||||
})
|
||||
|
14
after/plugin/conform.lua
Normal file
14
after/plugin/conform.lua
Normal file
@ -0,0 +1,14 @@
|
||||
local conform = require("conform")
|
||||
|
||||
conform.setup({
|
||||
formatters_by_ft = {
|
||||
python = { "isort", "black" },
|
||||
lua = { "stylua" },
|
||||
},
|
||||
})
|
||||
|
||||
vim.keymap.set({ "n", "v" }, "<leader>f", function()
|
||||
conform.format({
|
||||
lsp_fallback = true,
|
||||
})
|
||||
end, { desc = "Format file or range (in visual mode)" })
|
@ -1,27 +1,27 @@
|
||||
vim.keymap.set("n", "<leader>gs", vim.cmd.Git, {desc = "Git status"})
|
||||
vim.keymap.set("n", "<leader>gs", vim.cmd.Git, { desc = "Git status" })
|
||||
|
||||
local Crony_Fugitive = vim.api.nvim_create_augroup("Crony_Fugitive", {})
|
||||
|
||||
local autocmd = vim.api.nvim_create_autocmd
|
||||
autocmd("BufWinEnter", {
|
||||
group = Crony_Fugitive,
|
||||
pattern = "*",
|
||||
callback = function()
|
||||
if vim.bo.ft ~= "fugitive" then
|
||||
return
|
||||
end
|
||||
group = Crony_Fugitive,
|
||||
pattern = "*",
|
||||
callback = function()
|
||||
if vim.bo.ft ~= "fugitive" then
|
||||
return
|
||||
end
|
||||
|
||||
local bufnr = vim.api.nvim_get_current_buf()
|
||||
local opts = {buffer = bufnr, remap = false}
|
||||
vim.keymap.set("n", "<leader>p", function()
|
||||
vim.cmd.Git('push')
|
||||
end, opts)
|
||||
local bufnr = vim.api.nvim_get_current_buf()
|
||||
local opts = { buffer = bufnr, remap = false }
|
||||
vim.keymap.set("n", "<leader>p", function()
|
||||
vim.cmd.Git("push")
|
||||
end, opts)
|
||||
|
||||
-- rebase always
|
||||
vim.keymap.set("n", "<leader>P", function()
|
||||
vim.cmd.Git({'pull', '--rebase'})
|
||||
end, opts)
|
||||
-- rebase always
|
||||
vim.keymap.set("n", "<leader>P", function()
|
||||
vim.cmd.Git({ "pull", "--rebase" })
|
||||
end, opts)
|
||||
|
||||
vim.keymap.set("n", "<leader>t", ":Git push -u origin ", opts);
|
||||
end,
|
||||
vim.keymap.set("n", "<leader>t", ":Git push -u origin ", opts)
|
||||
end,
|
||||
})
|
||||
|
@ -1,21 +1,21 @@
|
||||
require("gitsigns").setup({
|
||||
signs = {
|
||||
add = { text = "▎" },
|
||||
change = { text = "▎" },
|
||||
delete = { text = "▎" },
|
||||
topdelete = { text = "▎" },
|
||||
changedelete = { text = "▎" },
|
||||
untracked = { text = "▎" },
|
||||
},
|
||||
on_attach = function(buffer)
|
||||
local gs = package.loaded.gitsigns
|
||||
signs = {
|
||||
add = { text = "▎" },
|
||||
change = { text = "▎" },
|
||||
delete = { text = "▎" },
|
||||
topdelete = { text = "▎" },
|
||||
changedelete = { text = "▎" },
|
||||
untracked = { text = "▎" },
|
||||
},
|
||||
on_attach = function(buffer)
|
||||
local gs = package.loaded.gitsigns
|
||||
|
||||
local function map(mode, l, r, desc)
|
||||
vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
|
||||
end
|
||||
local function map(mode, l, r, desc)
|
||||
vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
|
||||
end
|
||||
|
||||
-- stylua: ignore start
|
||||
map("n", "]g", gs.next_hunk, "Next git hunk")
|
||||
map("n", "[g", gs.prev_hunk, "Previous git hunk")
|
||||
end,
|
||||
end,
|
||||
})
|
||||
|
@ -4,14 +4,30 @@ local harpoon = require("harpoon")
|
||||
harpoon:setup()
|
||||
-- REQUIRED
|
||||
|
||||
vim.keymap.set("n", "<leader>a", function() harpoon:list():append() end, {desc = "Append file to harpoon starred list"})
|
||||
vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, {desc = "Check the list of files in harpoon"})
|
||||
vim.keymap.set("n", "<leader>a", function()
|
||||
harpoon:list():append()
|
||||
end, { desc = "Append file to harpoon starred list" })
|
||||
vim.keymap.set("n", "<C-e>", function()
|
||||
harpoon.ui:toggle_quick_menu(harpoon:list())
|
||||
end, { desc = "Check the list of files in harpoon" })
|
||||
|
||||
vim.keymap.set("n", "<C-j>", function() harpoon:list():select(1) end, {desc = "Harpoon to 1st file in list"})
|
||||
vim.keymap.set("n", "<C-k>", function() harpoon:list():select(2) end, {desc = "Harpoon to 2nd file in list"})
|
||||
vim.keymap.set("n", "<C-l>", function() harpoon:list():select(3) end, {desc = "Harpoon to 3rd file in list"})
|
||||
vim.keymap.set("n", "<C-;>", function() harpoon:list():select(4) end, {desc = "Harpoon to 4th file in list"})
|
||||
vim.keymap.set("n", "<C-j>", function()
|
||||
harpoon:list():select(1)
|
||||
end, { desc = "Harpoon to 1st file in list" })
|
||||
vim.keymap.set("n", "<C-k>", function()
|
||||
harpoon:list():select(2)
|
||||
end, { desc = "Harpoon to 2nd file in list" })
|
||||
vim.keymap.set("n", "<C-l>", function()
|
||||
harpoon:list():select(3)
|
||||
end, { desc = "Harpoon to 3rd file in list" })
|
||||
vim.keymap.set("n", "<C-;>", function()
|
||||
harpoon:list():select(4)
|
||||
end, { desc = "Harpoon to 4th file in list" })
|
||||
|
||||
-- Toggle previous & next buffers stored within Harpoon list
|
||||
vim.keymap.set("n", "<C-S-J>", function() harpoon:list():prev() end, {desc = "Harpoon to previous file in list"})
|
||||
vim.keymap.set("n", "<C-S-K>", function() harpoon:list():next() end, {desc = "Harpoon to next file in list"})
|
||||
vim.keymap.set("n", "<C-S-J>", function()
|
||||
harpoon:list():prev()
|
||||
end, { desc = "Harpoon to previous file in list" })
|
||||
vim.keymap.set("n", "<C-S-K>", function()
|
||||
harpoon:list():next()
|
||||
end, { desc = "Harpoon to next file in list" })
|
||||
|
@ -1,18 +1,18 @@
|
||||
require("ibl").setup({
|
||||
indent = { char = "│" },
|
||||
scope = { enabled = false },
|
||||
exclude = {
|
||||
filetypes = {
|
||||
"help",
|
||||
"alpha",
|
||||
"dashboard",
|
||||
"neo-tree",
|
||||
"Trouble",
|
||||
"lazy",
|
||||
"mason",
|
||||
"notify",
|
||||
"toggleterm",
|
||||
"lazyterm",
|
||||
},
|
||||
},
|
||||
indent = { char = "│" },
|
||||
scope = { enabled = false },
|
||||
exclude = {
|
||||
filetypes = {
|
||||
"help",
|
||||
"alpha",
|
||||
"dashboard",
|
||||
"neo-tree",
|
||||
"Trouble",
|
||||
"lazy",
|
||||
"mason",
|
||||
"notify",
|
||||
"toggleterm",
|
||||
"lazyterm",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
@ -1,62 +1,82 @@
|
||||
local lsp = require("lsp-zero")
|
||||
|
||||
lsp.extend_cmp()
|
||||
local cmp = require('cmp')
|
||||
local cmp = require("cmp")
|
||||
|
||||
cmp.setup({
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-k>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-j>'] = cmp.mapping.select_next_item(),
|
||||
['<C-l>'] = cmp.mapping.confirm({ select = true }),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
['<Tab>'] = nil,
|
||||
['<S-Tab>'] = nil,
|
||||
}),
|
||||
sources = {
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'buffer' },
|
||||
{ name = 'path' },
|
||||
{ name = 'nvim_lua' },
|
||||
{ name = 'luasnip' },
|
||||
}
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-k>"] = cmp.mapping.select_prev_item(),
|
||||
["<C-j>"] = cmp.mapping.select_next_item(),
|
||||
["<C-l>"] = cmp.mapping.confirm({ select = true }),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<Tab>"] = nil,
|
||||
["<S-Tab>"] = nil,
|
||||
}),
|
||||
sources = {
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "buffer" },
|
||||
{ name = "path" },
|
||||
{ name = "nvim_lua" },
|
||||
{ name = "luasnip" },
|
||||
},
|
||||
})
|
||||
|
||||
lsp.set_sign_icons({
|
||||
error = 'E',
|
||||
warn = 'W',
|
||||
hint = 'H',
|
||||
info = 'I'
|
||||
error = "E",
|
||||
warn = "W",
|
||||
hint = "H",
|
||||
info = "I",
|
||||
})
|
||||
|
||||
lsp.extend_lspconfig()
|
||||
|
||||
lsp.on_attach(function(client, bufnr)
|
||||
local opts = { buffer = bufnr, remap = false }
|
||||
local opts = { buffer = bufnr, remap = false }
|
||||
|
||||
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
|
||||
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
|
||||
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
|
||||
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
|
||||
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
|
||||
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
|
||||
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
|
||||
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
|
||||
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
|
||||
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
||||
vim.keymap.set("n", "gd", function()
|
||||
vim.lsp.buf.definition()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "K", function()
|
||||
vim.lsp.buf.hover()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<leader>vws", function()
|
||||
vim.lsp.buf.workspace_symbol()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<leader>vd", function()
|
||||
vim.diagnostic.open_float()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "[d", function()
|
||||
vim.diagnostic.goto_next()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "]d", function()
|
||||
vim.diagnostic.goto_prev()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<leader>vca", function()
|
||||
vim.lsp.buf.code_action()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<leader>vrr", function()
|
||||
vim.lsp.buf.references()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<leader>vrn", function()
|
||||
vim.lsp.buf.rename()
|
||||
end, opts)
|
||||
vim.keymap.set("i", "<C-h>", function()
|
||||
vim.lsp.buf.signature_help()
|
||||
end, opts)
|
||||
end)
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = true
|
||||
virtual_text = true,
|
||||
})
|
||||
|
||||
require("mason").setup({})
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = { 'lua_ls' },
|
||||
handlers = {
|
||||
lsp.default_setup,
|
||||
}
|
||||
ensure_installed = { "lua_ls" },
|
||||
handlers = {
|
||||
lsp.default_setup,
|
||||
},
|
||||
})
|
||||
|
@ -1,22 +1,22 @@
|
||||
require('mini.indentscope').setup({
|
||||
symbol = "│",
|
||||
options = { try_as_border = true },
|
||||
require("mini.indentscope").setup({
|
||||
symbol = "│",
|
||||
options = { try_as_border = true },
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = {
|
||||
"help",
|
||||
"alpha",
|
||||
"dashboard",
|
||||
"neo-tree",
|
||||
"Trouble",
|
||||
"lazy",
|
||||
"mason",
|
||||
"notify",
|
||||
"toggleterm",
|
||||
"lazyterm",
|
||||
},
|
||||
callback = function()
|
||||
vim.b.miniindentscope_disable = true
|
||||
end,
|
||||
pattern = {
|
||||
"help",
|
||||
"alpha",
|
||||
"dashboard",
|
||||
"neo-tree",
|
||||
"Trouble",
|
||||
"lazy",
|
||||
"mason",
|
||||
"notify",
|
||||
"toggleterm",
|
||||
"lazyterm",
|
||||
},
|
||||
callback = function()
|
||||
vim.b.miniindentscope_disable = true
|
||||
end,
|
||||
})
|
||||
|
@ -1,10 +1,10 @@
|
||||
require("mkdnflow").setup({
|
||||
modules = {
|
||||
bib = false,
|
||||
yaml = false,
|
||||
cmp = false,
|
||||
},
|
||||
links = {
|
||||
conceal = true,
|
||||
}
|
||||
modules = {
|
||||
bib = false,
|
||||
yaml = false,
|
||||
cmp = false,
|
||||
},
|
||||
links = {
|
||||
conceal = true,
|
||||
},
|
||||
})
|
||||
|
@ -1,7 +1,7 @@
|
||||
require("oil").setup({
|
||||
view_options = {
|
||||
show_hidden = true
|
||||
}
|
||||
view_options = {
|
||||
show_hidden = true,
|
||||
},
|
||||
})
|
||||
|
||||
vim.keymap.set("n", "<leader>e", "<CMD>Oil<CR>", { desc = "Open parent directory" })
|
||||
|
@ -1,7 +1,7 @@
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader>pf', builtin.find_files, { desc = "Find files" })
|
||||
vim.keymap.set('n', '<C-p>', builtin.git_files, { desc = "Find git files" })
|
||||
vim.keymap.set('n', '<leader>ps', function()
|
||||
builtin.grep_string({ search = vim.fn.input("Grep > ") })
|
||||
local builtin = require("telescope.builtin")
|
||||
vim.keymap.set("n", "<leader>pf", builtin.find_files, { desc = "Find files" })
|
||||
vim.keymap.set("n", "<C-p>", builtin.git_files, { desc = "Find git files" })
|
||||
vim.keymap.set("n", "<leader>ps", function()
|
||||
builtin.grep_string({ search = vim.fn.input("Grep > ") })
|
||||
end, { desc = "Find string" })
|
||||
vim.keymap.set('n', '<leader>vh', builtin.help_tags, { desc = "Find help tags" })
|
||||
vim.keymap.set("n", "<leader>vh", builtin.help_tags, { desc = "Find help tags" })
|
||||
|
@ -1,10 +1,10 @@
|
||||
require 'nvim-treesitter.configs'.setup {
|
||||
ensure_installed = { "lua", "bash" },
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = { "lua", "bash" },
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
}
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
})
|
||||
|
@ -1,29 +1,29 @@
|
||||
require('crony.set')
|
||||
require('crony.map')
|
||||
require('crony.lazy')
|
||||
require("crony.set")
|
||||
require("crony.map")
|
||||
require("crony.lazy")
|
||||
|
||||
local autocmd = vim.api.nvim_create_autocmd
|
||||
|
||||
local function augroup(name)
|
||||
return vim.api.nvim_create_augroup("crony_" .. name, { clear = true })
|
||||
return vim.api.nvim_create_augroup("crony_" .. name, { clear = true })
|
||||
end
|
||||
|
||||
-- [[ Highlight on yank ]]
|
||||
autocmd("TextYankPost", {
|
||||
group = augroup("highlight_yank"),
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
group = augroup("highlight_yank"),
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
})
|
||||
|
||||
-- [[ Auto create parent directory if it doesn't exist ]]
|
||||
autocmd({ "BufWritePre" }, {
|
||||
group = augroup("auto_create_dir"),
|
||||
callback = function(event)
|
||||
if event.match:match("^%w%w+://") then
|
||||
return
|
||||
end
|
||||
local file = vim.loop.fs_realpath(event.match) or event.match
|
||||
vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
|
||||
end,
|
||||
group = augroup("auto_create_dir"),
|
||||
callback = function(event)
|
||||
if event.match:match("^%w%w+://") then
|
||||
return
|
||||
end
|
||||
local file = vim.loop.fs_realpath(event.match) or event.match
|
||||
vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
|
||||
end,
|
||||
})
|
||||
|
@ -1,166 +1,168 @@
|
||||
-- bootstraping
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
-- plugins installation and configuration
|
||||
require('lazy').setup({
|
||||
-- Git plugins
|
||||
'tpope/vim-fugitive',
|
||||
require("lazy").setup({
|
||||
-- Git plugins
|
||||
"tpope/vim-fugitive",
|
||||
|
||||
{
|
||||
'VonHeikemen/lsp-zero.nvim',
|
||||
branch = 'v3.x',
|
||||
dependencies = {
|
||||
-- LSP Support
|
||||
{ 'neovim/nvim-lspconfig' },
|
||||
{ 'williamboman/mason.nvim' },
|
||||
{ 'williamboman/mason-lspconfig.nvim' },
|
||||
{
|
||||
"VonHeikemen/lsp-zero.nvim",
|
||||
branch = "v3.x",
|
||||
dependencies = {
|
||||
-- LSP Support
|
||||
{ "neovim/nvim-lspconfig" },
|
||||
{ "williamboman/mason.nvim" },
|
||||
{ "williamboman/mason-lspconfig.nvim" },
|
||||
|
||||
-- Autocompletion
|
||||
{ 'hrsh7th/nvim-cmp' },
|
||||
{ 'hrsh7th/cmp-buffer' },
|
||||
{ 'hrsh7th/cmp-path' },
|
||||
{ 'saadparwaiz1/cmp_luasnip' },
|
||||
{ 'hrsh7th/cmp-nvim-lsp' },
|
||||
{ 'hrsh7th/cmp-nvim-lua' },
|
||||
-- Autocompletion
|
||||
{ "hrsh7th/nvim-cmp" },
|
||||
{ "hrsh7th/cmp-buffer" },
|
||||
{ "hrsh7th/cmp-path" },
|
||||
{ "saadparwaiz1/cmp_luasnip" },
|
||||
{ "hrsh7th/cmp-nvim-lsp" },
|
||||
{ "hrsh7th/cmp-nvim-lua" },
|
||||
|
||||
-- Snippets
|
||||
{ 'L3MON4D3/LuaSnip' },
|
||||
{ 'rafamadriz/friendly-snippets' },
|
||||
-- Snippets
|
||||
{ "L3MON4D3/LuaSnip" },
|
||||
{ "rafamadriz/friendly-snippets" },
|
||||
|
||||
-- Nice lsp info
|
||||
{ 'j-hui/fidget.nvim', opts = {} },
|
||||
-- Nice lsp info
|
||||
{ "j-hui/fidget.nvim", opts = {} },
|
||||
|
||||
-- Additional neovim docs
|
||||
'folke/neodev.nvim',
|
||||
opts = {},
|
||||
}
|
||||
},
|
||||
-- Additional neovim docs
|
||||
"folke/neodev.nvim",
|
||||
opts = {},
|
||||
},
|
||||
},
|
||||
|
||||
-- Emacs which key but in a much nicer form
|
||||
{ 'folke/which-key.nvim', opts = {}, event = "VeryLazy" },
|
||||
-- Emacs which key but in a much nicer form
|
||||
{ "folke/which-key.nvim", opts = {}, event = "VeryLazy" },
|
||||
|
||||
{
|
||||
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
||||
'lewis6991/gitsigns.nvim',
|
||||
},
|
||||
{
|
||||
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
||||
"lewis6991/gitsigns.nvim",
|
||||
},
|
||||
|
||||
{
|
||||
-- Catppuccin, the best pastell color scheme
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
},
|
||||
{
|
||||
-- Catppuccin, the best pastell color scheme
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
},
|
||||
|
||||
{
|
||||
-- Set lualine as statusline
|
||||
'nvim-lualine/lualine.nvim',
|
||||
-- See `:help lualine.txt`
|
||||
opts = {
|
||||
options = {
|
||||
icons_enabled = false,
|
||||
theme = 'catppuccin',
|
||||
component_separators = '|',
|
||||
section_separators = '',
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
-- Set lualine as statusline
|
||||
"nvim-lualine/lualine.nvim",
|
||||
-- See `:help lualine.txt`
|
||||
opts = {
|
||||
options = {
|
||||
icons_enabled = false,
|
||||
theme = "catppuccin",
|
||||
component_separators = "|",
|
||||
section_separators = "",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- show indent line
|
||||
'lukas-reineke/indent-blankline.nvim',
|
||||
},
|
||||
{
|
||||
-- show indent line
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
},
|
||||
|
||||
-- highlight indentscope
|
||||
"echasnovski/mini.indentscope",
|
||||
-- highlight indentscope
|
||||
"echasnovski/mini.indentscope",
|
||||
|
||||
-- "gc" to comment visual regions/lines
|
||||
{ 'numToStr/Comment.nvim', opts = {}, event = "VeryLazy" },
|
||||
-- "gc" to comment visual regions/lines
|
||||
{ "numToStr/Comment.nvim", opts = {}, event = "VeryLazy" },
|
||||
|
||||
-- Fuzzy Finder (files, lsp, etc)
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
lazy = true,
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
},
|
||||
},
|
||||
-- Fuzzy Finder (files, lsp, etc)
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
lazy = true,
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- Highlight, edit, and navigate code
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = ':TSUpdate',
|
||||
},
|
||||
{
|
||||
-- Highlight, edit, and navigate code
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
},
|
||||
|
||||
{
|
||||
-- netrw on crack
|
||||
'stevearc/oil.nvim',
|
||||
opts = {
|
||||
},
|
||||
-- Optional dependencies
|
||||
dependencies = { "nvim-tree/nvim-web-devicons", lazy = true },
|
||||
},
|
||||
{
|
||||
-- netrw on crack
|
||||
"stevearc/oil.nvim",
|
||||
opts = {},
|
||||
-- Optional dependencies
|
||||
dependencies = { "nvim-tree/nvim-web-devicons", lazy = true },
|
||||
},
|
||||
|
||||
{
|
||||
-- harpoon your way around code
|
||||
{
|
||||
"ThePrimeagen/harpoon",
|
||||
branch = "harpoon2",
|
||||
requires = { "nvim-lua/plenary.nvim", lazy = true }
|
||||
}
|
||||
},
|
||||
{
|
||||
-- harpoon your way around code
|
||||
{
|
||||
"ThePrimeagen/harpoon",
|
||||
branch = "harpoon2",
|
||||
requires = { "nvim-lua/plenary.nvim", lazy = true },
|
||||
},
|
||||
},
|
||||
|
||||
"NvChad/nvim-colorizer.lua",
|
||||
"NvChad/nvim-colorizer.lua",
|
||||
|
||||
{
|
||||
"stevearc/dressing.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
input = { default_prompt = "➤ " },
|
||||
select = { backend = { "telescope", "builtin" } },
|
||||
},
|
||||
},
|
||||
{
|
||||
"stevearc/dressing.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
input = { default_prompt = "➤ " },
|
||||
select = { backend = { "telescope", "builtin" } },
|
||||
},
|
||||
},
|
||||
|
||||
-- nice tmux integration
|
||||
'christoomey/vim-tmux-navigator',
|
||||
-- nice tmux integration
|
||||
"christoomey/vim-tmux-navigator",
|
||||
|
||||
-- smart autopairs
|
||||
'windwp/nvim-autopairs',
|
||||
-- smart autopairs
|
||||
"windwp/nvim-autopairs",
|
||||
|
||||
{
|
||||
-- nicer notification's
|
||||
'rcarriga/nvim-notify',
|
||||
config = function()
|
||||
vim.notify = require("notify")
|
||||
end
|
||||
},
|
||||
{
|
||||
-- nicer notification's
|
||||
"rcarriga/nvim-notify",
|
||||
config = function()
|
||||
vim.notify = require("notify")
|
||||
end,
|
||||
},
|
||||
|
||||
-- markdown editing super powered
|
||||
'jakewvincent/mkdnflow.nvim',
|
||||
-- markdown editing super powered
|
||||
"jakewvincent/mkdnflow.nvim",
|
||||
|
||||
-- additional formater support
|
||||
"stevearc/conform.nvim",
|
||||
}, {
|
||||
install = {
|
||||
colorscheme = { "catppuccin" }
|
||||
},
|
||||
performance = {
|
||||
rtp = {
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
"netrwPlugin",
|
||||
"tarPlugin",
|
||||
"tohtml",
|
||||
"tutor",
|
||||
"zipPlugin",
|
||||
}
|
||||
}
|
||||
}
|
||||
install = {
|
||||
colorscheme = { "catppuccin" },
|
||||
},
|
||||
performance = {
|
||||
rtp = {
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
"netrwPlugin",
|
||||
"tarPlugin",
|
||||
"tohtml",
|
||||
"tutor",
|
||||
"zipPlugin",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
@ -1,17 +1,17 @@
|
||||
local map = vim.keymap.set
|
||||
|
||||
-- Leader
|
||||
vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ';'
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = ";"
|
||||
|
||||
-- Diagnostic keymaps
|
||||
map('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
|
||||
map('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
|
||||
map('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
|
||||
map('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
|
||||
map("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
|
||||
map("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
|
||||
map("n", "<leader>e", vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
|
||||
map("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
|
||||
|
||||
-- Lsp format
|
||||
map('n', '<leader>f', vim.lsp.buf.format, { desc = "Format current buffer" })
|
||||
-- map('n', '<leader>f', vim.lsp.buf.format, { desc = "Format current buffer" })
|
||||
|
||||
-- Move text easilly
|
||||
map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move selected text up" })
|
||||
@ -28,7 +28,7 @@ map("x", "<leader>p", [["_dP]], { desc = "Paste while keeping the registry" })
|
||||
|
||||
-- source current lua config file
|
||||
map("n", "<leader><leader>", function()
|
||||
vim.cmd("so")
|
||||
vim.cmd("so")
|
||||
end, { desc = "Source current source file" })
|
||||
|
||||
-- better indenting
|
||||
|
@ -18,7 +18,7 @@ opt.expandtab = true
|
||||
opt.smartindent = true
|
||||
|
||||
-- Enable the mouse, just to have it
|
||||
opt.mouse = 'a'
|
||||
opt.mouse = "a"
|
||||
|
||||
-- Enable break indent
|
||||
opt.breakindent = true
|
||||
@ -34,14 +34,14 @@ opt.ignorecase = true
|
||||
opt.smartcase = true
|
||||
|
||||
-- Keep signcolumn on by default
|
||||
opt.signcolumn = 'yes'
|
||||
opt.signcolumn = "yes"
|
||||
|
||||
-- Decrease update time
|
||||
opt.updatetime = 50
|
||||
opt.timeoutlen = 300
|
||||
|
||||
-- Set completeopt to have a better completion experience
|
||||
opt.completeopt = 'menuone,noselect'
|
||||
opt.completeopt = "menuone,noselect"
|
||||
|
||||
-- Enable true color support
|
||||
opt.termguicolors = true
|
||||
|
Loading…
Reference in New Issue
Block a user