From fadacf5313ebfa1923c5a1d414a7ebf100ec8073 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Tue, 15 Nov 2022 18:09:25 +0100
Subject: [PATCH] nvim: Format plugins file

---
 nvim/.config/nvim/lua/plugins.lua | 50 +++++++++++++++++--------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index bef6376..3f11bdc 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -2,15 +2,15 @@ local install_path = vim.fn.stdpath("data") .. "/pack/packer/start/packer.nvim"
 
 if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
     vim.cmd("!git clone https://github.com/wbthomason/packer.nvim " ..
-                install_path)
+        install_path)
 end
 
 -- Compile on plugin edits
-vim.api.nvim_create_autocmd({"BufWritePost"}, {
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
     pattern = "plugins.lua",
     command = "PackerCompile",
     desc = "Compile plugins after editing plugin list",
-    group = vim.api.nvim_create_augroup('compilepackages', {clear = true})
+    group = vim.api.nvim_create_augroup('compilepackages', { clear = true })
 })
 
 local use = require("packer").use
@@ -32,7 +32,7 @@ require("packer").startup(function()
     use 'vifm/vifm.vim' -- integrate file manager
     use {
         'lewis6991/gitsigns.nvim', -- show vcs changes on left-hand gutter
-        requires = {'nvim-lua/plenary.nvim'},
+        requires = { 'nvim-lua/plenary.nvim' },
         tag = 'release',
         config = function() require('plug._gitsigns') end,
         event = "BufRead"
@@ -49,7 +49,12 @@ require("packer").startup(function()
     }
 
     -- editing
-    use {'machakann/vim-sandwich', event = "BufRead"} -- surround things with other things using sa/sd/sr
+    -- use {'machakann/vim-sandwich', event = "BufRead"} -- surround things with other things using sa/sd/sr
+    use {
+        'kylechui/nvim-surround',
+        tag = '*',
+        config = function() require('nvim-surround').setup() end
+    } -- surround things with other things using ys/cs/ds
     use {
         'monaqa/dial.nvim', -- extend the ^a / ^x possibilities to dates, hex, alphabets, markdown headers
         event = "BufRead"
@@ -83,18 +88,18 @@ require("packer").startup(function()
     -- statusline
     use {
         'nvim-lualine/lualine.nvim',
-        requires = {'kyazdani42/nvim-web-devicons', opt = true},
+        requires = { 'kyazdani42/nvim-web-devicons', opt = true },
         config = function() require('plug._lualine') end
     }
 
     -- writing
-    use {'vim-pandoc/vim-pandoc-syntax'}
-    use {'vim-pandoc/vim-pandoc'}
-    use {'vim-pandoc/vim-criticmarkup'}
+    use { 'vim-pandoc/vim-pandoc-syntax' }
+    use { 'vim-pandoc/vim-pandoc' }
+    use { 'vim-pandoc/vim-criticmarkup' }
     use {
         "quarto-dev/quarto-vim",
-        requires = {{"vim-pandoc/vim-pandoc-syntax"}},
-        ft = {"quarto"}
+        requires = { { "vim-pandoc/vim-pandoc-syntax" } },
+        ft = { "quarto" }
     }
     use 'micarmst/vim-spellsync' -- personal dict improvements for git sync
     use { -- provide distraction free writing
@@ -104,17 +109,18 @@ require("packer").startup(function()
                 integrations = {
                     gitsigns = true,
                     lualine = true,
-                    tmux = {global = false},
+                    tmux = { global = false },
                     limelight = true
                 }
             })
         end
     }
-    use {'junegunn/limelight.vim', event = 'BufRead'} -- provide even distraction free-er writing (lowlight paragraphs)
+    use { 'junegunn/limelight.vim', event = 'BufRead' } -- provide even distraction free-er writing (lowlight paragraphs)
     use 'alok/notational-fzf-vim' -- quickly search through the wiki
 
     -- languages
-    use {'euclidianAce/BetterLua.vim', ft = 'lua'} -- better syntax highlighting for lua
+    use { 'euclidianAce/BetterLua.vim', ft = 'lua' } -- better syntax highlighting for lua
+    use 'aliou/bats.vim' -- enable syntax for bats shell-code testing library
 
     -- REPL work
     use {
@@ -134,7 +140,7 @@ require("packer").startup(function()
         'hanschen/vim-ipython-cell', -- send code 'cells' to REPL
         ft = "python",
         config = function()
-            vim.g.ipython_cell_highlight_cells_ft = {'python'}
+            vim.g.ipython_cell_highlight_cells_ft = { 'python' }
             vim.g.ipython_cell_insert_tag = "## Cell"
         end
     }
@@ -169,19 +175,19 @@ require("packer").startup(function()
     use {
         "nvim-telescope/telescope.nvim",
         requires = {
-            {"nvim-lua/popup.nvim"}, {"nvim-lua/plenary.nvim"},
-            {"nvim-telescope/telescope-fzf-native.nvim", run = 'make'}
+            { "nvim-lua/popup.nvim" }, { "nvim-lua/plenary.nvim" },
+            { "nvim-telescope/telescope-fzf-native.nvim", run = 'make' }
         },
         config = function() require('plug._telescope') end
     }
     use {
         'protex/better-digraphs.nvim',
-        requires = {{"nvim-telescope/telescope.nvim"}}
+        requires = { { "nvim-telescope/telescope.nvim" } }
     }
 
     -- snippeting
-    use {"hrsh7th/vim-vsnip", event = "InsertEnter"} -- snippet engine
-    use {"rafamadriz/friendly-snippets", event = "InsertEnter"} -- many snippets
+    use { "hrsh7th/vim-vsnip", event = "InsertEnter" } -- snippet engine
+    use { "rafamadriz/friendly-snippets", event = "InsertEnter" } -- many snippets
 
     -- treesitter
     use {
@@ -194,7 +200,7 @@ require("packer").startup(function()
     use {
         'RRethy/nvim-treesitter-textsubjects', -- allows using . and ; to target treesitter branches
         config = function()
-            require'nvim-treesitter.configs'.setup {
+            require 'nvim-treesitter.configs'.setup {
                 textsubjects = {
                     enable = true,
                     keymaps = {
@@ -221,7 +227,7 @@ require("packer").startup(function()
     use 'ray-x/lsp_signature.nvim'
     use {
         'ray-x/navigator.lua',
-        requires = {'ray-x/guihua.lua', run = 'cd lua/fzy && make'},
+        requires = { 'ray-x/guihua.lua', run = 'cd lua/fzy && make' },
         config = function() require('plug._lsp') end
     }
     -- and completion