1
0
Fork 0

Use spaces for indentation

This commit is contained in:
Daniele Tricoli 2022-04-19 11:22:16 +02:00
parent 12b67f0729
commit 9d168a9b5e
11 changed files with 308 additions and 306 deletions

View File

@ -1,11 +1,11 @@
require("material").setup({
borders = true,
italics = {
comments = true,
},
text_contrast = {
darker = true,
},
borders = true,
italics = {
comments = true,
},
text_contrast = {
darker = true,
},
})
vim.g.material_style = "darker"

View File

@ -1,10 +1,10 @@
require("indent_blankline").setup({
buftype_exclude = { "terminal" },
filetype_exclude = {
"help",
"packer",
"startify",
},
show_first_indent_level = false,
show_end_of_line = true,
buftype_exclude = { "terminal" },
filetype_exclude = {
"help",
"packer",
"startify",
},
show_first_indent_level = false,
show_end_of_line = true,
})

View File

@ -4,8 +4,8 @@
local signs = { Error = "", Warn = "", Hint = "", Info = "" }
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
end
local null_ls = require "null-ls"
@ -16,83 +16,83 @@ require("lsp_signature").setup()
lsp_status.register_progress()
local function buf_set_keymap(...)
vim.api.nvim_buf_set_keymap(bufnr, ...)
vim.api.nvim_buf_set_keymap(bufnr, ...)
end
local opts = { noremap = true, silent = true }
-- Enable floating window borders
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
border = "single",
border = "single",
})
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signatureHelp, {
border = "single",
border = "single",
})
local common_on_attach = function(client, bufnr)
-- Mappings.
buf_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", opts)
buf_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", opts)
buf_set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>", opts)
buf_set_keymap(
"n",
"]d",
'<cmd>lua vim.diagnostic.goto_next({severity_limit = "Warn", popup_opts = {border = "single"}})<cr>',
opts
)
buf_set_keymap(
"n",
"[d",
'<cmd>lua vim.diagnostic.goto_prev({severity_limit = "Warn", popup_opts = {border = "single"}})<cr>',
opts
)
-- Mappings.
buf_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", opts)
buf_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", opts)
buf_set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>", opts)
buf_set_keymap(
"n",
"]d",
'<cmd>lua vim.diagnostic.goto_next({severity_limit = "Warn", popup_opts = {border = "single"}})<cr>',
opts
)
buf_set_keymap(
"n",
"[d",
'<cmd>lua vim.diagnostic.goto_prev({severity_limit = "Warn", popup_opts = {border = "single"}})<cr>',
opts
)
lsp_status.on_attach(client)
lsp_status.on_attach(client)
end
null_ls.setup({
debug = false,
sources = {
-- Python
null_ls.builtins.formatting.black,
null_ls.builtins.formatting.isort,
null_ls.builtins.diagnostics.flake8,
-- Go
null_ls.builtins.formatting.gofmt,
null_ls.builtins.formatting.goimports,
-- Rust
null_ls.builtins.formatting.rustfmt,
-- Yaml
null_ls.builtins.diagnostics.yamllint,
-- HTML and others
null_ls.builtins.formatting.prettier,
-- Lua
null_ls.builtins.formatting.stylua,
},
on_attach = function(client, bufnr)
-- Format on save.
if client.resolved_capabilities.document_formatting then
buf_set_keymap("n", "<A-f>", "<cmd>lua vim.lsp.buf.formatting_seq_sync()<cr>", opts)
vim.cmd "autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()"
end
end,
debug = false,
sources = {
-- Python
null_ls.builtins.formatting.black,
null_ls.builtins.formatting.isort,
null_ls.builtins.diagnostics.flake8,
-- Go
null_ls.builtins.formatting.gofmt,
null_ls.builtins.formatting.goimports,
-- Rust
null_ls.builtins.formatting.rustfmt,
-- Yaml
null_ls.builtins.diagnostics.yamllint,
-- HTML and others
null_ls.builtins.formatting.prettier,
-- Lua
null_ls.builtins.formatting.stylua,
},
on_attach = function(client, bufnr)
-- Format on save.
if client.resolved_capabilities.document_formatting then
buf_set_keymap("n", "<A-f>", "<cmd>lua vim.lsp.buf.formatting_seq_sync()<cr>", opts)
vim.cmd "autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()"
end
end,
})
-- Use a loop to call `setup` on multiple servers.
local servers = {
"ansiblels",
"esbonio",
"gopls",
"pyright",
"rust_analyzer",
"texlab",
"ansiblels",
"esbonio",
"gopls",
"pyright",
"rust_analyzer",
"texlab",
}
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup({
capabilities = lsp_status.capabilities,
flags = {
debounce_text_changes = 150,
},
on_attach = common_on_attach,
})
lspconfig[lsp].setup({
capabilities = lsp_status.capabilities,
flags = {
debounce_text_changes = 150,
},
on_attach = common_on_attach,
})
end

