Add a lot of changesHEADmaster

1 files changed, 188 insertions, 96 deletions

diff --git a/home/.config/nvim/after/plugin/autocmds.lua b/home/.config/nvim/after/plugin/autocmds.lua
index 7ab937f..22cf732 100644
--- a/home/.config/nvim/after/plugin/autocmds.lua
+++ b/home/.config/nvim/after/plugin/autocmds.lua
@@ -1,137 +1,229 @@
 local function augroup(name)
-  return vim.api.nvim_create_augroup(name, {})
+  return vim.api.nvim_create_augroup(name, { clear = true })
 end
 
 local autocmd = vim.api.nvim_create_autocmd
 
--- adapted from https://github.com/ethanholz/nvim-lastplace/blob/main/lua/nvim-lastplace/init.lua
-local ignore_buftype = { "quickfix", "nofile", "help" }
-local ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" }
+-- Check if we need to reload the file when it changed
+autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
+  group = augroup("checktime"),
+  callback = function()
+    if vim.o.buftype ~= "nofile" then
+      vim.cmd("checktime")
+    end
+  end,
+})
 
-local function run()
-  if vim.tbl_contains(ignore_buftype, vim.bo.buftype) then
-    return
-  end
+-- Highlight on yank
+autocmd("TextYankPost", {
+  group = augroup("highlight_yank"),
+  callback = vim.hl.on_yank,
+})
 
-  if vim.tbl_contains(ignore_filetype, vim.bo.filetype) then
-    -- reset cursor to first line
-    vim.cmd [[normal! gg]]
-    return
-  end
+-- go to last loc when opening a buffer
+autocmd("BufReadPost", {
+  group = augroup("last_loc"),
+  callback = function(event)
+    local exclude = { "gitcommit" }
+    local buf = event.buf
+    if
+      vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].last_loc
+    then
+      return
+    end
+    vim.b[buf].last_loc = true
+    local mark = vim.api.nvim_buf_get_mark(buf, '"')
+    local lcount = vim.api.nvim_buf_line_count(buf)
+    if mark[1] > 0 and mark[1] <= lcount then
+      pcall(vim.api.nvim_win_set_cursor, 0, mark)
+    end
+  end,
+})
 
-  -- If a line has already been specified on the command line, we are done
-  --   nvim file +num
-  if vim.fn.line(".") > 1 then
-    return
-  end
+-- close some filetypes with <q>
+autocmd("FileType", {
+  group = augroup("close_with_q"),
+  pattern = {
+    "PlenaryTestPopup",
+    "checkhealth",
+    "dbout",
+    "gitsigns-blame",
+    "grug-far",
+    "help",
+    "lspinfo",
+    "neotest-output",
+    "neotest-output-panel",
+    "neotest-summary",
+    "notify",
+    "qf",
+    "spectre_panel",
+    "startuptime",
+    "tsplayground",
+  },
+  callback = function(event)
+    vim.bo[event.buf].buflisted = false
+    vim.schedule(function()
+      vim.keymap.set("n", "q", function()
+        vim.cmd("close")
+        pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
+      end, {
+        buffer = event.buf,
+        silent = true,
+        desc = "Quit buffer",
+      })
+    end)
+  end,
+})
 
