Merge commit '7de320718f2b5ee487de4b9fe04661a55674cf37'

1 files changed, 92 insertions, 93 deletions

diff --git a/.config/nvim/lua/user/opts.lua b/.config/nvim/lua/user/opts.lua
index aa4d0c2..6375350 100644
--- a/.config/nvim/lua/user/opts.lua
+++ b/.config/nvim/lua/user/opts.lua
@@ -1,5 +1,4 @@
 --[[ opts.lua ]]
-
 -- " Load indent files, to automatically do language-dependent indenting.
 --vim.cmd([[
 --    "filetype plugin indent on
@@ -36,12 +35,12 @@ vim.cmd [[
 --vim.opt.shell = "zsh" --
 vim.o.updatetime = 250
 vim.o.shell = "/bin/zsh"
-vim.scriptencoding = "utf-8" --
-vim.opt.encoding = "utf-8" --
-vim.opt.fileencoding = "utf-8" --
+vim.scriptencoding = "utf-8"                 --
+vim.opt.encoding = "utf-8"                   --
+vim.opt.fileencoding = "utf-8"               --
 vim.g.python3_host_prog = "/usr/bin/python3" --
-vim.g.loaded_python3_provider = 1 --
-vim.g.sh_noisk = 1 -- iskeyword word boundaries when editing a 'sh' file
+vim.g.loaded_python3_provider = 1            --
+vim.g.sh_noisk = 1                           -- iskeyword word boundaries when editing a 'sh' file
 vim.o.autochdir = true
 --vim.o.writeany= true
 
@@ -49,62 +48,62 @@ vim.o.autochdir = true
 vim.opt.termguicolors = true
 
 -- Behaviour
-vim.opt.clipboard:append({ "unnamedplus" }) -- Install xclip or this will slowdown startup
+vim.opt.clipboard:append({ "unnamedplus" })      -- Install xclip or this will slowdown startup
 vim.opt.backspace = { "start", "eol", "indent" } -- Make backspace work as you would expect.
-vim.opt.hidden = true -- Switch between buffers without having to save first.
-vim.opt.splitbelow = true -- make split put the new buffer below the current buffer
-vim.opt.splitright = true -- make vsplit put the new buffer on the right of the current buffer
-vim.opt.scrolloff = 8 --
-vim.opt.sidescrolloff = 8 -- how many lines to scroll when using the scrollbar
-vim.opt.autoread = true -- reload files if changed externally
-vim.opt.display = "lastline" -- Show as much as possible of the last line.
-vim.opt.inccommand = "split" --
-vim.opt.ttyfast = true -- Faster redrawing.
---vim.opt.lazyredraw = true -- Only redraw when necessary
-vim.opt.keywordprg = ":help" -- :help options
-vim.opt.ruler = true --
-vim.opt.errorbells = false --
-vim.opt.list = true -- Show non-printable characters.
-vim.opt.showmatch = true --
-vim.opt.matchtime = 3 --
-vim.opt.showbreak = "↪ " --
-vim.opt.linebreak = true --
-vim.opt.exrc = true --
+vim.opt.hidden = true                            -- Switch between buffers without having to save first.
+vim.opt.splitbelow = true                        -- make split put the new buffer below the current buffer
+vim.opt.splitright = true                        -- make vsplit put the new buffer on the right of the current buffer
+vim.opt.scrolloff = 8                            --
+vim.opt.sidescrolloff = 8                        -- how many lines to scroll when using the scrollbar
+vim.opt.autoread = true                          -- reload files if changed externally
+vim.opt.display = "lastline"                     -- Show as much as possible of the last line.
+vim.opt.inccommand = "split"                     --
+vim.opt.ttyfast = true                           -- Faster redrawing.
+vim.opt.lazyredraw = false                       -- Only redraw when necessary
+vim.opt.keywordprg = ":help"                     -- :help options
+vim.opt.ruler = true                             --
+vim.opt.errorbells = false                       --
+vim.opt.list = true                              -- Show non-printable characters.
+vim.opt.showmatch = true                         --
+vim.opt.matchtime = 3                            --
+vim.opt.showbreak = "↪ "                       --
+vim.opt.linebreak = true                         --
+vim.opt.exrc = true                              --
 --vim.opt.autochdir = true                          -- or use this to use <:e> to create a file in current directory
-vim.opt.autoread = true -- if a file is changed outside of vim, automatically reload it without asking
+vim.opt.autoread = true                          -- if a file is changed outside of vim, automatically reload it without asking
 --vim.opt.notimeout = true                          -- Timeout on keycodes and not mappings
-vim.opt.ttimeout = true -- Makes terminal vim work sanely
-vim.opt.ttimeoutlen = 10 --
+vim.opt.ttimeout = true                          -- Makes terminal vim work sanely
+vim.opt.ttimeoutlen = 10                         --
 --vim.opt.timeoutlen = 100 -- time to wait for a mapped sequence to complete (in milliseconds)
 --vim.cmd([[set diffopt = vertical = true]])        -- diffs are shown side-by-side not above/below
 
 -- Indent/tab
 vim.opt.breakindent = true --
-vim.opt.autoindent = true -- Indent according to previous line.
-vim.opt.copyindent = true -- Copy indent from the previous line
-vim.opt.smarttab = false --
-vim.opt.tabstop = 2 --
-vim.opt.expandtab = true -- Indent according to previous line.
+vim.opt.autoindent = true  -- Indent according to previous line.
+vim.opt.copyindent = true  -- Copy indent from the previous line
+vim.opt.smarttab = false   --
+vim.opt.tabstop = 2        --
+vim.opt.expandtab = true   -- Indent according to previous line.
 --vim.opt.expandtab = true                          -- Use spaces instead of tabs.
-vim.opt.softtabstop = 2 -- Tab key indents by 2 spaces.
-vim.opt.shiftwidth = 2 -- >> indents by 2 spaces.
-vim.opt.shiftround = true -- >> indents to next multiple of 'shiftwidth'.
+vim.opt.softtabstop = 2    -- Tab key indents by 2 spaces.
+vim.opt.shiftwidth = 2     -- >> indents by 2 spaces.
+vim.opt.shiftround = true  -- >> indents to next multiple of 'shiftwidth'.
 vim.opt.smartindent = true -- smart indent
 
 -- Column/statusline/Cl
-vim.opt.number = true --
-vim.opt.title = true --
+vim.opt.number = true        --
+vim.opt.title = true         --
 --vim.opt.colorcolumn = "+1" --
 vim.opt.signcolumn = "yes:1" -- always show the sign column
 --vim.opt.signcolumn = "yes:" .. vim.o.numberwidth
 --vim.opt.signcolumn = "number"
 --vim.opt.signcolumn = "no"                         --
-vim.opt.laststatus = 3 -- " Always show statusline.
+vim.opt.laststatus = 3  -- " Always show statusline.
 vim.opt.showmode = true -- Show current mode in command-line, example: -- INSERT -- mode
-vim.opt.showcmd = true -- Show the command in the status bar
-vim.opt.cmdheight = 1 --
+vim.opt.showcmd = true  -- Show the command in the status bar
+vim.opt.cmdheight = 1   --
 --vim.opt.cmdheight = 0                             --
-vim.opt.report = 0 -- Always report changed lines.
+vim.opt.report = 0      -- Always report changed lines.
 --local autocmd = vim.api.nvim_create_autocmd
 --autocmd("bufenter", {
 --	pattern = "*",
@@ -127,9 +126,9 @@ local prefix = vim.env.XDG_CONFIG_HOME or vim.fn.expand("~/.config")
 vim.opt.undodir = { prefix .. "/nvim/tmp/.undo//" }
 vim.opt.backupdir = { prefix .. "/nvim/tmp/.backup//" }
 vim.opt.directory = { prefix .. "/nvim/tmp/.swp//" }
-vim.opt.backup = false --
-vim.opt.undofile = false                           --
-vim.opt.swapfile = true                         --
+vim.opt.backup = false   --
+vim.opt.undofile = false --
+vim.opt.swapfile = true  --
 -- Add timestamp as extension for backup files
 vim.api.nvim_create_autocmd('BufWritePre', {
   group = vim.api.nvim_create_augroup('timestamp_backupext', { clear = true }),
@@ -142,23 +141,23 @@ vim.api.nvim_create_autocmd('BufWritePre', {
 
 -- Format
 --vim.opt.textwidth = 80 --
-vim.cmd([[let &t_Cs = "\e[4:3m"]]) -- Undercurl
-vim.cmd([[let &t_Ce = "\e[4:0m"]]) --
-vim.opt.path:append({ "**" }) -- Finding files - Search down into subfolder
+vim.cmd([[let &t_Cs = "\e[4:3m"]])    -- Undercurl
+vim.cmd([[let &t_Ce = "\e[4:0m"]])    --
+vim.opt.path:append({ "**" })         -- Finding files - Search down into subfolder
 vim.cmd("set whichwrap+=<,>,[,],h,l") --
-vim.cmd([[set iskeyword+=-]]) --
+vim.cmd([[set iskeyword+=-]])         --
 --vim.cmd([[set formatoptions-=cro]]) -- TODO: this doesn't seem to work
 vim.opt.formatoptions = vim.opt.formatoptions
-	- "t" -- wrap with text width
-	+ "c" -- wrap comments
-	+ "r" -- insert comment after enter
-	- "o" -- insert comment after o/O
-	- "q" -- allow formatting of comments with gq
-	- "a" -- format paragraphs
-	+ "n" -- recognized numbered lists
-	- "2" -- use indent of second line for paragraph
-	+ "l" -- long lines are not broken
-	+ "j" -- remove comment when joining lines
+    - "t"               -- wrap with text width
+    + "c"               -- wrap comments
+    + "r"               -- insert comment after enter
+    - "o"               -- insert comment after o/O
+    - "q"               -- allow formatting of comments with gq
+    - "a"               -- format paragraphs
+    + "n"               -- recognized numbered lists
+    - "2"               -- use indent of second line for paragraph
+    + "l"               -- long lines are not broken
+    + "j"               -- remove comment when joining lines
 vim.opt.wrapscan = true -- " Searches wrap around end-of-file.
 --vim.wo.number = true                              --
 --vim.opt.wrap = false                              -- No Wrap lines
@@ -172,68 +171,68 @@ vim.opt.shortmess:append("sI")
 --vim.opt.shortmess = "sI"
 --vim.o.shortmess = vim.o.shortmess:gsub('s', '')
 vim.opt.fillchars = {
-	horiz = "─",
-	horizup = "┴",
-	horizdown = "┬",
-	vert = "│",
-	vertleft = "┤",
-	vertright = "├",
-	verthoriz = "┼",
+  horiz = "─",
+  horizup = "┴",
+  horizdown = "┬",
+  vert = "│",
+  vertleft = "┤",
+  vertright = "├",
+  verthoriz = "┼",
   foldopen = "",
   foldsep = "│",
   foldclose = "",
   fold = "─",
-	eob = " ",
-	--diff = "┃",
+  eob = " ",
+  --diff = "┃",
   diff = "░",
   msgsep = "━",
-	--msgsep = "‾",
+  --msgsep = "‾",
 }
 vim.opt.listchars = { tab = "▸ ", trail = "·" } --
 --vim.opt.fillchars:append({ eob = " " }) -- remove the ~ from end of buffer
-vim.opt.modeline = true --
-vim.opt.modelines = 3 -- modelines (comments that set vim options on a per-file basis)
+vim.opt.modeline = true                         --
+vim.opt.modelines = 3                           -- modelines (comments that set vim options on a per-file basis)
 --vim.opt.modelineexpr = true
 --vim.opt.nofoldenable = true                       -- turn folding off
 --vim.opt.foldenable = false -- turn folding off
 vim.o.showtabline = 2
 
 -- Highlights
-vim.opt.incsearch = true -- Highlight while searching with / or ?.
-vim.opt.hlsearch = true -- Keep matches highlighted.
+vim.opt.incsearch = true  -- Highlight while searching with / or ?.
+vim.opt.hlsearch = true   -- Keep matches highlighted.
 vim.opt.ignorecase = true -- ignore case in search patterns UNLESS /C or capital in search
-vim.opt.smartcase = true -- smart case
-vim.opt.synmaxcol = 200 -- Only highlight the first 200 columns.
+vim.opt.smartcase = true  -- smart case
+vim.opt.synmaxcol = 200   -- Only highlight the first 200 columns.
 vim.opt.winblend = 30
 --vim.opt.winblend = 5
 vim.opt.wildoptions = "pum" --
 --vim.opt.pumblend = 5 --
-vim.opt.pumblend = 12 --
+vim.opt.pumblend = 12       --
 --vim.opt.pumblend=15
-vim.opt.pumheight = 10 -- pop up menu height
+vim.opt.pumheight = 10      -- pop up menu height
 
 -- Better Completion
 vim.opt.complete = { ".", "w", "b", "u", "t" } --
 --vim.opt.completeopt = { "longest,menuone,preview" } --
-vim.opt.completeopt = {'menu', 'menuone', 'noselect'}
+vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
 --vim.opt.completeopt = { "menuone", "noselect" }   -- mostly just for cmp
 --vim.opt.completeopt = { "menu", "menuone", "noselect" } --
 
 -- Wildmenu completion                            --
-vim.opt.wildmenu = true --
-vim.opt.wildmode = { "list:longest" } --
-vim.opt.wildignore:append({ ".hg", ".git", ".svn" }) -- Version control
-vim.opt.wildignore:append({ "*.aux", "*.out", "*.toc" }) -- LaTeX intermediate files
-vim.opt.wildignore:append({ "*.jpg", "*.bmp", "*.gif", "*.png", "*.jpeg" }) -- binary images
+vim.opt.wildmenu = true                                                       --
+vim.opt.wildmode = { "list:longest" }                                         --
+vim.opt.wildignore:append({ ".hg", ".git", ".svn" })                          -- Version control
+vim.opt.wildignore:append({ "*.aux", "*.out", "*.toc" })                      -- LaTeX intermediate files
+vim.opt.wildignore:append({ "*.jpg", "*.bmp", "*.gif", "*.png", "*.jpeg" })   -- binary images
 vim.opt.wildignore:append({ "*.o", "*.obj", "*.exe", "*.dll", "*.manifest" }) -- compiled object files
-vim.opt.wildignore:append({ "*.spl" }) -- compiled spelling word lists
-vim.opt.wildignore:append({ "*.sw?" }) -- Vim swap files
-vim.opt.wildignore:append({ "*.DS_Store" }) -- OSX bullshit
-vim.opt.wildignore:append({ "*.luac" }) -- Lua byte code
-vim.opt.wildignore:append({ "migrations" }) -- Django migrations
-vim.opt.wildignore:append({ "*.pyc" }) -- Python byte code
-vim.opt.wildignore:append({ "*.orig" }) -- Merge resolution files
-vim.opt.wildignore:append({ "*/node_modules/*" }) --
+vim.opt.wildignore:append({ "*.spl" })                                        -- compiled spelling word lists
+vim.opt.wildignore:append({ "*.sw?" })                                        -- Vim swap files
+vim.opt.wildignore:append({ "*.DS_Store" })                                   -- OSX bullshit
+vim.opt.wildignore:append({ "*.luac" })                                       -- Lua byte code
+vim.opt.wildignore:append({ "migrations" })                                   -- Django migrations
+vim.opt.wildignore:append({ "*.pyc" })                                        -- Python byte code
+vim.opt.wildignore:append({ "*.orig" })                                       -- Merge resolution files
+vim.opt.wildignore:append({ "*/node_modules/*" })                             --
 
 -- Shada
 vim.opt.shada = "!,'1000,f1,<1000,s100,:1000,/1000,h"
@@ -253,7 +252,7 @@ vim.cmd([[                                        " Only show cursorline in the
 	    au WinEnter,InsertLeave * set cursorline
 	augroup END
 ]])
-vim.opt.cursorline = true --
+vim.opt.cursorline = true               --
 vim.opt.guicursor = "i:ver100,r:hor100" --
 
 -- Trailing whitespace