View File

@ -1,20 +1,20 @@
require("lualine").setup({
options = {
icons_enabled = true,
theme = "auto",
component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" },
disabled_filetypes = { "startify" },
always_divide_middle = true,
},
sections = {
lualine_a = {
{
"mode",
fmt = function(str)
return str:sub(1, 1)
end,
},
},
},
options = {
icons_enabled = true,
theme = "auto",
component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" },
disabled_filetypes = { "startify" },
always_divide_middle = true,
},
sections = {
lualine_a = {
{
"mode",
fmt = function(str)
return str:sub(1, 1)
end,
},
},
},
})

View File

@ -5,29 +5,29 @@ local i = ls.insert_node
local f = ls.function_node
function date_rfc3339()
local cmd = assert(io.popen "/usr/bin/date --rfc-3339=seconds")
local output = cmd:read "*all"
cmd:close()
return output:gsub("\n", "")
local cmd = assert(io.popen "/usr/bin/date --rfc-3339=seconds")
local output = cmd:read "*all"
cmd:close()
return output:gsub("\n", "")
end
ls.snippets = {
markdown = {
s({ trig = "zolan", dscr = "Create a new zola entry" }, {
t({ "+++", "draft = true" }),
t({ "", "date = " }),
f(date_rfc3339, {}, {}),
t({ "", 'title = "' }),
i(1),
t '"',
t({ "", "[taxonomies]" }),
t({ "", 'tags = ["' }),
i(2),
t '"]',
t({ "", "+++", "" }),
i(0),
}),
},
markdown = {
s({ trig = "zolan", dscr = "Create a new zola entry" }, {
t({ "+++", "draft = true" }),
t({ "", "date = " }),
f(date_rfc3339, {}, {}),
t({ "", 'title = "' }),
i(1),
t '"',
t({ "", "[taxonomies]" }),
t({ "", 'tags = ["' }),
i(2),
t '"]',
t({ "", "+++", "" }),
i(0),
}),
},
}
require("luasnip.loaders.from_vscode").lazy_load()

View File

@ -2,61 +2,61 @@ local cmp = require "cmp"
local luasnip = require "luasnip"
local has_words_before = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil
end
cmp.setup({
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
},
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
},
completion = {
completeopt = "menu,menuone,noinsert",
keyword_length = 2,
},
completion = {
completeopt = "menu,menuone,noinsert",
keyword_length = 2,
},
mapping = {
["<cr>"] = cmp.mapping.confirm(),
["<C-Space>"] = cmp.mapping.complete(),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
elseif has_words_before() then
cmp.complete()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { "i", "s" }),
},
mapping = {
["<cr>"] = cmp.mapping.confirm(),
["<C-Space>"] = cmp.mapping.complete(),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
elseif has_words_before() then
cmp.complete()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { "i", "s" }),
},
sources = {
{ name = "nvim_lsp" },
{ name = "nvim_lua" },
{ name = "luasnip" },
{
name = "buffer",
option = {
keyword_pattern = [[\k\+]],
-- Use all buffers to complete.
get_bufnrs = function()
return vim.api.nvim_list_bufs()
end,
},
},
{ name = "path" },
},
sources = {
{ name = "nvim_lsp" },
{ name = "nvim_lua" },
{ name = "luasnip" },
{
name = "buffer",
option = {
keyword_pattern = [[\k\+]],
-- Use all buffers to complete.
get_bufnrs = function()
return vim.api.nvim_list_bufs()
end,
},
},
{ name = "path" },
},
})

View File

