From 923f70d26b100cc67323d4507b63dbfd10678d51 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 29 Apr 2022 18:02:46 +0200 Subject: vim{,-dev}.lua: format with stylua --- dotfiles/vim-dev.lua | 56 +++++++++++++------------- dotfiles/vim.lua | 109 +++++++++++++++++++++++++-------------------------- stylua.toml | 1 + 3 files changed, 84 insertions(+), 82 deletions(-) create mode 100644 stylua.toml diff --git a/dotfiles/vim-dev.lua b/dotfiles/vim-dev.lua index d59fbb6..d7ab1c9 100644 --- a/dotfiles/vim-dev.lua +++ b/dotfiles/vim-dev.lua @@ -1,37 +1,39 @@ -local lspconfig = require("lspconfig") +local lspconfig = require "lspconfig" local function on_attach(client, bufnr) local opts = { noremap = true, silent = true, buffer = bufnr } - local telescope_builtin = require("telescope.builtin") + local telescope_builtin = require "telescope.builtin" local cursor_theme = require("telescope.themes").get_cursor() local function cursor(callback) - return function() callback(cursor_theme) end + return function() + callback(cursor_theme) + end end local function desc(tbl1, description) return vim.tbl_extend("force", tbl1, { desc = description }) end - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, desc(opts, "LSP declaration")) - vim.keymap.set('n', 'gd', telescope_builtin.lsp_definitions, desc(opts, "LSP Definitions")) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, desc(opts, "LSP Hover")) + vim.keymap.set("n", "gD", vim.lsp.buf.declaration, desc(opts, "LSP declaration")) + vim.keymap.set("n", "gd", telescope_builtin.lsp_definitions, desc(opts, "LSP Definitions")) + vim.keymap.set("n", "K", vim.lsp.buf.hover, desc(opts, "LSP Hover")) - vim.keymap.set('n', 'gr', telescope_builtin.lsp_references, desc(opts, "LSP References")) + vim.keymap.set("n", "gr", telescope_builtin.lsp_references, desc(opts, "LSP References")) - vim.keymap.set('n', 'sa', cursor(telescope_builtin.lsp_code_actions), desc(opts, "LSP Code Actions")) - vim.keymap.set('n', 'se', vim.diagnostic.open_float, desc(opts, "Local Diagnostics")) - vim.keymap.set('n', 'sE', telescope_builtin.diagnostics, desc(opts, "Global Diagnostics")) - vim.keymap.set('n', 'sl', vim.diagnostic.setloclist, desc(opts, "Diagnostics set LocList")) - vim.keymap.set('n', 'sq', vim.diagnostic.setqflist, desc(opts, "Diagnostics set QFList")) - vim.keymap.set('n', 'sr', vim.lsp.buf.rename, desc(opts, "LSP Rename")) - vim.keymap.set('n', 'ss', telescope_builtin.lsp_document_symbols, desc(opts, "LSP Document Symbols")) - vim.keymap.set('n', 'sS', telescope_builtin.lsp_workspace_symbols, desc(opts, "LSP Workspace Symbols")) + vim.keymap.set("n", "sa", cursor(telescope_builtin.lsp_code_actions), desc(opts, "LSP Code Actions")) + vim.keymap.set("n", "se", vim.diagnostic.open_float, desc(opts, "Local Diagnostics")) + vim.keymap.set("n", "sE", telescope_builtin.diagnostics, desc(opts, "Global Diagnostics")) + vim.keymap.set("n", "sl", vim.diagnostic.setloclist, desc(opts, "Diagnostics set LocList")) + vim.keymap.set("n", "sq", vim.diagnostic.setqflist, desc(opts, "Diagnostics set QFList")) + vim.keymap.set("n", "sr", vim.lsp.buf.rename, desc(opts, "LSP Rename")) + vim.keymap.set("n", "ss", telescope_builtin.lsp_document_symbols, desc(opts, "LSP Document Symbols")) + vim.keymap.set("n", "sS", telescope_builtin.lsp_workspace_symbols, desc(opts, "LSP Workspace Symbols")) - vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, desc(opts, "Goto Next Diagnostic")) - vim.keymap.set('n', ']d', vim.diagnostic.goto_next, desc(opts, "Goto Prev Diagnostic")) + vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, desc(opts, "Goto Next Diagnostic")) + vim.keymap.set("n", "]d", vim.diagnostic.goto_next, desc(opts, "Goto Prev Diagnostic")) -- Capability specific @@ -45,21 +47,21 @@ local function on_attach(client, bufnr) -- Rust specific vim.keymap.set("n", "sh", "RustToggleInlayHints", opts) - require("lsp_signature").on_attach({ - hint_prefix = "param: " - }) + require("lsp_signature").on_attach { + hint_prefix = "param: ", + } end local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.resolveSupport = { - properties = { - 'documentation', - 'detail', - 'additionalTextEdits', - } + properties = { + "documentation", + "detail", + "additionalTextEdits", + }, } -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) require("rust-tools").setup { server = { @@ -75,7 +77,7 @@ require("rust-tools").setup { }, }, on_attach = on_attach, - } + }, } require("nlua.lsp.nvim").setup(lspconfig, { diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua index 0b11fb6..d380ec0 100644 --- a/dotfiles/vim.lua +++ b/dotfiles/vim.lua @@ -85,31 +85,31 @@ map("n", "=of", [[:set =(&formatoptions =~ "a") ? 'formatoptions-=a' : 'for -- Gitsigns -require('gitsigns').setup { +require("gitsigns").setup { keymaps = { noremap = true, buffer = true, silent = true, - ['n ]c'] = { expr = true, "&diff ? ']c' : 'lua require\"gitsigns\".next_hunk()'"}, - ['n [c'] = { expr = true, "&diff ? '[c' : 'lua require\"gitsigns\".prev_hunk()'"}, + ["n ]c"] = { expr = true, "&diff ? ']c' : 'lua require\"gitsigns\".next_hunk()'" }, + ["n [c"] = { expr = true, "&diff ? '[c' : 'lua require\"gitsigns\".prev_hunk()'" }, - ['n hs'] = 'lua require"gitsigns".stage_hunk()', - ['n hu'] = 'lua require"gitsigns".undo_stage_hunk()', - ['n hr'] = 'lua require"gitsigns".reset_hunk()', - ['n hR'] = 'lua require"gitsigns".reset_buffer()', - ['n hp'] = 'lua require"gitsigns".preview_hunk()', - ['n hb'] = 'lua require"gitsigns".blame_line()', + ["n hs"] = 'lua require"gitsigns".stage_hunk()', + ["n hu"] = 'lua require"gitsigns".undo_stage_hunk()', + ["n hr"] = 'lua require"gitsigns".reset_hunk()', + ["n hR"] = 'lua require"gitsigns".reset_buffer()', + ["n hp"] = 'lua require"gitsigns".preview_hunk()', + ["n hb"] = 'lua require"gitsigns".blame_line()', -- Text objects - ['o ih'] = ':lua require"gitsigns".select_hunk()', - ['x ih'] = ':lua require"gitsigns".select_hunk()', - } + ["o ih"] = ':lua require"gitsigns".select_hunk()', + ["x ih"] = ':lua require"gitsigns".select_hunk()', + }, } -- Treesitter -require('nvim-treesitter.configs').setup { +require("nvim-treesitter.configs").setup { highlight = { enable = true, }, @@ -136,7 +136,7 @@ require('nvim-treesitter.configs').setup { textobjects = { lsp_interop = { enable = true, - border = 'none', + border = "none", peek_definition_code = { ["df"] = "@function.outer", ["dF"] = "@class.outer", @@ -199,9 +199,8 @@ require('nvim-treesitter.configs').setup { }, } -vim.o.foldmethod = 'expr' -vim.o.foldexpr = 'nvim_treesitter#foldexpr()' - +vim.o.foldmethod = "expr" +vim.o.foldexpr = "nvim_treesitter#foldexpr()" vim.api.nvim_set_hl(0, "TSCurrentScope", { bg = vim.g.current_gruvbox_colors.dark0_soft[1], @@ -217,7 +216,7 @@ vim.api.nvim_set_hl(0, "TSDefinitionUsage", { -- nvim-cmp -local cmp = require("cmp") +local cmp = require "cmp" cmp.setup { snippet = { @@ -225,37 +224,37 @@ cmp.setup { vim.fn["vsnip#anonymous"](args.body) end, }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.confirm({ select = false }), - }), + mapping = cmp.mapping.preset.insert { + [""] = cmp.mapping.confirm { select = false }, + }, sources = cmp.config.sources({ { name = "nvim_lsp" }, { name = "vsnip" }, { name = "latex_symbols" }, { name = "calc" }, }, { - { name = "path" }, - { name = "treesitter" }, + { name = "path" }, + { name = "treesitter" }, }, { - { name = "tmux" }, - { name = "spell" }, - -- Use \k for iskeyword because of UTF-8 - { name = "buffer", option = { keyword_pattern = [[\k\+]], } }, + { name = "tmux" }, + { name = "spell" }, + -- Use \k for iskeyword because of UTF-8 + { name = "buffer", option = { keyword_pattern = [[\k\+]] } }, }), } cmp.setup.cmdline("/", { sources = { - { name = "buffer", option = { keyword_pattern = [[\k\+]], } }, + { name = "buffer", option = { keyword_pattern = [[\k\+]] } }, }, - mapping = cmp.mapping.preset.cmdline({}), + mapping = cmp.mapping.preset.cmdline {}, }) cmp.setup.cmdline(":", { - sources = cmp.config.sources({ - { name = "cmdline" }, - }), - mapping = cmp.mapping.preset.cmdline({}), + sources = cmp.config.sources { + { name = "cmdline" }, + }, + mapping = cmp.mapping.preset.cmdline {}, }) -- Telescope @@ -267,9 +266,9 @@ require("telescope").setup { dir_icon = "D", }, ["ui-select"] = { - require("telescope.themes").get_dropdown {} - } - } + require("telescope.themes").get_dropdown(), + }, + }, } require("telescope").load_extension "file_browser" @@ -294,10 +293,10 @@ require("lualine").setup { }, sections = { lualine_c = { - 'filename', + "filename", { - 'lsp_progress', - display_components = { 'lsp_client_name', { 'title', 'percentage', 'message' } }, + "lsp_progress", + display_components = { "lsp_client_name", { "title", "percentage", "message" } }, }, }, }, @@ -358,29 +357,29 @@ vim.cmd [[highlight link NotifyDEBUGBorder GruvboxPurple]] vim.cmd [[highlight link NotifyDEBUGIcon GruvboxPurple]] vim.cmd [[highlight link NotifyDEBUGTitle GruvboxPurple]] -vim.notify = require("notify") +vim.notify = require "notify" -- Comment -require('Comment').setup {} +require("Comment").setup {} -- Local config function isModuleAvailable(name) - if package.loaded[name] then - return true - else - for _, searcher in ipairs(package.searchers or package.loaders) do - local loader = searcher(name) - if type(loader) == 'function' then - package.preload[name] = loader - return true - end - end - return false - end + if package.loaded[name] then + return true + else + for _, searcher in ipairs(package.searchers or package.loaders) do + local loader = searcher(name) + if type(loader) == "function" then + package.preload[name] = loader + return true + end + end + return false + end end -if isModuleAvailable("local_config") then - require("local_config") +if isModuleAvailable "local_config" then + require "local_config" end diff --git a/stylua.toml b/stylua.toml new file mode 100644 index 0000000..5eb9519 --- /dev/null +++ b/stylua.toml @@ -0,0 +1 @@ +call_parentheses = "None" -- cgit v1.2.3