Skip to content

Commit

Permalink
chore: configure stylua, reformat everything
Browse files Browse the repository at this point in the history
  • Loading branch information
cfcosta committed Sep 11, 2023
1 parent 37b592b commit b779122
Show file tree
Hide file tree
Showing 11 changed files with 124 additions and 122 deletions.
56 changes: 28 additions & 28 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,47 @@ map("n", "<leader>wc", "<cmd>close<cr>")
map("n", "<leader>wo", "<cmd>only<cr>")

after("neogit", function()
map("n", "<leader>gg", "<cmd>Neogit<cr>")
map("n", "<leader>gg", "<cmd>Neogit<cr>")
end)

after("neo-tree", function()
map("n", "<leader>op", "<cmd>Neotree toggle<cr>")
map("n", "<leader>op", "<cmd>Neotree toggle<cr>")
end)

after("toggleterm", function()
map("n", "<leader>ot", "<cmd>ToggleTerm direction=horizontal<cr>")
map("n", "<leader>oT", "<cmd>ToggleTerm direction=vertical<cr>")
map("n", "<leader>ot", "<cmd>ToggleTerm direction=horizontal<cr>")
map("n", "<leader>oT", "<cmd>ToggleTerm direction=vertical<cr>")
end)

after("telescope", function()
map("n", "<leader><leader>", "<cmd> Telescope find_files hidden=true<CR>")
map("n", "<leader>/", "<cmd> Telescope live_grep <CR>")
map("n", "<leader>bb", "<cmd> Telescope buffers <CR>")
map("n", "<leader>cm", "<cmd> Telescope git_commits <CR>")
map("n", "<leader>gt", "<cmd> Telescope git_status <CR>")
map("n", "<leader>ff", "<cmd> Telescope lsp_workspace_symbols <CR>")
map("n", "<leader><leader>", "<cmd> Telescope find_files hidden=true<CR>")
map("n", "<leader>/", "<cmd> Telescope live_grep <CR>")
map("n", "<leader>bb", "<cmd> Telescope buffers <CR>")
map("n", "<leader>cm", "<cmd> Telescope git_commits <CR>")
map("n", "<leader>gt", "<cmd> Telescope git_status <CR>")
map("n", "<leader>ff", "<cmd> Telescope lsp_workspace_symbols <CR>")
end)

after("trouble", function()
map("n", "<leader>xx", "<cmd>TroubleToggle<cr>")
map("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>")
map("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>")
map("n", "<leader>xq", "<cmd>TroubleToggle quicklist<cr>")
map("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>")
map("n", "gr", "<cmd>TroubleToggle lsp_references<cr>")
map("n", "<leader>xx", "<cmd>TroubleToggle<cr>")
map("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>")
map("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>")
map("n", "<leader>xq", "<cmd>TroubleToggle quicklist<cr>")
map("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>")
map("n", "gr", "<cmd>TroubleToggle lsp_references<cr>")
end)

after("nvim-lspconfig", function()
map("n", "gD", vim.lsp.buf.declaration)
map("n", "gd", vim.lsp.buf.definition)
map("n", "K", vim.lsp.buf.hover)
map("n", "gi", vim.lsp.buf.implementation)
map("n", "<leader>ls", vim.lsp.buf.signature_help)
map("n", "<leader>D", vim.lsp.buf.type_definition)
map("n", "<leader>ca", vim.lsp.buf.code_action)
map("n", "<leader>f", vim.diagnostic.open_float)
map("n", "[d", vim.diagnostic.goto_prev)
map("n", "d]", vim.diagnostic.goto_next)
map("n", "<leader>q", vim.diagnostic.setloclist)
map("n", "<leader>cr", vim.lsp.buf.rename)
map("n", "gD", vim.lsp.buf.declaration)
map("n", "gd", vim.lsp.buf.definition)
map("n", "K", vim.lsp.buf.hover)
map("n", "gi", vim.lsp.buf.implementation)
map("n", "<leader>ls", vim.lsp.buf.signature_help)
map("n", "<leader>D", vim.lsp.buf.type_definition)
map("n", "<leader>ca", vim.lsp.buf.code_action)
map("n", "<leader>f", vim.diagnostic.open_float)
map("n", "[d", vim.diagnostic.goto_prev)
map("n", "d]", vim.diagnostic.goto_next)
map("n", "<leader>q", vim.diagnostic.setloclist)
map("n", "<leader>cr", vim.lsp.buf.rename)
end)
12 changes: 6 additions & 6 deletions plugins/cmp.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local cmp = require "cmp"
local cmp = require("cmp")

