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 augroup = vim.api.nvim_create_augroup
-- Groups
local neogitCmds = augroup('MyCustomNeogitEvents', { clear = true })
local neogitCmds = augroup("MyCustomNeogitEvents", { clear = true })
local nvimhelp = augroup("help_window_right", {})
-- Neogit nvim tree refresh
autocmd('User', {
pattern = 'NeogitPushComplete',
autocmd("User", {
pattern = "NeogitPushComplete",
group = neogitCmds,
callback = function()
require('nvim-tree.api').tree.reload()
require("nvim-tree.api").tree.reload()
end,
})
autocmd('User', {
pattern = 'NeogitPullComplete',
autocmd("User", {
pattern = "NeogitPullComplete",
group = neogitCmds,
callback = function()
require('nvim-tree.api').tree.reload()
require("nvim-tree.api").tree.reload()
end,
})
autocmd('User', {
pattern = 'NeogitFetchComplete',
autocmd("User", {
pattern = "NeogitFetchComplete",
group = neogitCmds,
callback = function()
require('nvim-tree.api').tree.reload()
require("nvim-tree.api").tree.reload()
end,
})
@@ -31,6 +31,8 @@ autocmd("BufWinEnter", {
group = nvimhelp,
pattern = { "*.txt" },
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,
})

View File

@@ -67,10 +67,9 @@ set("n", "<leader>lu", "<cmd>Lazy<CR>", { desc = "Lazy UI" })
set("n", "<leader>n", ":NvimTreeToggle <CR>")
set("n", "<leader>e", ":NvimTreeFocus <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())
end, {desc = "Change root dir to current dir"}
)
end, { desc = "Change root dir to current dir" })
-- trouble
set("n", "<leader>tt", "<cmd>TroubleToggle <CR>", { silent = true })

View File

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

View File

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

View File

@@ -3,7 +3,7 @@ if not setup then
return
end
bufferline.setup {
bufferline.setup({
options = {
mode = "buffers",
style_preset = bufferline.style_preset.default,
@@ -12,7 +12,7 @@ bufferline.setup {
close_command = "bdelete! %d",
indicator = {
icon = "",
style = "icon"
style = "icon",
},
max_name_length = 18,
max_prefix_length = 15,
@@ -23,12 +23,12 @@ bufferline.setup {
filetype = "NvimTree",
text = "File Explorer",
highlight = "None",
padding = 1
}
padding = 1,
},
},
color_icons = true,
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
end,
always_show_bufferline = true,
@@ -36,10 +36,10 @@ bufferline.setup {
diagnostics_update_in_insert = false,
diagnostics_indicator = function(count, level, diagnostics_dict, context)
if context.buffer:current() then
return ''
return ""
end
return ''
return ""
end,
highlights = {
background = {
@@ -58,12 +58,12 @@ bufferline.setup {
guibg = "None",
},
},
}
}
},
})
vim.g.transparent_groups = vim.list_extend(
vim.g.transparent_groups or {},
vim.tbl_map(function(v)
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 = {
notify = true,
mason = true,
}
},
})

View File

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

View File

@@ -39,44 +39,44 @@ db.setup({
},
center = {
{
icon = '󰍉 ',
icon_hl = 'main',
desc = 'Find files',
desc_hl = 'main',
key = 'f',
key_hl = 'main',
action = 'Telescope find_files',
icon = "󰍉 ",
icon_hl = "main",
desc = "Find files",
desc_hl = "main",
key = "f",
key_hl = "main",
action = "Telescope find_files",
},
{
icon = '',
icon_hl = 'main',
desc = 'Select project',
desc_hl = 'main',
key = 'p',
key_hl = 'main',
action = 'Telescope project',
icon = "",
icon_hl = "main",
desc = "Select project",
desc_hl = "main",
key = "p",
key_hl = "main",
action = "Telescope project",
},
{
icon = '',
icon_hl = 'main',
desc = 'Neorg',
desc_hl = 'main',
key = 'n',
key_hl = 'main',
action = 'Neorg workspace main',
icon = "",
icon_hl = "main",
desc = "Neorg",
desc_hl = "main",
key = "n",
key_hl = "main",
action = "Neorg workspace main",
},
{
icon = '󰚰 ',
icon_hl = 'main',
desc = 'Lazy sync',
desc_hl = 'main',
key = 'l',
key_hl = 'main',
action = 'Lazy sync',
icon = "󰚰 ",
icon_hl = "main",
desc = "Lazy sync",
desc_hl = "main",
key = "l",
key_hl = "main",
action = "Lazy sync",
},
},
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
return
end
nvimcord.setup {
nvimcord.setup({
autostart = false,
client_id = '954365489214291979',
client_id = "954365489214291979",
large_file_icon = false,
log_level = vim.log.levels.DEBUG,
workspace_name = function()
return vim.cmd [[pwd]]
return vim.cmd([[pwd]])
end,
workspace_url = function()
return ''
return ""
end,
}
})

View File

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

View File

@@ -10,16 +10,36 @@ end
local on_attach = function(client, 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", "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
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-Space>"] = cmp.mapping.complete(), -- show completion suggestions
["<CR>"] = cmp.mapping.confirm({ select = false }),
['<Tab>'] = nil,
['<S-Tab>'] = nil
["<Tab>"] = nil,
["<S-Tab>"] = nil,
}),
sources = cmp.config.sources({

View File

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

View File

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

View File

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

View File

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

2
stylua.toml Normal file
View File

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