Updating all files to use stylua

Signed-off-by: Taken <taken@mairimashita.org>
This commit is contained in:
2023-08-31 12:14:37 +02:00
parent 4e07e36ca7
commit 2eaafbc10e
27 changed files with 788 additions and 737 deletions

View File

@@ -1,29 +1,29 @@
local autocmd = vim.api.nvim_create_autocmd local autocmd = vim.api.nvim_create_autocmd
local augroup = vim.api.nvim_create_augroup local augroup = vim.api.nvim_create_augroup
-- Groups -- Groups
local neogitCmds = augroup('MyCustomNeogitEvents', { clear = true }) local neogitCmds = augroup("MyCustomNeogitEvents", { clear = true })
local nvimhelp = augroup("help_window_right", {}) local nvimhelp = augroup("help_window_right", {})
-- Neogit nvim tree refresh -- Neogit nvim tree refresh
autocmd('User', { autocmd("User", {
pattern = 'NeogitPushComplete', pattern = "NeogitPushComplete",
group = neogitCmds, group = neogitCmds,
callback = function() callback = function()
require('nvim-tree.api').tree.reload() require("nvim-tree.api").tree.reload()
end, end,
}) })
autocmd('User', { autocmd("User", {
pattern = 'NeogitPullComplete', pattern = "NeogitPullComplete",
group = neogitCmds, group = neogitCmds,
callback = function() callback = function()
require('nvim-tree.api').tree.reload() require("nvim-tree.api").tree.reload()
end, end,
}) })
autocmd('User', { autocmd("User", {
pattern = 'NeogitFetchComplete', pattern = "NeogitFetchComplete",
group = neogitCmds, group = neogitCmds,
callback = function() callback = function()
require('nvim-tree.api').tree.reload() require("nvim-tree.api").tree.reload()
end, end,
}) })
@@ -31,6 +31,8 @@ autocmd("BufWinEnter", {
group = nvimhelp, group = nvimhelp,
pattern = { "*.txt" }, pattern = { "*.txt" },
callback = function() callback = function()
if vim.o.filetype == 'help' then vim.cmd.wincmd("L") end if vim.o.filetype == "help" then
vim.cmd.wincmd("L")
end end
end,
}) })

View File

@@ -69,8 +69,7 @@ set("n", "<leader>e", ":NvimTreeFocus <CR>")
set("n", "<leader>r", ":NvimTreeRefresh <CR>") set("n", "<leader>r", ":NvimTreeRefresh <CR>")
set("n", "<leader>tr", function() set("n", "<leader>tr", function()
require("nvim-tree.api").tree.change_root(vim.fn.getcwd()) require("nvim-tree.api").tree.change_root(vim.fn.getcwd())
end, {desc = "Change root dir to current dir"} end, { desc = "Change root dir to current dir" })
)
-- trouble -- trouble
set("n", "<leader>tt", "<cmd>TroubleToggle <CR>", { silent = true }) set("n", "<leader>tt", "<cmd>TroubleToggle <CR>", { silent = true })

View File

