way too lazy to sort this out, adding kitchen sink

10 files changed, 48 insertions, 70 deletions

diff --git a/after/plugin/autopairs.lua b/after/plugin/autopairs.lua
index c943733..4a5e138 100644
--- a/after/plugin/autopairs.lua
+++ b/after/plugin/autopairs.lua
@@ -1,4 +1,4 @@
-local status_ok, autopairs = pcall(require, "nvim-autopairs")
+local status_ok, autopairs = pcall(require, "ultimate-autopair")
 if not status_ok then
 	return
 end
diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
index 0e8de6b..7106aae 100644
--- a/after/plugin/cmp.lua
+++ b/after/plugin/cmp.lua
@@ -10,10 +10,6 @@ local has_words_before = function()
   [1]:sub(col, col):match("%s") == nil
 end
 
--- insert '()' after completing a function
-cmp.event:on('confirm_done',
-  require('nvim-autopairs.completion.cmp').on_confirm_done())
-
 local luasnip = require('luasnip')
 local neogen = require('neogen')
 require("luasnip.loaders.from_vscode").lazy_load()
@@ -27,6 +23,7 @@ cmp.setup {
 
   sources = cmp.config.sources({
     { name = 'nvim_lsp', keyword_length = 3 },
+    { name = 'nvim_lua' },
     { name = 'luasnip_choice' },
     { name = 'async_path' },
     { name = 'buffer', keyword_length = 3, max_item_count = 7 },
diff --git a/after/plugin/dressing.lua b/after/plugin/dressing.lua
index 6beb0b7..bc21319 100644
--- a/after/plugin/dressing.lua
+++ b/after/plugin/dressing.lua
@@ -12,5 +12,5 @@ dressing.setup {
   },
   select = {
     enabled = true,
- }
+  }
 }
diff --git a/after/plugin/git-yodel.lua b/after/plugin/git-yodel.lua
index 434ce4f..8c814dc 100644
--- a/after/plugin/git-yodel.lua
+++ b/after/plugin/git-yodel.lua
@@ -4,9 +4,6 @@ if not status_ok then
 end
 
 yodel.setup {
-  diffpreview = {
-    border = 'shadow',
-    width = 'auto',
-    height = 'auto',
-  }
+  border = 'shadow',
+  position = 'auto'
 }
diff --git a/after/plugin/hlargs.lua b/after/plugin/hlargs.lua
deleted file mode 100644
index 85aa905..0000000
--- a/after/plugin/hlargs.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-local status_ok, hlargs = pcall(require, "hlargs")
-if not status_ok then
-	return
-end
-
-hlargs.setup {}
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 9eab3f1..8610be0 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -3,11 +3,21 @@ if not status_ok then
 	return
 end
 
-local function lsp_keymaps(bufnr)
+-- configure lsp when attached
+local function lsp_attach(client, bufnr)
+  -- helper functions
+  local function set_lsp_sign(name, text)
+    vim.fn.sign_define(name, { text = text, texthl = name })
+  end
+
   local map = function(m, lhs, rhs)
-    local opts = {remap = false, silent = true, buffer = bufnr}
+    local opts = { remap = false, silent = true, buffer = bufnr }
     vim.keymap.set(m, lhs, rhs, opts)
   end
+  set_lsp_sign("DiagnosticSignError", "x")
+  set_lsp_sign("DiagnosticSignWarn" , "!")
+  set_lsp_sign("DiagnosticSignInfo" , "i")
+  set_lsp_sign("DiagnosticSignHint" , "h")
 
   -- LSP actions
   map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
@@ -17,64 +27,43 @@ local function lsp_keymaps(bufnr)
   map('n', 'gY', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
   map('n', 'gR', '<cmd>lua vim.lsp.buf.references()<cr>')
   map('n', '<S-Tab>', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
-  map('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>')
+  map('n', '<leader>lr', '<cmd>lua vim.lsp.buf.rename()<cr>')
   map('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>')
 
   -- Diagnostics
   map('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
   map('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
-end
 
-local function set_lsp_sign(name, text)
-  vim.fn.sign_define(name, {text = text, texthl = name})
-end
-set_lsp_sign("DiagnosticSignError", "x")
-set_lsp_sign("DiagnosticSignWarn" , "!")
-set_lsp_sign("DiagnosticSignInfo" , "i")
-set_lsp_sign("DiagnosticSignHint" , "h")
-
-local function lsp_settings()
-  vim.diagnostic.config({
-    virtual_text = false,
-    signs = true,
-    update_in_insert = false,
-    underline = true,
-    severity_sort = true,
-  })
-
-  vim.lsp.handlers['textDocument/hover'] = vim.lsp.with( vim.lsp.handlers.hover,
-    { border = 'shadow', }
-  )
-  vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
-    vim.lsp.handlers.signature_help,
-    {border = 'shadow'}
-  )
-  local command = vim.api.nvim_create_user_command
-  command('LspWorkspaceAdd', function()
+  vim.api.nvim_buf_create_user_command(bufnr, 'LspFormat', function()
+    vim.lsp.buf.format()
+  end, {desc = 'Format buffer with language server'})
+  vim.api.nvim_buf_create_user_command('LspWorkspaceAdd', function()
     vim.lsp.buf.add_workspace_folder()
-  end, {desc = 'Add folder to workspace'})
-  command('LspWorkspaceList', function()
-    vim.notify(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, {desc = 'List workspace folders'})
-  command('LspWorkspaceRemove', function()
+    end, { desc = 'Add folder to workspace' })
+  vim.api.nvim_buf_create_user_command('LspWorkspaceList', function()
+      vim.notify(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, { desc = 'List workspace folders' })
+  vim.api.nvim_buf_create_user_command('LspWorkspaceRemove', function()
     vim.lsp.buf.remove_workspace_folder()
-  end, {desc = 'Remove folder from workspace'})
+    end, { desc = 'Remove folder from workspace' })
 end
 
-local function lsp_attach(client, bufnr)
-  local buf_command = vim.api.nvim_buf_create_user_command
-
-  lsp_keymaps(bufnr)
-
-  buf_command(bufnr, 'LspFormat', function()
-    vim.lsp.buf.format()
-  end, {desc = 'Format buffer with language server'})
-end
+vim.diagnostic.config({
+  virtual_text = false,
+  signs = true,
+  update_in_insert = false,
+  underline = true,
+  severity_sort = true,
+})
 
-lsp_settings()
+vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover,
+  { border = 'shadow', })
+vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
+  vim.lsp.handlers.signature_help, { border = 'shadow' })
 
-require('mason').setup({})
-require('mason-lspconfig').setup({})
+-- get servers and attach to them
+require('mason').setup {}
+require('mason-lspconfig').setup {}
 
 local get_servers = require('mason-lspconfig').get_installed_servers
 for _, server_name in ipairs(get_servers()) do
diff --git a/after/plugin/lsplines.lua b/after/plugin/lsplines.lua
index dcda047..5307c09 100644
--- a/after/plugin/lsplines.lua
+++ b/after/plugin/lsplines.lua
@@ -3,7 +3,7 @@ if not status_ok then
 	return
 end
 
-lines.setup {}
+lines.setup()
 
 vim.diagnostic.config {
   virtual_lines = {
diff --git a/after/plugin/statusline.lua b/after/plugin/statusline.lua
index 936b464..eff407c 100644
--- a/after/plugin/statusline.lua
+++ b/after/plugin/statusline.lua
@@ -71,7 +71,7 @@ el.setup {
         hl_delete = hl("GitSignsDelete", true),
       }},
       { { " " }, c.line {
-        fmt = "ʟ[%s]",
+        fmt = "[%s]",
       }, required = true },
     }
   end
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
index 601a800..1f2d34a 100644
--- a/after/plugin/telescope.lua
+++ b/after/plugin/telescope.lua
@@ -48,7 +48,7 @@ telescope.setup {
           local extension = split_path[#split_path]
           return vim.tbl_contains(image_extensions, extension)
         end
-        if is_image(filepath) then
+        if is_image(filepath) and vim.fn.executable('chafa') == 1 then
           local term = vim.api.nvim_open_term(bufnr, {})
           local function send_output(_, data, _)
             for _, d in ipairs(data) do
@@ -57,7 +57,7 @@ telescope.setup {
           end
           vim.fn.jobstart({
             'chafa', '-C', 'on', '--animate', 'off', '-s',
-            (telescopew() - 10)..'x20', '--clear', filepath
+            '23x18', '--clear', filepath
           }, { on_stdout = send_output, stdout_buffered = true, pty = true })
           a.nvim_set_option_value("number", false, { buf = bufnr })
         else
@@ -87,6 +87,7 @@ telescope.setup {
 telescope.load_extension('file_browser')
 telescope.load_extension('projects')
 telescope.load_extension('fzf')
+telescope.load_extension('harpoon')
 
 a.nvim_create_autocmd('User', {
   pattern = 'TelescopePreviewerLoaded',
diff --git a/after/plugin/ts.lua b/after/plugin/ts.lua
index 96bebb6..59dea81 100644
--- a/after/plugin/ts.lua
+++ b/after/plugin/ts.lua
@@ -1,6 +1,6 @@
 local status_ok, treesitter = pcall(require, "nvim-treesitter.configs")
 if not status_ok then
-	return
+  return
 end
 
 treesitter.setup {