-  local last_line = vim.fn.line([['"]])
-  local buff_last_line = vim.fn.line("$")
+-- make it easier to close man-files when opened inline
+autocmd("FileType", {
+  group = augroup("man_unlisted"),
+  pattern = { "man" },
+  callback = function(event)
+    vim.bo[event.buf].buflisted = false
+  end,
+})
 
-  -- If the last line is set and the less than the last line in the buffer
-  if last_line > 0 and last_line <= buff_last_line then
-    local win_last_line = vim.fn.line("w$")
-    local win_first_line = vim.fn.line("w0")
-    -- Check if the last line of the buffer is the same as the win
-    if win_last_line == buff_last_line then
-      -- Set line to last line edited
-      vim.cmd [[normal! g`"]]
-      -- Try to center
-    elseif buff_last_line - last_line >
-        ((win_last_line - win_first_line) / 2) - 1 then
-      vim.cmd [[normal! g`"zz]]
-    else
-      vim.cmd [[normal! G'"<c-e>]]
+-- Auto create dir when saving a file, in case some intermediate directory does not exist
+autocmd({ "BufWritePre" }, {
+  group = augroup("auto_create_dir"),
+  callback = function(event)
+    if event.match:match("^%w%w+:[\\/][\\/]") then
+      return
     end
-  end
-end
-
-augroup("restore position")
-autocmd("BufReadPost", {
-  once = true,
-  group = "restore position",
-  callback = run
+    local file = vim.uv.fs_realpath(event.match) or event.match
+    vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
+  end,
 })
 
-augroup("postwrite")
-autocmd("BufWritePost", {
-  group = "postwrite",
-  pattern = ".Xkeymap",
-  command = "!xkbcomp % $DISPLAY",
-})
 autocmd("BufWritePost", {
-  group = "postwrite",
+  group = augroup("bspwm"),
   pattern = "*bspwmrc",
   command = "!bspc wm --restart",
 })
 autocmd("BufWritePost", {
-  group = "postwrite",
+  group = augroup("polybar"),
   pattern = "*/polybar/config",
   command = "!polybar-msg cmd restart",
 })
 autocmd("BufWritePost", {
-  group = "postwrite",
+  group = augroup("xdg-user-dirs"),
   pattern = "user-dirs.dirs,user-dirs.locale",
   command = "!xdg-user-dirs-update",
 })
 autocmd("BufWritePost", {
-  group = "postwrite",
-  pattern = "plugins.lua",
-  command = "source % | PackerSync",
-})
-autocmd("BufWritePost", {
-  group = "postwrite",
+  group = augroup("dunst"),
   pattern = "dunstrc",
   command = "!killall -SIGUSR2 dunst",
 })
-autocmd(
-  "BufWritePost",
-  { group = "postwrite", pattern = "fonts.conf", command = "!fc-cache" }
-)
-
-augroup("autocomplete")
-autocmd("CompleteDone", {
-  group = "autocomplete",
-  command = "if pumvisible() == 0 | silent! pclose | endif",
+autocmd("BufWritePost", {
+  group = augroup("fc-cache"),
+  pattern = "fonts.conf",
+  command = "!fc-cache",
 })
 
-augroup("reload")
-autocmd("CompleteDone", {
-  group = "reload",
-  command = "if getcmdwintype() == '' | checktime | endif",
-})
+autocmd("LspAttach", {
+  group = augroup("lsp-attach"),
+  callback = function(event)
+    local bufnr = event.buf
 
-augroup("highlightyank")
-autocmd(
-  "TextYankPost",
-  { group = "highlightyank", callback = vim.highlight.on_yank }
-)
+    local function map(mode, l, r, desc)
+      vim.keymap.set(mode, l, r, { buffer = bufnr, desc = desc })
+    end
+    local function nmap(l, r, desc)
+      map("n", l, r, desc)
+    end
+    local function nvmap(l, r, desc)
+      map({ "n", "v" }, l, r, desc)
+    end
+    nmap("<c-]>", vim.lsp.buf.definition, "Goto definition")
+    nmap("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
+    nvmap("gra", vim.lsp.buf.code_action, "[R]un code [A]ction")
 
-augroup("quitro")
-autocmd("BufReadPost", {
-  group = "quitro",
-  callback = function()
-    if vim.opt.readonly:get() then
-      vim.keymap.set("n", "q", "<cmd>q<cr>")
+    -- The following two autocommands are used to highlight references of the
+    -- word under your cursor when your cursor rests there for a little while.
+    --    See `:help CursorHold` for information about when this is executed
+    --
+    -- When you move your cursor, the highlights will be cleared (the second autocommand).
+    local client = vim.lsp.get_client_by_id(event.data.client_id)
+    if
+      client
+      and client:supports_method(
+        vim.lsp.protocol.Methods.textDocument_documentHighlight,
+        event.buf
+      )
+    then
+      local highlight_augroup =
+        vim.api.nvim_create_augroup("lsp-highlight", { clear = false })
+      vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
+        buffer = event.buf,
+        group = highlight_augroup,
+        callback = vim.lsp.buf.document_highlight,
+      })
+
+      vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
+        buffer = event.buf,
+        group = highlight_augroup,
+        callback = vim.lsp.buf.clear_references,
+      })
+
+      vim.api.nvim_create_autocmd("LspDetach", {
+        group = vim.api.nvim_create_augroup("lsp-detach", { clear = true }),
+        callback = function(event2)
+          vim.lsp.buf.clear_references()
+          vim.api.nvim_clear_autocmds({
+            group = "lsp-highlight",
+            buffer = event2.buf,
+          })
+        end,
+      })
+    end
+
+    if
+      client
+      and client:supports_method(
+        vim.lsp.protocol.Methods.textDocument_codeLens,
+        event.buf
+      )
+    then
+      vim.api.nvim_create_autocmd(
+        { "CursorHold", "CursorHoldI", "InsertLeave" },
+        {
+          buffer = bufnr,
+          group = vim.api.nvim_create_augroup("codelens", { clear = true }),
+          callback = vim.lsp.codelens.refresh,
+        }
+      )
+      nmap("<leader>cl", vim.lsp.codelens.run, "Run [C]ode [L]ens")
+    end
+
+    -- The following code creates a keymap to toggle inlay hints in your
+    -- code, if the language server you are using supports them
+    --
+    -- This may be unwanted, since they displace some of your code
+    if
+      client
+      and client:supports_method(
+        vim.lsp.protocol.Methods.textDocument_inlayHint,
+        event.buf
+      )
+    then
+      nmap("<leader>th", function()
+        vim.lsp.inlay_hint.enable(
+          not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf })
+        )
+      end, "[T]oggle Inlay [H]ints")
     end
   end,
 })
 
-augroup("localinit")
-autocmd("VimEnter", {
-  group = "localinit",
+autocmd("FileType", {
+  group = augroup("treesitter_start"),
+  pattern = { "*" },
   callback = function()
-    local settings = vim.fn.findfile(".doit.lua", ".;")
-    if settings ~= "" then
-      print("sourcing local config")
-      dofile(settings)
+    if pcall(vim.treesitter.start) then
+      -- vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+      vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
     end
   end,
 })
-
-augroup("restore guicursor")
-autocmd("VimLeave", {
-  once = true,
-  group = "restore guicursor",
-  command = 'set guicursor= | call chansend(v:stderr, "\x1b[ q")'
-})