@ -1,10 +1,10 @@
require("nvim-tree").setup({
update_focused_file = {
enable = true,
},
view = {
width = 35,
},
update_focused_file = {
enable = true,
},
view = {
width = 35,
},
})
vim.g.nvim_tree_quit_on_open = 1

View File

@ -1,19 +1,19 @@
-- For orgmode.
local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
parser_config.org = {
install_info = {
url = "https://github.com/milisims/tree-sitter-org",
revision = "main",
files = { "src/parser.c", "src/scanner.cc" },
},
filetype = "org",
install_info = {
url = "https://github.com/milisims/tree-sitter-org",
revision = "main",
files = { "src/parser.c", "src/scanner.cc" },
},
filetype = "org",
}
require("nvim-treesitter.configs").setup({
highlight = {
enable = true,
disable = { "org" },
additional_vim_regex_highlighting = { "org" },
},
ensure_installed = { "org" },
highlight = {
enable = true,
disable = { "org" },
additional_vim_regex_highlighting = { "org" },
},
ensure_installed = { "org" },
})

View File

@ -1,131 +1,131 @@
-- Plugins configuration.
local ft_programming = {
"bash",
"c",
"cmake",
"cpp",
"html",
"markdown",
"python",
"sh",
"tex",
"vim",
"zsh",
"bash",
"c",
"cmake",
"cpp",
"html",
"markdown",
"python",
"sh",
"tex",
"vim",
"zsh",
}
return require("packer").startup({
function()
-- Make packer manage itself.
use "wbthomason/packer.nvim"
function()
-- Make packer manage itself.
use "wbthomason/packer.nvim"
use "lewis6991/impatient.nvim"
use "lewis6991/impatient.nvim"
use({
"nvim-lualine/lualine.nvim",
config = [[require('plugins.lualine')]],
requires = { "kyazdani42/nvim-web-devicons", opt = true },
})
use({
"mhinz/vim-sayonara",
config = [[require('plugins.sayonara')]],
})
use({
"nvim-treesitter/nvim-treesitter",
config = [[require('plugins.nvim-treesitter')]],
})
use({
"nvim-lualine/lualine.nvim",
config = [[require('plugins.lualine')]],
requires = { "kyazdani42/nvim-web-devicons", opt = true },
})
use({
"mhinz/vim-sayonara",
config = [[require('plugins.sayonara')]],
})
use({
"nvim-treesitter/nvim-treesitter",
config = [[require('plugins.nvim-treesitter')]],
})
use({
"neovim/nvim-lspconfig",
"nvim-lua/lsp-status.nvim",
})
use({
"jose-elias-alvarez/null-ls.nvim",
config = [[require('plugins.lspconfig')]],
requires = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
})
use({
"neovim/nvim-lspconfig",
"nvim-lua/lsp-status.nvim",
})
use({
"jose-elias-alvarez/null-ls.nvim",
config = [[require('plugins.lspconfig')]],
requires = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
})
use({
"nvim-telescope/telescope.nvim",
config = [[require('plugins.telescope')]],
requires = "nvim-lua/plenary.nvim",
})
use({
"folke/trouble.nvim",
config = [[require('plugins.trouble')]],
requires = "kyazdani42/nvim-web-devicons",
})
use({
"folke/todo-comments.nvim",
config = [[require('plugins.todo-comments')]],
requires = "nvim-lua/plenary.nvim",
})
use "folke/lsp-colors.nvim"
use({
"kyazdani42/nvim-tree.lua",
config = [[require('plugins.nvim-tree')]],
requires = "kyazdani42/nvim-web-devicons",
})
use({
"ray-x/lsp_signature.nvim",
})
use "mhinz/vim-startify"
use({
"nvim-telescope/telescope.nvim",
config = [[require('plugins.telescope')]],
requires = "nvim-lua/plenary.nvim",
})
use({
"folke/trouble.nvim",
config = [[require('plugins.trouble')]],
requires = "kyazdani42/nvim-web-devicons",
})
use({
"folke/todo-comments.nvim",
config = [[require('plugins.todo-comments')]],
requires = "nvim-lua/plenary.nvim",
})
use "folke/lsp-colors.nvim"
use({
"kyazdani42/nvim-tree.lua",
config = [[require('plugins.nvim-tree')]],
requires = "kyazdani42/nvim-web-devicons",
})
use({
"ray-x/lsp_signature.nvim",
})
use "mhinz/vim-startify"
use({
"L3MON4D3/LuaSnip",
config = [[require('plugins.luasnip')]],
})
use({
"hrsh7th/nvim-cmp",
config = [[require('plugins.nvim-cmp')]],
requires = {
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-nvim-lua",
"hrsh7th/cmp-path",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
},
})
use({
"windwp/nvim-autopairs",
after = { "nvim-cmp" },
config = [[require('plugins.nvim-autopairs')]],
})
use({
"numToStr/Comment.nvim",
config = [[require('plugins.comment')]],
tag = "v0.6",
})
use({
"L3MON4D3/LuaSnip",
config = [[require('plugins.luasnip')]],
})
use({
"hrsh7th/nvim-cmp",
config = [[require('plugins.nvim-cmp')]],
requires = {
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-nvim-lua",
"hrsh7th/cmp-path",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
},
})
use({
"windwp/nvim-autopairs",
after = { "nvim-cmp" },
config = [[require('plugins.nvim-autopairs')]],
})
use({
"numToStr/Comment.nvim",
config = [[require('plugins.comment')]],
tag = "v0.6",
})
use({
"lukas-reineke/indent-blankline.nvim",
config = [[require('plugins.indent-blankline')]],
})
use({
"lewis6991/gitsigns.nvim",
config = [[require('plugins.gitsigns')]],
requires = "nvim-lua/plenary.nvim",
})
use "tpope/vim-fugitive"
use({
"lukas-reineke/indent-blankline.nvim",
config = [[require('plugins.indent-blankline')]],
})
use({
"lewis6991/gitsigns.nvim",
config = [[require('plugins.gitsigns')]],
requires = "nvim-lua/plenary.nvim",
})
use "tpope/vim-fugitive"
use "editorconfig/editorconfig-vim"
use "editorconfig/editorconfig-vim"
use({
"lervag/vimtex",
config = [[require('plugins.vimtex')]],
})
use({
"lervag/vimtex",
config = [[require('plugins.vimtex')]],
})
-- Themes
use "bluz71/vim-moonfly-colors"
use "folke/tokyonight.nvim"
use "marko-cerovac/material.nvim"
use "monsonjeremy/onedark.nvim"
use "pappasam/papercolor-theme-slim"
use "rafamadriz/neon"
use "rebelot/kanagawa.nvim"
end,
config = {
max_jobs = 10,
},
-- Themes
use "bluz71/vim-moonfly-colors"
use "folke/tokyonight.nvim"
use "marko-cerovac/material.nvim"
use "monsonjeremy/onedark.nvim"
use "pappasam/papercolor-theme-slim"
use "rafamadriz/neon"
use "rebelot/kanagawa.nvim"
end,
config = {
max_jobs = 10,
},
})