cmp.setup {
cmp.setup({
snippet = {
expand = function(args)
require("snippy").expand_snippet(args.body)
Expand All @@ -10,13 +10,13 @@ cmp.setup {
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(),
},
mapping = cmp.mapping.preset.insert {
mapping = cmp.mapping.preset.insert({
["<C-b>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.abort(),
["<CR>"] = cmp.mapping.confirm { select = true },
},
["<CR>"] = cmp.mapping.confirm({ select = true }),
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" },
{ name = "nvim_lsp_signature_help" },
Expand All @@ -25,4 +25,4 @@ cmp.setup {
}, {
{ name = "buffer" },
}),
}
})
16 changes: 8 additions & 8 deletions plugins/indentline.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
vim.cmd [[highlight IndentBlanklineIndent1 guifg=#282D45 gui=nocombine]]
vim.cmd [[highlight IndentBlanklineIndent2 guifg=#2F3552 gui=nocombine]]
vim.cmd [[highlight IndentBlanklineIndent3 guifg=#373D5E gui=nocombine]]
vim.cmd [[highlight IndentBlanklineIndent4 guifg=#3E466B gui=nocombine]]
vim.cmd [[highlight IndentBlanklineIndent5 guifg=#464E78 gui=nocombine]]
vim.cmd [[highlight IndentBlanklineIndent6 guifg=#4D5685 gui=nocombine]]
vim.cmd([[highlight IndentBlanklineIndent1 guifg=#282D45 gui=nocombine]])
vim.cmd([[highlight IndentBlanklineIndent2 guifg=#2F3552 gui=nocombine]])
vim.cmd([[highlight IndentBlanklineIndent3 guifg=#373D5E gui=nocombine]])
vim.cmd([[highlight IndentBlanklineIndent4 guifg=#3E466B gui=nocombine]])
vim.cmd([[highlight IndentBlanklineIndent5 guifg=#464E78 gui=nocombine]])
vim.cmd([[highlight IndentBlanklineIndent6 guifg=#4D5685 gui=nocombine]])

require("indent_blankline").setup {
require("indent_blankline").setup({
filetype_exclude = {
"help",
"terminal",
Expand All @@ -27,4 +27,4 @@ require("indent_blankline").setup {
"IndentBlanklineIndent5",
"IndentBlanklineIndent6",
},
}
})
24 changes: 12 additions & 12 deletions plugins/lsp.lua
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
local lspconfig = require "lspconfig"
local configs = require "lspconfig.configs"
local util = require "lspconfig.util"
local lspconfig = require("lspconfig")
local configs = require("lspconfig.configs")
local util = require("lspconfig.util")

-- Nix
lspconfig.nixd.setup {}
lspconfig.nixd.setup({})
-- Typescript
lspconfig.tsserver.setup {}
lspconfig.eslint.setup {}
lspconfig.tsserver.setup({})
lspconfig.eslint.setup({})
-- Protocol Buffers
lspconfig.bufls.setup {}
lspconfig.bufls.setup({})

lspconfig.lua_ls.setup {
lspconfig.lua_ls.setup({
settings = {
Lua = {
runtime = {
Expand All @@ -27,9 +27,9 @@ lspconfig.lua_ls.setup {
},
},
},
}
})

lspconfig.gopls.setup {
lspconfig.gopls.setup({
cmd = { "gopls" },
capabilities = require("cmp_nvim_lsp").default_capabilities(),
settings = {
Expand All @@ -45,7 +45,7 @@ lspconfig.gopls.setup {
init_options = {
usePlaceholders = true,
},
}
})

if not configs.aiken then
configs.aiken = {
Expand All @@ -70,5 +70,5 @@ if not configs.aiken then
},
}

lspconfig.aiken.setup {}
lspconfig.aiken.setup({})
end
4 changes: 2 additions & 2 deletions plugins/neogit.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require("neogit").setup {
require("neogit").setup({
use_magit_keybindings = true,
integrations = {
diffview = true,
},
}
})
12 changes: 6 additions & 6 deletions plugins/null-ls.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local null_ls = require "null-ls"
local null_ls = require("null-ls")
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})

null_ls.setup {
null_ls.setup({
sources = {
null_ls.builtins.code_actions.statix,
null_ls.builtins.formatting.stylua,
Expand All @@ -14,15 +14,15 @@ null_ls.setup {
null_ls.builtins.diagnostics.eslint,
},
on_attach = function(client, bufnr)
if client.supports_method "textDocument/formatting" then
vim.api.nvim_clear_autocmds { group = augroup, buffer = bufnr }
if client.supports_method("textDocument/formatting") then
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format { bufnr = bufnr }
vim.lsp.buf.format({ bufnr = bufnr })
end,
})
end
end,
}
})
2 changes: 1 addition & 1 deletion plugins/osc52.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ local function copy(lines, _)
end

local function paste()
return { vim.fn.split(vim.fn.getreg "", "\n"), vim.fn.getregtype "" }
return { vim.fn.split(vim.fn.getreg(""), "\n"), vim.fn.getregtype("") }
end

vim.g.clipboard = {
Expand Down
4 changes: 2 additions & 2 deletions plugins/rust-tools.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local lsp_attach = function(client, buf)
end

-- Setup rust_analyzer via rust-tools.nvim
require("rust-tools").setup {
require("rust-tools").setup({
server = {
capabilities = capabilities,
on_attach = lsp_attach,
Expand All @@ -28,4 +28,4 @@ require("rust-tools").setup {
},
},
},
}
})
100 changes: 50 additions & 50 deletions plugins/telescope.lua
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
local options = {
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" },
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,
buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker,
mappings = {
n = { ["q"] = require("telescope.actions").close },
i = { ["<esc>"] = require("telescope.actions").close },
},
},
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" },
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,
buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker,
mappings = {
n = { ["q"] = require("telescope.actions").close },
i = { ["<esc>"] = require("telescope.actions").close },
},
},

extensions_list = { "themes", "terms" },
extensions_list = { "themes", "terms" },
}

require("telescope").setup(options)
14 changes: 7 additions & 7 deletions plugins/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ table.insert(new_runtimepath, 1, parser_install_dir)
vim.opt.runtimepath = new_runtimepath

require("nvim-treesitter.configs").setup({
ensure_installed = { "rust", "nix", "lua", "c", "vim", "vimdoc" },
sync_install = false,
auto_install = true,
highlight = { enable = true },
endwise = { enable = true },
indent = { enable = true },
parser_install_dir = parser_install_dir,
ensure_installed = { "rust", "nix", "lua", "c", "vim", "vimdoc" },
sync_install = false,
auto_install = true,
highlight = { enable = true },
endwise = { enable = true },
indent = { enable = true },
parser_install_dir = parser_install_dir,
})

-- Enable folding using treesitter
Expand Down
2 changes: 2 additions & 0 deletions stylua.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
indent_type = "Spaces"
indent_width = 2

0 comments on commit b779122

Please sign in to comment.