@@ -58,7 +58,7 @@ local plugins = {
-- development -- development
{ {
"github/copilot.vim", "github/copilot.vim",
event = "VimEnter" event = "VimEnter",
}, },
{ {
"nvim-tree/nvim-tree.lua", "nvim-tree/nvim-tree.lua",

View File

@@ -3,11 +3,11 @@ if not autopairs_setup then
return return
end end
autopairs.setup { autopairs.setup({
check_ts = true, check_ts = true,
ts_config = { ts_config = {
lua = { "string" }, lua = { "string" },
javascript = { "template_string" }, javascript = { "template_string" },
java = false, java = false,
}, },
} })

View File

@@ -3,7 +3,7 @@ if not setup then
return return
end end
bufferline.setup { bufferline.setup({
options = { options = {
mode = "buffers", mode = "buffers",
style_preset = bufferline.style_preset.default, style_preset = bufferline.style_preset.default,
@@ -12,7 +12,7 @@ bufferline.setup {
close_command = "bdelete! %d", close_command = "bdelete! %d",
indicator = { indicator = {
icon = "", icon = "",
style = "icon" style = "icon",
}, },
max_name_length = 18, max_name_length = 18,
max_prefix_length = 15, max_prefix_length = 15,
@@ -23,12 +23,12 @@ bufferline.setup {
filetype = "NvimTree", filetype = "NvimTree",
text = "File Explorer", text = "File Explorer",
highlight = "None", highlight = "None",
padding = 1 padding = 1,
} },
}, },
color_icons = true, color_icons = true,
get_element_icon = function(element) get_element_icon = function(element)
local icon, hl = require('nvim-web-devicons').get_icon_by_filetype(element.filetype, { default = false }) local icon, hl = require("nvim-web-devicons").get_icon_by_filetype(element.filetype, { default = false })
return icon, hl return icon, hl
end, end,
always_show_bufferline = true, always_show_bufferline = true,
@@ -36,10 +36,10 @@ bufferline.setup {
diagnostics_update_in_insert = false, diagnostics_update_in_insert = false,
diagnostics_indicator = function(count, level, diagnostics_dict, context) diagnostics_indicator = function(count, level, diagnostics_dict, context)
if context.buffer:current() then if context.buffer:current() then
return '' return ""
end end
return '' return ""
end, end,
highlights = { highlights = {
background = { background = {
@@ -58,12 +58,12 @@ bufferline.setup {
guibg = "None", guibg = "None",
}, },
}, },
} },
} })
vim.g.transparent_groups = vim.list_extend( vim.g.transparent_groups = vim.list_extend(
vim.g.transparent_groups or {}, vim.g.transparent_groups or {},
vim.tbl_map(function(v) vim.tbl_map(function(v)
return v.hl_group return v.hl_group
end, vim.tbl_values(require('bufferline.config').highlights)) end, vim.tbl_values(require("bufferline.config").highlights))
) )

View File

@@ -7,5 +7,5 @@ catppuccin.setup({
integrations = { integrations = {
notify = true, notify = true,
mason = true, mason = true,
} },
}) })

View File

@@ -8,17 +8,17 @@ comment.setup({
sticky = true, sticky = true,
ignore = nil, ignore = nil,
toggler = { toggler = {
line = 'gcc', line = "gcc",
block = 'gbc', block = "gbc",
}, },
opleader = { opleader = {
line = 'gc', line = "gc",
block = 'gb', block = "gb",
}, },
extra = { extra = {
above = 'gcO', above = "gcO",
below = 'gco', below = "gco",
eol = 'gcA', eol = "gcA",
}, },
mappings = { mappings = {
basic = true, basic = true,

View File

@@ -39,44 +39,44 @@ db.setup({
}, },
center = { center = {
{ {
icon = '󰍉 ', icon = "󰍉 ",
icon_hl = 'main', icon_hl = "main",
desc = 'Find files', desc = "Find files",
desc_hl = 'main', desc_hl = "main",
key = 'f', key = "f",
key_hl = 'main', key_hl = "main",
action = 'Telescope find_files', action = "Telescope find_files",
}, },
{ {
icon = '', icon = "",
icon_hl = 'main', icon_hl = "main",
desc = 'Select project', desc = "Select project",
desc_hl = 'main', desc_hl = "main",
key = 'p', key = "p",
key_hl = 'main', key_hl = "main",
action = 'Telescope project', action = "Telescope project",
}, },
{ {
icon = '', icon = "",
icon_hl = 'main', icon_hl = "main",
desc = 'Neorg', desc = "Neorg",
desc_hl = 'main', desc_hl = "main",
key = 'n', key = "n",
key_hl = 'main', key_hl = "main",
action = 'Neorg workspace main', action = "Neorg workspace main",
}, },
{ {
icon = '󰚰 ', icon = "󰚰 ",
icon_hl = 'main', icon_hl = "main",
desc = 'Lazy sync', desc = "Lazy sync",
desc_hl = 'main', desc_hl = "main",
key = 'l', key = "l",
key_hl = 'main', key_hl = "main",
action = 'Lazy sync', action = "Lazy sync",
}, },
}, },
footer = { footer = {
"" .. version .. " " .. plugins_count .. ' plugins in ' .. ms .. 'ms 󰃭 ' .. date .. '' .. time, "" .. version .. " " .. plugins_count .. " plugins in " .. ms .. "ms 󰃭 " .. date .. "" .. time,
} },
} },
}) })

View File

@@ -1,17 +1,17 @@
local setup, nvimcord = pcall(require, 'nvimcord') local setup, nvimcord = pcall(require, "nvimcord")
if not setup then if not setup then
return return
end end
nvimcord.setup { nvimcord.setup({
autostart = false, autostart = false,
client_id = '954365489214291979', client_id = "954365489214291979",
large_file_icon = false, large_file_icon = false,
log_level = vim.log.levels.DEBUG, log_level = vim.log.levels.DEBUG,
workspace_name = function() workspace_name = function()
return vim.cmd [[pwd]] return vim.cmd([[pwd]])
end, end,
workspace_url = function() workspace_url = function()
return '' return ""
end, end,
} })

