diff options
author | Minijackson <minijackson@riseup.net> | 2022-04-29 18:02:46 +0200 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2022-04-29 18:02:46 +0200 |
commit | 923f70d26b100cc67323d4507b63dbfd10678d51 (patch) | |
tree | 4e41679290bcfddb8b6e1c313e9bb2fa251e9baf | |
parent | d29e1cee64ccfaed28c94ad05e5471eea3e0bd71 (diff) | |
download | nixos-config-reborn-923f70d26b100cc67323d4507b63dbfd10678d51.tar.gz nixos-config-reborn-923f70d26b100cc67323d4507b63dbfd10678d51.zip |
vim{,-dev}.lua: format with stylua
-rw-r--r-- | dotfiles/vim-dev.lua | 56 | ||||
-rw-r--r-- | dotfiles/vim.lua | 109 | ||||
-rw-r--r-- | stylua.toml | 1 |
3 files changed, 84 insertions, 82 deletions
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 @@ | |||
1 | local lspconfig = require("lspconfig") | 1 | local lspconfig = require "lspconfig" |
2 | 2 | ||
3 | local function on_attach(client, bufnr) | 3 | local function on_attach(client, bufnr) |
4 | local opts = { noremap = true, silent = true, buffer = bufnr } | 4 | local opts = { noremap = true, silent = true, buffer = bufnr } |
5 | 5 | ||
6 | local telescope_builtin = require("telescope.builtin") | 6 | local telescope_builtin = require "telescope.builtin" |
7 | 7 | ||
8 | local cursor_theme = require("telescope.themes").get_cursor() | 8 | local cursor_theme = require("telescope.themes").get_cursor() |
9 | 9 | ||
10 | local function cursor(callback) | 10 | local function cursor(callback) |
11 | return function() callback(cursor_theme) end | 11 | return function() |
12 | callback(cursor_theme) | ||
13 | end | ||
12 | end | 14 | end |
13 | 15 | ||
14 | local function desc(tbl1, description) | 16 | local function desc(tbl1, description) |
15 | return vim.tbl_extend("force", tbl1, { desc = description }) | 17 | return vim.tbl_extend("force", tbl1, { desc = description }) |
16 | end | 18 | end |
17 | 19 | ||
18 | vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, desc(opts, "LSP declaration")) | 20 | vim.keymap.set("n", "gD", vim.lsp.buf.declaration, desc(opts, "LSP declaration")) |
19 | vim.keymap.set('n', 'gd', telescope_builtin.lsp_definitions, desc(opts, "LSP Definitions")) | 21 | vim.keymap.set("n", "gd", telescope_builtin.lsp_definitions, desc(opts, "LSP Definitions")) |
20 | vim.keymap.set('n', 'K', vim.lsp.buf.hover, desc(opts, "LSP Hover")) | 22 | vim.keymap.set("n", "K", vim.lsp.buf.hover, desc(opts, "LSP Hover")) |
21 | 23 | ||
22 | vim.keymap.set('n', 'gr', telescope_builtin.lsp_references, desc(opts, "LSP References")) | 24 | vim.keymap.set("n", "gr", telescope_builtin.lsp_references, desc(opts, "LSP References")) |
23 | 25 | ||
24 | vim.keymap.set('n', '<leader>sa', cursor(telescope_builtin.lsp_code_actions), desc(opts, "LSP Code Actions")) | 26 | vim.keymap.set("n", "<leader>sa", cursor(telescope_builtin.lsp_code_actions), desc(opts, "LSP Code Actions")) |
25 | vim.keymap.set('n', '<leader>se', vim.diagnostic.open_float, desc(opts, "Local Diagnostics")) | 27 | vim.keymap.set("n", "<leader>se", vim.diagnostic.open_float, desc(opts, "Local Diagnostics")) |
26 | vim.keymap.set('n', '<leader>sE', telescope_builtin.diagnostics, desc(opts, "Global Diagnostics")) | 28 | vim.keymap.set("n", "<leader>sE", telescope_builtin.diagnostics, desc(opts, "Global Diagnostics")) |
27 | vim.keymap.set('n', '<leader>sl', vim.diagnostic.setloclist, desc(opts, "Diagnostics set LocList")) | 29 | vim.keymap.set("n", "<leader>sl", vim.diagnostic.setloclist, desc(opts, "Diagnostics set LocList")) |
28 | vim.keymap.set('n', '<leader>sq', vim.diagnostic.setqflist, desc(opts, "Diagnostics set QFList")) | 30 | vim.keymap.set("n", "<leader>sq", vim.diagnostic.setqflist, desc(opts, "Diagnostics set QFList")) |
29 | vim.keymap.set('n', '<leader>sr', vim.lsp.buf.rename, desc(opts, "LSP Rename")) | 31 | vim.keymap.set("n", "<leader>sr", vim.lsp.buf.rename, desc(opts, "LSP Rename")) |
30 | vim.keymap.set('n', '<leader>ss', telescope_builtin.lsp_document_symbols, desc(opts, "LSP Document Symbols")) | 32 | vim.keymap.set("n", "<leader>ss", telescope_builtin.lsp_document_symbols, desc(opts, "LSP Document Symbols")) |
31 | vim.keymap.set('n', '<leader>sS', telescope_builtin.lsp_workspace_symbols, desc(opts, "LSP Workspace Symbols")) | 33 | vim.keymap.set("n", "<leader>sS", telescope_builtin.lsp_workspace_symbols, desc(opts, "LSP Workspace Symbols")) |
32 | 34 | ||
33 | vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, desc(opts, "Goto Next Diagnostic")) | 35 | vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, desc(opts, "Goto Next Diagnostic")) |
34 | vim.keymap.set('n', ']d', vim.diagnostic.goto_next, desc(opts, "Goto Prev Diagnostic")) | 36 | vim.keymap.set("n", "]d", vim.diagnostic.goto_next, desc(opts, "Goto Prev Diagnostic")) |
35 | 37 | ||
36 | -- Capability specific | 38 | -- Capability specific |
37 | 39 | ||
@@ -45,21 +47,21 @@ local function on_attach(client, bufnr) | |||
45 | -- Rust specific | 47 | -- Rust specific |
46 | vim.keymap.set("n", "<leader>sh", "<cmd>RustToggleInlayHints<CR>", opts) | 48 | vim.keymap.set("n", "<leader>sh", "<cmd>RustToggleInlayHints<CR>", opts) |
47 | 49 | ||
48 | require("lsp_signature").on_attach({ | 50 | require("lsp_signature").on_attach { |
49 | hint_prefix = "param: " | 51 | hint_prefix = "param: ", |
50 | }) | 52 | } |
51 | end | 53 | end |
52 | 54 | ||
53 | local capabilities = vim.lsp.protocol.make_client_capabilities() | 55 | local capabilities = vim.lsp.protocol.make_client_capabilities() |
54 | capabilities.textDocument.completion.completionItem.snippetSupport = true | 56 | capabilities.textDocument.completion.completionItem.snippetSupport = true |
55 | capabilities.textDocument.completion.completionItem.resolveSupport = { | 57 | capabilities.textDocument.completion.completionItem.resolveSupport = { |
56 | properties = { | 58 | properties = { |
57 | 'documentation', | 59 | "documentation", |
58 | 'detail', | 60 | "detail", |
59 | 'additionalTextEdits', | 61 | "additionalTextEdits", |
60 | } | 62 | }, |
61 | } | 63 | } |
62 | capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) | 64 | capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) |
63 | 65 | ||
64 | require("rust-tools").setup { | 66 | require("rust-tools").setup { |
65 | server = { | 67 | server = { |
@@ -75,7 +77,7 @@ require("rust-tools").setup { | |||
75 | }, | 77 | }, |
76 | }, | 78 | }, |
77 | on_attach = on_attach, | 79 | on_attach = on_attach, |
78 | } | 80 | }, |
79 | } | 81 | } |
80 | 82 | ||
81 | require("nlua.lsp.nvim").setup(lspconfig, { | 83 | 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 <C-R>=(&formatoptions =~ "a") ? 'formatoptions-=a' : 'for | |||
85 | 85 | ||
86 | -- Gitsigns | 86 | -- Gitsigns |
87 | 87 | ||
88 | require('gitsigns').setup { | 88 | require("gitsigns").setup { |
89 | keymaps = { | 89 | keymaps = { |
90 | noremap = true, | 90 | noremap = true, |
91 | buffer = true, | 91 | buffer = true, |
92 | silent = true, | 92 | silent = true, |
93 | 93 | ||
94 | ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'"}, | 94 | ["n ]c"] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'" }, |
95 | ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns\".prev_hunk()<CR>'"}, | 95 | ["n [c"] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns\".prev_hunk()<CR>'" }, |
96 | 96 | ||
97 | ['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>', | 97 | ["n <leader>hs"] = '<cmd>lua require"gitsigns".stage_hunk()<CR>', |
98 | ['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>', | 98 | ["n <leader>hu"] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>', |
99 | ['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>', | 99 | ["n <leader>hr"] = '<cmd>lua require"gitsigns".reset_hunk()<CR>', |
100 | ['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>', | 100 | ["n <leader>hR"] = '<cmd>lua require"gitsigns".reset_buffer()<CR>', |
101 | ['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>', | 101 | ["n <leader>hp"] = '<cmd>lua require"gitsigns".preview_hunk()<CR>', |
102 | ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line()<CR>', | 102 | ["n <leader>hb"] = '<cmd>lua require"gitsigns".blame_line()<CR>', |
103 | 103 | ||
104 | -- Text objects | 104 | -- Text objects |
105 | ['o ih'] = ':<C-U>lua require"gitsigns".select_hunk()<CR>', | 105 | ["o ih"] = ':<C-U>lua require"gitsigns".select_hunk()<CR>', |
106 | ['x ih'] = ':<C-U>lua require"gitsigns".select_hunk()<CR>', | 106 | ["x ih"] = ':<C-U>lua require"gitsigns".select_hunk()<CR>', |
107 | } | 107 | }, |
108 | } | 108 | } |
109 | 109 | ||
110 | -- Treesitter | 110 | -- Treesitter |
111 | 111 | ||
112 | require('nvim-treesitter.configs').setup { | 112 | require("nvim-treesitter.configs").setup { |
113 | highlight = { | 113 | highlight = { |
114 | enable = true, | 114 | enable = true, |
115 | }, | 115 | }, |
@@ -136,7 +136,7 @@ require('nvim-treesitter.configs').setup { | |||
136 | textobjects = { | 136 | textobjects = { |
137 | lsp_interop = { | 137 | lsp_interop = { |
138 | enable = true, | 138 | enable = true, |
139 | border = 'none', | 139 | border = "none", |
140 | peek_definition_code = { | 140 | peek_definition_code = { |
141 | ["<leader>df"] = "@function.outer", | 141 | ["<leader>df"] = "@function.outer", |
142 | ["<leader>dF"] = "@class.outer", | 142 | ["<leader>dF"] = "@class.outer", |
@@ -199,9 +199,8 @@ require('nvim-treesitter.configs').setup { | |||
199 | }, | 199 | }, |
200 | } | 200 | } |
201 | 201 | ||
202 | vim.o.foldmethod = 'expr' | 202 | vim.o.foldmethod = "expr" |
203 | vim.o.foldexpr = 'nvim_treesitter#foldexpr()' | 203 | vim.o.foldexpr = "nvim_treesitter#foldexpr()" |
204 | |||
205 | 204 | ||
206 | vim.api.nvim_set_hl(0, "TSCurrentScope", { | 205 | vim.api.nvim_set_hl(0, "TSCurrentScope", { |
207 | bg = vim.g.current_gruvbox_colors.dark0_soft[1], | 206 | bg = vim.g.current_gruvbox_colors.dark0_soft[1], |
@@ -217,7 +216,7 @@ vim.api.nvim_set_hl(0, "TSDefinitionUsage", { | |||
217 | 216 | ||
218 | -- nvim-cmp | 217 | -- nvim-cmp |
219 | 218 | ||
220 | local cmp = require("cmp") | 219 | local cmp = require "cmp" |
221 | 220 | ||
222 | cmp.setup { | 221 | cmp.setup { |
223 | snippet = { | 222 | snippet = { |
@@ -225,37 +224,37 @@ cmp.setup { | |||
225 | vim.fn["vsnip#anonymous"](args.body) | 224 | vim.fn["vsnip#anonymous"](args.body) |
226 | end, | 225 | end, |
227 | }, | 226 | }, |
228 | mapping = cmp.mapping.preset.insert({ | 227 | mapping = cmp.mapping.preset.insert { |
229 | ['<CR>'] = cmp.mapping.confirm({ select = false }), | 228 | ["<CR>"] = cmp.mapping.confirm { select = false }, |
230 | }), | 229 | }, |
231 | sources = cmp.config.sources({ | 230 | sources = cmp.config.sources({ |
232 | { name = "nvim_lsp" }, | 231 | { name = "nvim_lsp" }, |
233 | { name = "vsnip" }, | 232 | { name = "vsnip" }, |
234 | { name = "latex_symbols" }, | 233 | { name = "latex_symbols" }, |
235 | { name = "calc" }, | 234 | { name = "calc" }, |
236 | }, { | 235 | }, { |
237 | { name = "path" }, | 236 | { name = "path" }, |
238 | { name = "treesitter" }, | 237 | { name = "treesitter" }, |
239 | }, { | 238 | }, { |
240 | { name = "tmux" }, | 239 | { name = "tmux" }, |
241 | { name = "spell" }, | 240 | { name = "spell" }, |
242 | -- Use \k for iskeyword because of UTF-8 | 241 | -- Use \k for iskeyword because of UTF-8 |
243 | { name = "buffer", option = { keyword_pattern = [[\k\+]], } }, | 242 | { name = "buffer", option = { keyword_pattern = [[\k\+]] } }, |
244 | }), | 243 | }), |
245 | } | 244 | } |
246 | 245 | ||
247 | cmp.setup.cmdline("/", { | 246 | cmp.setup.cmdline("/", { |
248 | sources = { | 247 | sources = { |
249 | { name = "buffer", option = { keyword_pattern = [[\k\+]], } }, | 248 | { name = "buffer", option = { keyword_pattern = [[\k\+]] } }, |
250 | }, | 249 | }, |
251 | mapping = cmp.mapping.preset.cmdline({}), | 250 | mapping = cmp.mapping.preset.cmdline {}, |
252 | }) | 251 | }) |
253 | 252 | ||
254 | cmp.setup.cmdline(":", { | 253 | cmp.setup.cmdline(":", { |
255 | sources = cmp.config.sources({ | 254 | sources = cmp.config.sources { |
256 | { name = "cmdline" }, | 255 | { name = "cmdline" }, |
257 | }), | 256 | }, |
258 | mapping = cmp.mapping.preset.cmdline({}), | 257 | mapping = cmp.mapping.preset.cmdline {}, |
259 | }) | 258 | }) |
260 | 259 | ||
261 | -- Telescope | 260 | -- Telescope |
@@ -267,9 +266,9 @@ require("telescope").setup { | |||
267 | dir_icon = "D", | 266 | dir_icon = "D", |
268 | }, | 267 | }, |
269 | ["ui-select"] = { | 268 | ["ui-select"] = { |
270 | require("telescope.themes").get_dropdown {} | 269 | require("telescope.themes").get_dropdown(), |
271 | } | 270 | }, |
272 | } | 271 | }, |
273 | } | 272 | } |
274 | 273 | ||
275 | require("telescope").load_extension "file_browser" | 274 | require("telescope").load_extension "file_browser" |
@@ -294,10 +293,10 @@ require("lualine").setup { | |||
294 | }, | 293 | }, |
295 | sections = { | 294 | sections = { |
296 | lualine_c = { | 295 | lualine_c = { |
297 | 'filename', | 296 | "filename", |
298 | { | 297 | { |
299 | 'lsp_progress', | 298 | "lsp_progress", |
300 | display_components = { 'lsp_client_name', { 'title', 'percentage', 'message' } }, | 299 | display_components = { "lsp_client_name", { "title", "percentage", "message" } }, |
301 | }, | 300 | }, |
302 | }, | 301 | }, |
303 | }, | 302 | }, |
@@ -358,29 +357,29 @@ vim.cmd [[highlight link NotifyDEBUGBorder GruvboxPurple]] | |||
358 | vim.cmd [[highlight link NotifyDEBUGIcon GruvboxPurple]] | 357 | vim.cmd [[highlight link NotifyDEBUGIcon GruvboxPurple]] |
359 | vim.cmd [[highlight link NotifyDEBUGTitle GruvboxPurple]] | 358 | vim.cmd [[highlight link NotifyDEBUGTitle GruvboxPurple]] |
360 | 359 | ||
361 | vim.notify = require("notify") | 360 | vim.notify = require "notify" |
362 | 361 | ||
363 | -- Comment | 362 | -- Comment |
364 | 363 | ||
365 | require('Comment').setup {} | 364 | require("Comment").setup {} |
366 | 365 | ||
367 | -- Local config | 366 | -- Local config |
368 | 367 | ||
369 | function isModuleAvailable(name) | 368 | function isModuleAvailable(name) |
370 | if package.loaded[name] then | 369 | if package.loaded[name] then |
371 | return true | 370 | return true |
372 | else | 371 | else |
373 | for _, searcher in ipairs(package.searchers or package.loaders) do | 372 | for _, searcher in ipairs(package.searchers or package.loaders) do |
374 | local loader = searcher(name) | 373 | local loader = searcher(name) |
375 | if type(loader) == 'function' then | 374 | if type(loader) == "function" then |
376 | package.preload[name] = loader | 375 | package.preload[name] = loader |
377 | return true | 376 | return true |
378 | end | 377 | end |
379 | end | 378 | end |
380 | return false | 379 | return false |
381 | end | 380 | end |
382 | end | 381 | end |
383 | 382 | ||
384 | if isModuleAvailable("local_config") then | 383 | if isModuleAvailable "local_config" then |
385 | require("local_config") | 384 | require "local_config" |
386 | end | 385 | 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" | |||