From 5bec1553f09f078b741ddedd9b5124c94963b2f7 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Thu, 2 Mar 2023 18:28:31 -0600 Subject: [PATCH] style(nvim): format with stylua --- .../config/after/ftplugin/Dockerfile.lua | 4 +- .../after/ftplugin/NeogitCommitMessage.lua | 2 +- .../primary/config/after/ftplugin/azure.lua | 2 +- .../primary/config/after/ftplugin/http.lua | 6 +- .../primary/config/after/ftplugin/norg.lua | 4 +- .../primary/config/after/ftplugin/sql.lua | 8 +- .../primary/config/init.lua | 2 +- .../primary/config/lua/core/disabled.lua | 30 +-- .../primary/config/lua/core/filetypes.lua | 2 +- .../primary/config/lua/core/options.lua | 195 +++++++++--------- .../primary/config/lua/core/winbar.lua | 16 +- .../primary/config/lua/main.lua | 8 +- .../config/lua/plugins/configs/_neorg.lua | 30 +-- .../config/lua/plugins/configs/_stabilize.lua | 16 +- .../config/lua/plugins/configs/dap-ui.lua | 12 +- .../lua/plugins/configs/file-explorer.lua | 6 +- .../config/lua/plugins/configs/hydra.lua | 13 +- .../lua/plugins/configs/indent-blankline.lua | 2 +- .../config/lua/plugins/configs/kanagawa.lua | 2 +- .../config/lua/plugins/configs/lsp.lua | 2 +- .../config/lua/plugins/configs/null_ls.lua | 4 +- .../lua/plugins/configs/nvim-notify.lua | 46 ++--- .../config/lua/plugins/configs/nvim-ufo.lua | 8 +- .../config/lua/plugins/configs/statusline.lua | 8 +- .../lua/plugins/configs/todo-comments.lua | 2 +- .../config/lua/plugins/configs/treesitter.lua | 2 +- .../primary/config/lua/plugins/init.lua | 2 +- .../primary/config/lua/plugins/plugins.lua | 4 +- .../primary/config/lua/plugins/postload.lua | 4 +- 29 files changed, 221 insertions(+), 221 deletions(-) diff --git a/dots/.nvim-environments/primary/config/after/ftplugin/Dockerfile.lua b/dots/.nvim-environments/primary/config/after/ftplugin/Dockerfile.lua index 6fdb05bb..6e23bc18 100644 --- a/dots/.nvim-environments/primary/config/after/ftplugin/Dockerfile.lua +++ b/dots/.nvim-environments/primary/config/after/ftplugin/Dockerfile.lua @@ -1,3 +1,3 @@ -local file_loc = vim.fn.expand('%:p:h') +local file_loc = vim.fn.expand("%:p:h") -vim.opt_local.makeprg = 'docker build ' .. file_loc +vim.opt_local.makeprg = "docker build " .. file_loc diff --git a/dots/.nvim-environments/primary/config/after/ftplugin/NeogitCommitMessage.lua b/dots/.nvim-environments/primary/config/after/ftplugin/NeogitCommitMessage.lua index a0228d66..1a81b99f 100644 --- a/dots/.nvim-environments/primary/config/after/ftplugin/NeogitCommitMessage.lua +++ b/dots/.nvim-environments/primary/config/after/ftplugin/NeogitCommitMessage.lua @@ -1 +1 @@ -vim.opt_local.filetype = 'gitcommit' +vim.opt_local.filetype = "gitcommit" diff --git a/dots/.nvim-environments/primary/config/after/ftplugin/azure.lua b/dots/.nvim-environments/primary/config/after/ftplugin/azure.lua index 3e836b3c..e65791f0 100644 --- a/dots/.nvim-environments/primary/config/after/ftplugin/azure.lua +++ b/dots/.nvim-environments/primary/config/after/ftplugin/azure.lua @@ -1 +1 @@ -vim.opt_local.filetype = 'yaml' +vim.opt_local.filetype = "yaml" diff --git a/dots/.nvim-environments/primary/config/after/ftplugin/http.lua b/dots/.nvim-environments/primary/config/after/ftplugin/http.lua index f55ffa5f..cccb1b04 100644 --- a/dots/.nvim-environments/primary/config/after/ftplugin/http.lua +++ b/dots/.nvim-environments/primary/config/after/ftplugin/http.lua @@ -1,10 +1,10 @@ -vim.keymap.set('n', 'fr', 'RestNvim', { +vim.keymap.set("n", "fr", "RestNvim", { buffer = true, }) -vim.keymap.set('n', 'fp', 'RestNvimPreview', { +vim.keymap.set("n", "fp", "RestNvimPreview", { buffer = true, }) -vim.keymap.set('n', 'fl', 'RestNvimLast', { +vim.keymap.set("n", "fl", "RestNvimLast", { buffer = true, }) diff --git a/dots/.nvim-environments/primary/config/after/ftplugin/norg.lua b/dots/.nvim-environments/primary/config/after/ftplugin/norg.lua index d819cfd9..0a2d9161 100644 --- a/dots/.nvim-environments/primary/config/after/ftplugin/norg.lua +++ b/dots/.nvim-environments/primary/config/after/ftplugin/norg.lua @@ -1,6 +1,6 @@ -vim.keymap.set('n', 'fge', ':Neorg gtd edit', { +vim.keymap.set("n", "fge", ":Neorg gtd edit", { buffer = true, }) -vim.keymap.set('n', 'fgv', ':Neorg gtd views', { +vim.keymap.set("n", "fgv", ":Neorg gtd views", { buffer = true, }) diff --git a/dots/.nvim-environments/primary/config/after/ftplugin/sql.lua b/dots/.nvim-environments/primary/config/after/ftplugin/sql.lua index 4d5a0894..1159aa87 100644 --- a/dots/.nvim-environments/primary/config/after/ftplugin/sql.lua +++ b/dots/.nvim-environments/primary/config/after/ftplugin/sql.lua @@ -1,13 +1,13 @@ -vim.keymap.set('n', 'fe', '(sqls-execute-query)', { +vim.keymap.set("n", "fe", "(sqls-execute-query)", { buffer = true, }) -vim.keymap.set('v', 'fe', '(sqls-execute-query)', { +vim.keymap.set("v", "fe", "(sqls-execute-query)", { buffer = true, }) -vim.keymap.set('n', 'fsd', ':SqlsSwitchDatabase', { +vim.keymap.set("n", "fsd", ":SqlsSwitchDatabase", { buffer = true, }) -vim.keymap.set('n', 'fsc', ':SqlsSwitchConnection', { +vim.keymap.set("n", "fsc", ":SqlsSwitchConnection", { buffer = true, }) diff --git a/dots/.nvim-environments/primary/config/init.lua b/dots/.nvim-environments/primary/config/init.lua index 58a15029..de17c549 100755 --- a/dots/.nvim-environments/primary/config/init.lua +++ b/dots/.nvim-environments/primary/config/init.lua @@ -1 +1 @@ -require('main') +require("main") diff --git a/dots/.nvim-environments/primary/config/lua/core/disabled.lua b/dots/.nvim-environments/primary/config/lua/core/disabled.lua index 22513488..4ccf7208 100755 --- a/dots/.nvim-environments/primary/config/lua/core/disabled.lua +++ b/dots/.nvim-environments/primary/config/lua/core/disabled.lua @@ -1,24 +1,24 @@ local M = {} M.setup = function() local disabled_built_ins = { - 'gzip', - 'zip', - 'zipPlugin', - 'tar', - 'tarPlugin', - 'getscript', - 'getscriptPlugin', - 'vimball', - 'vimballPlugin', - '2html_plugin', - 'logipat', - 'rrhelper', - 'spellfile_plugin', - 'matchit', + "gzip", + "zip", + "zipPlugin", + "tar", + "tarPlugin", + "getscript", + "getscriptPlugin", + "vimball", + "vimballPlugin", + "2html_plugin", + "logipat", + "rrhelper", + "spellfile_plugin", + "matchit", } for _, plugin in pairs(disabled_built_ins) do - vim.g['loaded_' .. plugin] = 1 + vim.g["loaded_" .. plugin] = 1 end end diff --git a/dots/.nvim-environments/primary/config/lua/core/filetypes.lua b/dots/.nvim-environments/primary/config/lua/core/filetypes.lua index fae6e09e..e23e371b 100644 --- a/dots/.nvim-environments/primary/config/lua/core/filetypes.lua +++ b/dots/.nvim-environments/primary/config/lua/core/filetypes.lua @@ -4,7 +4,7 @@ M.setup = function() vim.filetype.add({ pattern = { [".*%.dockerfile"] = "dockerfile", - [".*%.dockerignore"] = "gitignore" + [".*%.dockerignore"] = "gitignore", }, }) end diff --git a/dots/.nvim-environments/primary/config/lua/core/options.lua b/dots/.nvim-environments/primary/config/lua/core/options.lua index 3c6b2d00..5f18f776 100755 --- a/dots/.nvim-environments/primary/config/lua/core/options.lua +++ b/dots/.nvim-environments/primary/config/lua/core/options.lua @@ -3,133 +3,132 @@ local opt = vim.opt local M = {} M.setup = function() - -- Number settings - opt.number = true - opt.numberwidth = 2 - opt.relativenumber = true + -- Number settings + opt.number = true + opt.numberwidth = 2 + opt.relativenumber = true - -- Scroll Offset - opt.scrolloff = 3 + -- Scroll Offset + opt.scrolloff = 3 - -- Disable showmode - opt.showmode = false + -- Disable showmode + opt.showmode = false - -- Set truecolor support - opt.termguicolors = true + -- Set truecolor support + opt.termguicolors = true - -- Enable system clipboard - opt.clipboard = "unnamedplus" + -- Enable system clipboard + opt.clipboard = "unnamedplus" - -- Set mouse support for any mode - opt.mouse = "a" + -- Set mouse support for any mode + opt.mouse = "a" - -- Allow hidden - opt.hidden = true + -- Allow hidden + opt.hidden = true - -- Useful defaults for tab, indentation, etc. - opt.tabstop = 4 - opt.shiftwidth = 4 - opt.smartindent = true - opt.breakindent = true - opt.expandtab = true - opt.smarttab = true - opt.shiftround = true + -- Useful defaults for tab, indentation, etc. + opt.tabstop = 4 + opt.shiftwidth = 4 + opt.smartindent = true + opt.breakindent = true + opt.expandtab = true + opt.smarttab = true + opt.shiftround = true - -- Search settings - opt.hlsearch = true - opt.incsearch = true - opt.ignorecase = true - opt.smartcase = true + -- Search settings + opt.hlsearch = true + opt.incsearch = true + opt.ignorecase = true + opt.smartcase = true - -- Better backspaces - opt.backspace = "indent,eol,start" + -- Better backspaces + opt.backspace = "indent,eol,start" - -- Make new splits vertical - opt.splitright = true + -- Make new splits vertical + opt.splitright = true - -- Show line & column num of cursor - opt.ruler = true + -- Show line & column num of cursor + opt.ruler = true - -- Set timeouts - opt.ttimeoutlen = 20 - opt.timeoutlen = 1000 - opt.updatetime = 250 - opt.signcolumn = "yes" + -- Set timeouts + opt.ttimeoutlen = 20 + opt.timeoutlen = 1000 + opt.updatetime = 250 + opt.signcolumn = "yes" - -- Enable persistent undo - opt.undodir = vim.fn.stdpath("cache") .. "/undo" - opt.undofile = true + -- Enable persistent undo + opt.undodir = vim.fn.stdpath("cache") .. "/undo" + opt.undofile = true - -- Better folding - opt.foldexpr = "nvim_treesitter#foldexpr()" - opt.foldmethod = "expr" - opt.fillchars = { eob = " ", fold = " ", foldopen = "", foldsep = " ", foldclose = "" } - opt.foldlevel = 20 - vim.wo.foldexpr = "nvim_treesitter#foldexpr()" - vim.wo.foldmethod = "expr" + -- Better folding + opt.foldexpr = "nvim_treesitter#foldexpr()" + opt.foldmethod = "expr" + opt.fillchars = { eob = " ", fold = " ", foldopen = "", foldsep = " ", foldclose = "" } + opt.foldlevel = 20 + vim.wo.foldexpr = "nvim_treesitter#foldexpr()" + vim.wo.foldmethod = "expr" - -- Concealment for nicer rendering - opt.conceallevel = 2 - opt.concealcursor = "ic" + -- Concealment for nicer rendering + opt.conceallevel = 2 + opt.concealcursor = "ic" - -- Cursor line highlight - opt.cursorline = true + -- Cursor line highlight + opt.cursorline = true - -- Disable lazy redraw to interact with plugins better - opt.lazyredraw = false + -- Disable lazy redraw to interact with plugins better + opt.lazyredraw = false - -- Spell Settings - opt.spelllang = { "en_us" } + -- Spell Settings + opt.spelllang = { "en_us" } - -- Better completion experience - opt.completeopt = "menuone,noselect" + -- Better completion experience + opt.completeopt = "menuone,noselect" - -- Set max text width - opt.textwidth = 120 + -- Set max text width + opt.textwidth = 120 - -- Make statusline global - opt.laststatus = 3 + -- Make statusline global + opt.laststatus = 3 - -- Set listcharacters - opt.list = true - opt.listchars:append("tab:-->") - opt.listchars:append("lead:⋅") - opt.listchars:append("trail:·") - opt.listchars:append("extends:◣") - opt.listchars:append("precedes:◢") - opt.listchars:append("nbsp:○") + -- Set listcharacters + opt.list = true + opt.listchars:append("tab:-->") + opt.listchars:append("lead:⋅") + opt.listchars:append("trail:·") + opt.listchars:append("extends:◣") + opt.listchars:append("precedes:◢") + opt.listchars:append("nbsp:○") - -- Set fillchars - vim.opt.fillchars:append({ - horiz = "━", - horizup = "┻", - horizdown = "┳", - vert = "┃", - vertleft = "┨", - vertright = "┣", - verthoriz = "╋", - }) + -- Set fillchars + vim.opt.fillchars:append({ + horiz = "━", + horizup = "┻", + horizdown = "┳", + vert = "┃", + vertleft = "┨", + vertright = "┣", + verthoriz = "╋", + }) - -- Remove end of boundry '~' - opt.fillchars:append("eob: ") + -- Remove end of boundry '~' + opt.fillchars:append("eob: ") - -- Allow vim to get settings from file - opt.modeline = true - opt.modelines = 5 + -- Allow vim to get settings from file + opt.modeline = true + opt.modelines = 5 - -- Set command bar height - opt.cmdheight = 1 + -- Set command bar height + opt.cmdheight = 1 - -- Set splitkeep - vim.opt.splitkeep = "screen" + -- Set splitkeep + vim.opt.splitkeep = "screen" - -- Hide the tabline - vim.opt.showtabline = 0 - - -- Improved diff - opt.diffopt:append("linematch:75") - opt.fillchars:append("diff:╱") + -- Hide the tabline + vim.opt.showtabline = 0 + -- Improved diff + opt.diffopt:append("linematch:75") + opt.fillchars:append("diff:╱") end return M diff --git a/dots/.nvim-environments/primary/config/lua/core/winbar.lua b/dots/.nvim-environments/primary/config/lua/core/winbar.lua index 19c2fbb8..e54e55e4 100644 --- a/dots/.nvim-environments/primary/config/lua/core/winbar.lua +++ b/dots/.nvim-environments/primary/config/lua/core/winbar.lua @@ -1,22 +1,22 @@ local M = {} M.winbar = function() - local win_number = '[' .. vim.api.nvim_win_get_number(0) .. ']' + local win_number = "[" .. vim.api.nvim_win_get_number(0) .. "]" local ignore_fts = { - 'neo-tree', - 'dashboard', - 'alpha', + "neo-tree", + "dashboard", + "alpha", } for _, ft in ipairs(ignore_fts) do if ft == vim.bo.filetype then - return win_number .. ' ' .. ft + return win_number .. " " .. ft end end - local relative_path = vim.fn.fnamemodify(vim.fn.expand('%:h'), ':p:~:.') - local filename = vim.fn.expand('%:t') - return win_number .. '  ' .. relative_path .. filename + local relative_path = vim.fn.fnamemodify(vim.fn.expand("%:h"), ":p:~:.") + local filename = vim.fn.expand("%:t") + return win_number .. "  " .. relative_path .. filename end M.setup = function() diff --git a/dots/.nvim-environments/primary/config/lua/main.lua b/dots/.nvim-environments/primary/config/lua/main.lua index 9889ad35..ca1496a9 100755 --- a/dots/.nvim-environments/primary/config/lua/main.lua +++ b/dots/.nvim-environments/primary/config/lua/main.lua @@ -4,13 +4,13 @@ -- INFO: SHOULD have a init.lua file associated with them. -- INFO: init.lua is responsible for loading all configuration -- INFO: related to that directory. -require('core.init') -require('plugins.init') +require("core.init") +require("plugins.init") -- INFO: Post load, for things that need to setup keybindings etc after the fact -- -- NOTE: All postload modules should be independent of each other, they shouldn't -- NOTE: rely on each other's load order. That type of logic should be shifted -- NOTE: into non-postload regions then handled in postload modules. -require('plugins.postload') -require('core.postload') +require("plugins.postload") +require("core.postload") diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/_neorg.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/_neorg.lua index e47a5e5a..b772fb1d 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/_neorg.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/_neorg.lua @@ -1,39 +1,39 @@ -local neorg = require('neorg') +local neorg = require("neorg") neorg.setup({ load = { - ['core.defaults'] = {}, - ['core.norg.concealer'] = {}, - ['core.norg.esupports.metagen'] = { + ["core.defaults"] = {}, + ["core.norg.concealer"] = {}, + ["core.norg.esupports.metagen"] = { config = { - type = 'auto', + type = "auto", }, }, - ['core.integrations.nvim-cmp'] = { + ["core.integrations.nvim-cmp"] = { config = {}, }, - ['core.norg.completion'] = { + ["core.norg.completion"] = { config = { - engine = 'nvim-cmp', + engine = "nvim-cmp", }, }, - ['core.keybinds'] = { + ["core.keybinds"] = { config = { default_keybinds = true, -- norg_leader = "-" }, }, - ['core.norg.dirman'] = { + ["core.norg.dirman"] = { config = { workspaces = { - default = '~/.notes', -- Format: = + default = "~/.notes", -- Format: = }, autochdir = true, -- Automatically change the directory to the current workspace's root every time - index = 'index.norg', -- The name of the main (root) .norg file - last_workspace = vim.fn.stdpath('cache') .. '/neorg_last_workspace.txt', -- The location to write and read the workspace cache file + index = "index.norg", -- The name of the main (root) .norg file + last_workspace = vim.fn.stdpath("cache") .. "/neorg_last_workspace.txt", -- The location to write and read the workspace cache file }, }, - ['core.integrations.telescope'] = {}, - ['core.norg.qol.toc'] = {}, + ["core.integrations.telescope"] = {}, + ["core.norg.qol.toc"] = {}, }, }) diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/_stabilize.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/_stabilize.lua index c3c6b362..73b6616a 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/_stabilize.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/_stabilize.lua @@ -1,18 +1,18 @@ -require('stabilize').setup({ +require("stabilize").setup({ -- stabilize window even when current cursor position will be hidden behind new window force = true, -- set context mark to register on force event which can be jumped to with ' forcemark = nil, -- do not manage windows matching these file/buftypes ignore = { - filetype = { 'packer', 'Dashboard', 'Trouble', 'TelescopePrompt' }, + filetype = { "packer", "Dashboard", "Trouble", "TelescopePrompt" }, buftype = { - 'packer', - 'Dashboard', - 'terminal', - 'quickfix', - 'loclist', - 'LspInstall', + "packer", + "Dashboard", + "terminal", + "quickfix", + "loclist", + "LspInstall", }, }, -- comma-separated list of autocmds that wil trigger the plugins window restore function diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/dap-ui.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/dap-ui.lua index 5c0df7e9..9c3d0079 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/dap-ui.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/dap-ui.lua @@ -1,9 +1,9 @@ local fn = vim.fn -require('dapui').setup({}) +require("dapui").setup({}) -fn.sign_define('DapBreakpoint', { text = '● ', texthl = 'DiagnosticSignError', linehl = '', numhl = '' }) -fn.sign_define('DapBreakpointCondition', { text = '● ', texthl = 'DiagnosticSignWarn', linehl = '', numhl = '' }) -fn.sign_define('DapLogPoint', { text = '● ', texthl = 'DiagnosticSignInfo', linehl = '', numhl = '' }) -fn.sign_define('DapStopped', { text = '→ ', texthl = 'DiagnosticSignWarn', linehl = '', numhl = '' }) -fn.sign_define('DapBreakpointReject', { text = '●', texthl = 'DiagnosticSignHint', linehl = '', numhl = '' }) +fn.sign_define("DapBreakpoint", { text = "● ", texthl = "DiagnosticSignError", linehl = "", numhl = "" }) +fn.sign_define("DapBreakpointCondition", { text = "● ", texthl = "DiagnosticSignWarn", linehl = "", numhl = "" }) +fn.sign_define("DapLogPoint", { text = "● ", texthl = "DiagnosticSignInfo", linehl = "", numhl = "" }) +fn.sign_define("DapStopped", { text = "→ ", texthl = "DiagnosticSignWarn", linehl = "", numhl = "" }) +fn.sign_define("DapBreakpointReject", { text = "●", texthl = "DiagnosticSignHint", linehl = "", numhl = "" }) diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/file-explorer.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/file-explorer.lua index 5612f381..df1c16d3 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/file-explorer.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/file-explorer.lua @@ -1,4 +1,4 @@ -local nvim_tree = require('nvim-tree.configs') +local nvim_tree = require("nvim-tree.configs") nvim_tree.setup({ highlight = { @@ -6,8 +6,8 @@ nvim_tree.setup({ additional_vim_regex_highlighting = true, disable = { -- Ansible support reasons - 'ansible.yaml', - 'yaml.ansible' + "ansible.yaml", + "yaml.ansible", }, }, matchup = { diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/hydra.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/hydra.lua index 09042c1f..7be1b521 100644 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/hydra.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/hydra.lua @@ -1,14 +1,13 @@ local hydra = require("hydra") local wk = require("which-key") -wk.register( - { h = { +wk.register({ + h = { name = "Hydra", o = { "Options" }, g = { "Git Signs" }, d = { "Diagram" }, - } }, - { prefix = "" } -) + }, +}, { prefix = "" }) -- Side Scroll hydra({ @@ -135,7 +134,7 @@ hydra({ ^ ^ _K_ ^ ^ _f_: surround it with box _H_ ^ ^ _L_ ^ ^ _J_ ^ ^ __ -]] , +]], config = { color = "pink", invoke_on_body = true, @@ -174,7 +173,7 @@ hydra({ _r_ %{rnu} relative number ^ ^^^^ __ -]] , +]], config = { color = "amaranth", invoke_on_body = true, diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/indent-blankline.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/indent-blankline.lua index 5b4d562b..b9a0ca62 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/indent-blankline.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/indent-blankline.lua @@ -16,7 +16,7 @@ g.indent_blankline_filetype_exclude = { "man", "OverseerForm", "noice", - "lazy" + "lazy", } g.indent_blankline_buftype_exclude = { "terminal" } diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua index 0fa6f803..7c5426be 100644 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua @@ -120,7 +120,7 @@ require("kanagawa").setup({ NoiceCmdlinePopupdBorderIncRename = { fg = colors.peachRed }, Folded = { bg = colors.waveBlue1 }, - UfoFoldedBg = { bg = "NONE" } + UfoFoldedBg = { bg = "NONE" }, }, }) diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua index a51ecd64..4ac17854 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua @@ -348,7 +348,7 @@ vim.api.nvim_create_autocmd("FileType", { cmd = { lsp_server_bin_dir .. "nginx-language-server" }, root_dir = vim.fn.getcwd(), capabilities = lsp_capabilities, - on_attach = on_attach + on_attach = on_attach, }) if client_id then diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/null_ls.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/null_ls.lua index 04c9c406..95d0adda 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/null_ls.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/null_ls.lua @@ -1,9 +1,9 @@ -local null_ls = require('null-ls') +local null_ls = require("null-ls") null_ls.setup({ sources = { null_ls.builtins.formatting.shfmt.with({ - extra_args = { '-i 4' }, + extra_args = { "-i 4" }, }), null_ls.builtins.diagnostics.shellcheck, null_ls.builtins.code_actions.shellcheck, diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-notify.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-notify.lua index 1fa42f8c..50740285 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-notify.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-notify.lua @@ -1,34 +1,34 @@ require("notify").setup({ - -- Animation style (see below for details) - stages = "fade_in_slide_out", + -- Animation style (see below for details) + stages = "fade_in_slide_out", - -- Function called when a new window is opened, use for changing win settings/config - on_open = nil, + -- Function called when a new window is opened, use for changing win settings/config + on_open = nil, - -- Function called when a window is closed - on_close = nil, + -- Function called when a window is closed + on_close = nil, - -- Render function for notifications. See notify-render() - render = "default", + -- Render function for notifications. See notify-render() + render = "default", - -- Default timeout for notifications - timeout = 5000, + -- Default timeout for notifications + timeout = 5000, - -- For stages that change opacity this is treated as the highlight behind the window - -- Set this to either a highlight group, an RGB hex value e.g. "#000000" or a function returning an RGB code for dynamic values - background_colour = "#000000", + -- For stages that change opacity this is treated as the highlight behind the window + -- Set this to either a highlight group, an RGB hex value e.g. "#000000" or a function returning an RGB code for dynamic values + background_colour = "#000000", - -- Minimum width for notification windows - minimum_width = 50, + -- Minimum width for notification windows + minimum_width = 50, - -- Icons for the different levels - icons = { - ERROR = "", - WARN = "", - INFO = "", - DEBUG = "", - TRACE = "✎", - }, + -- Icons for the different levels + icons = { + ERROR = "", + WARN = "", + INFO = "", + DEBUG = "", + TRACE = "✎", + }, }) -- vim.notify = require('notify') diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-ufo.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-ufo.lua index 249626c7..fb12e7fd 100644 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-ufo.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-ufo.lua @@ -22,7 +22,7 @@ local handler = function(virtText, lnum, endLnum, width, truncate) else chunkText = truncate(chunkText, targetWidth - curWidth) local hlGroup = chunk[2] - table.insert(newVirtText, {chunkText, hlGroup}) + table.insert(newVirtText, { chunkText, hlGroup }) chunkWidth = vim.fn.strdisplaywidth(chunkText) -- str width returned from truncate() may less than 2nd argument, need padding if curWidth + chunkWidth < targetWidth then @@ -32,13 +32,13 @@ local handler = function(virtText, lnum, endLnum, width, truncate) end curWidth = curWidth + chunkWidth end - table.insert(newVirtText, {suffix, "@conditional"}) + table.insert(newVirtText, { suffix, "@conditional" }) return newVirtText end require("ufo").setup({ provider_selector = function(bufnr, filetype, buftype) - return {"treesitter", "indent"} + return { "treesitter", "indent" } end, - fold_virt_text_handler = handler + fold_virt_text_handler = handler, }) diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua index dd1854ae..708ff98a 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua @@ -105,7 +105,7 @@ lualine.setup({ { "macro-recording", color = { - fg = "#FF9E3B" + fg = "#FF9E3B", }, fmt = show_macro_recording, }, @@ -164,7 +164,7 @@ lualine.setup({ { "macro-recording", color = { - fg = "#FF9E3B" + fg = "#FF9E3B", }, fmt = show_macro_recording, }, @@ -201,8 +201,8 @@ lualine.setup({ fmt = datetime_section, color = "LuaLineDateTime", separator = { - right = '%#lualine_transitional_lualine_b_normal_to_lualine_c_normal#' - } + right = "%#lualine_transitional_lualine_b_normal_to_lualine_c_normal#", + }, }, }, lualine_y = { diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/todo-comments.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/todo-comments.lua index 5fbe08e7..ae7ceee1 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/todo-comments.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/todo-comments.lua @@ -1 +1 @@ -require('todo-comments').setup({}) +require("todo-comments").setup({}) diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/treesitter.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/treesitter.lua index cb626db9..de8b1aa1 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/treesitter.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/treesitter.lua @@ -20,5 +20,5 @@ nvim_treesitter.setup({ }, }) -require('treesitter-context').setup({}) +require("treesitter-context").setup({}) vim.cmd.TSContextEnable() diff --git a/dots/.nvim-environments/primary/config/lua/plugins/init.lua b/dots/.nvim-environments/primary/config/lua/plugins/init.lua index 9f972c84..c5b3dcea 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/init.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/init.lua @@ -1 +1 @@ -require('plugins.plugins') +require("plugins.plugins") diff --git a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua index 03676b78..cc637103 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua @@ -103,8 +103,10 @@ lazy.setup({ }, { + "chrisgrieser/nvim-various-textobjs", + config = function() require("various-textobjs").setup({ - useDefaultKeymaps = true + useDefaultKeymaps = true, }) end, }, diff --git a/dots/.nvim-environments/primary/config/lua/plugins/postload.lua b/dots/.nvim-environments/primary/config/lua/plugins/postload.lua index 4d07de74..99339a1c 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/postload.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/postload.lua @@ -1,4 +1,4 @@ -- Anything that needs to be loaded LAST -- needs to required here -require('plugins.mappings') -require('plugins.autocmds') +require("plugins.mappings") +require("plugins.autocmds")