View File

@@ -3,7 +3,7 @@ if not status then
return return
end end
toggleterm.setup { toggleterm.setup({
shell = "pwsh.exe -nologo", shell = "pwsh.exe -nologo",
start_in_insert = true, start_in_insert = true,
} })

View File

@@ -10,16 +10,36 @@ end
local on_attach = function(client, bufnr) local on_attach = function(client, bufnr)
local opts = { noremap = true, silent = true, buffer = bufnr } local opts = { noremap = true, silent = true, buffer = bufnr }
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) vim.keymap.set("n", "gd", function()
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) vim.lsp.buf.definition()
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts) end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts) vim.keymap.set("n", "K", function()
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) vim.lsp.buf.hover()
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) end, opts)
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts) vim.keymap.set("n", "<leader>vws", function()
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts) vim.lsp.buf.workspace_symbol()
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts) end, opts)
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() 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 end
local capabilities = cmp_nvim_lsp.default_capabilities() local capabilities = cmp_nvim_lsp.default_capabilities()

View File

@@ -28,8 +28,8 @@ cmp.setup({
["<C-n>"] = cmp.mapping.select_next_item(), -- next suggestion ["<C-n>"] = cmp.mapping.select_next_item(), -- next suggestion
["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions ["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
["<CR>"] = cmp.mapping.confirm({ select = false }), ["<CR>"] = cmp.mapping.confirm({ select = false }),
['<Tab>'] = nil, ["<Tab>"] = nil,
['<S-Tab>'] = nil ["<S-Tab>"] = nil,
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({

View File

@@ -15,10 +15,10 @@ nvimtree.setup({
dotfiles = false, dotfiles = false,
custom = { custom = {
"node_modules", "node_modules",
".git" ".git",
}, },
exclude = { exclude = {
".gitignore" ".gitignore",
} },
}, },
}) })

View File

@@ -5,15 +5,43 @@ end
transparent.setup({ transparent.setup({
groups = { groups = {
'Normal', 'NormalNC', 'Comment', 'Constant', 'Special', 'Identifier', "Normal",
'Statement', 'PreProc', 'Type', 'Underlined', 'Todo', 'String', 'Function', "NormalNC",
'Conditional', 'Repeat', 'Operator', 'Structure', 'LineNr', 'NonText', "Comment",
'SignColumn', 'CursorLineNr', 'EndOfBuffer', "Constant",
"Special",
"Identifier",
"Statement",
"PreProc",
"Type",
"Underlined",
"Todo",
"String",
"Function",
"Conditional",
"Repeat",
"Operator",
"Structure",
"LineNr",
"NonText",
"SignColumn",
"CursorLineNr",
"EndOfBuffer",
}, },
extra_groups = { extra_groups = {
"NormalSB", "NvimTreeNormal", "NvimTreeNormalNC", "NvimTreeNormalSB", "NormalSB",
"Folded", "NonText", "SpecialKey", "VertSplit", "EndOfBuffer", "SignColumn", "NvimTreeNormal",
"BufferLineFill", "BufferLineBackground", "BufferLineBufferSelected", "NvimTreeNormalNC",
"NvimTreeNormalSB",
"Folded",
"NonText",
"SpecialKey",
"VertSplit",
"EndOfBuffer",
"SignColumn",
"BufferLineFill",
"BufferLineBackground",
"BufferLineBufferSelected",
}, },
exclude_groups = {}, exclude_groups = {},
}) })

View File

@@ -3,7 +3,7 @@ if not status then
return return
end end
treesitter.setup { treesitter.setup({
ensure_installed = { "lua", "vim", "vimdoc", "javascript", "java", "json" }, ensure_installed = { "lua", "vim", "vimdoc", "javascript", "java", "json" },
sync_install = false, sync_install = false,
auto_install = true, auto_install = true,
@@ -12,4 +12,4 @@ treesitter.setup {
enable = true, enable = true,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
}, },
} })

View File

@@ -15,7 +15,7 @@ whichkey.setup({
breadcrumb = "»", breadcrumb = "»",
separator = "", separator = "",
group = "", group = "",
} },
}) })
whichkey.register({ whichkey.register({

2
stylua.toml Normal file
View File

@@ -0,0 +1,2 @@
indent_type = "Spaces"
indent_width = 4