View File

@ -1,19 +1,19 @@
require("trouble").setup({
use_diagnostic_signs = true,
use_diagnostic_signs = true,
})
vim.api.nvim_set_keymap("n", "<leader>xx", "<cmd>TroubleToggle<cr>", { silent = true, noremap = true })
vim.api.nvim_set_keymap(
"n",
"<leader>xw",
"<cmd>Trouble lsp_workspace_diagnostics<cr>",
{ silent = true, noremap = true }
"n",
"<leader>xw",
"<cmd>Trouble lsp_workspace_diagnostics<cr>",
{ silent = true, noremap = true }
)
vim.api.nvim_set_keymap(
"n",
"<leader>xd",
"<cmd>Trouble lsp_document_diagnostics<cr>",
{ silent = true, noremap = true }
"n",
"<leader>xd",
"<cmd>Trouble lsp_document_diagnostics<cr>",
{ silent = true, noremap = true }
)
vim.api.nvim_set_keymap("n", "<leader>xl", "<cmd>Trouble loclist<cr>", { silent = true, noremap = true })
vim.api.nvim_set_keymap("n", "<leader>xq", "<cmd>Trouble quickfix<cr>", { silent = true, noremap = true })

View File

@ -1 +1,3 @@
call_parentheses = "NoSingleString"
indent_type = "Spaces"
indent_width = 4