From fcf2a53ed6a134de89e379e5bb19d1d339eb54fd Mon Sep 17 00:00:00 2001
From: Lucas Sta Maria <lucas@priime.dev>
Date: Mon, 30 Jan 2023 21:28:55 -0500
Subject: [PATCH] fix: add many plugins to neovim

Signed-off-by: Lucas Sta Maria <lucas@priime.dev>
---
 .config/nvim/UltiSnips/tex.snippets | 21 ++++++++-
 .config/nvim/ftplugin/tex.lua       |  2 +
 .config/nvim/init.lua               |  3 +-
 .config/nvim/lua/lsp.lua            | 16 ++++---
 .config/nvim/lua/mappings.lua       | 12 +++++-
 .config/nvim/lua/plugins.lua        | 66 ++++++++++++++++++++++++++++-
 .config/nvim/lua/treesitter.lua     |  7 +++
 7 files changed, 115 insertions(+), 12 deletions(-)

diff --git a/.config/nvim/UltiSnips/tex.snippets b/.config/nvim/UltiSnips/tex.snippets
index b57b9c2..3c8d8d4 100644
--- a/.config/nvim/UltiSnips/tex.snippets
+++ b/.config/nvim/UltiSnips/tex.snippets
@@ -18,6 +18,8 @@ snippet preamble "preamble" w
 \\usepackage{amsthm}
 \\usepackage{amssymb}
 \\usepackage{enumitem}
+\\usepackage{libertine}
+\\usepackage{euler}
 
 \\usepackage{import}
 \\usepackage{pdfpages}
@@ -59,6 +61,11 @@ snippet preamble "preamble" w
 \t\\end{list}
 }
 
+\\newcommand{\\N}{\\mathbb{N}}
+\\newcommand{\\R}{\\mathbb{R}}
+\\newcommand{\\I}{\\mathbb{I}}
+\\newcommand{\\Z}{\\mathbb{Z}}
+
 endsnippet
 
 snippet beg "begin{} / end{}" bA
@@ -174,7 +181,7 @@ endsnippet
 
 priority 200
 context "math()"
-snippet '(?<!\\)(arcsin|arccos|arctan|arccot|arccsc|arcsec|pi|zeta|int)' "ln" rwA
+snippet '(?<!\\)(arcsin|arccos|arctan|arccot|arccsc|arcsec|pi|zeta|int|iint|iiint)' "ln" rwA
 \\`!p snip.rv = match.group(1)`
 endsnippet
 
@@ -216,10 +223,15 @@ snippet set "set" wA
 endsnippet
 
 context "math()"
-snippet cc "complement" Ai
+snippet ccc "complement" Ai
 ^{c}
 endsnippet
 
+context "math()"
+snippet ooo "infinity" iA
+\\infty
+endsnippet
+
 snippet notin "not in " iA
 \not\in 
 endsnippet
@@ -243,6 +255,11 @@ snippet cup "cup" iA
 \cup 
 endsnippet
 
+context "math()"
+snippet limm "limit" iA
+\\lim\\limits_{$1}{$2}$0
+endsnippet
+
 priority 10
 context "math()"
 snippet "bar" "bar" riA
diff --git a/.config/nvim/ftplugin/tex.lua b/.config/nvim/ftplugin/tex.lua
index 1586492..ff2d432 100644
--- a/.config/nvim/ftplugin/tex.lua
+++ b/.config/nvim/ftplugin/tex.lua
@@ -7,6 +7,8 @@ local function map(mode, lhs, rhs, opts)
     vim.api.nvim_set_keymap(mode, lhs, rhs, options)
 end
 
+require("nvim-autopairs").setup {}
+
 map("i", "<C-c>", "<ESC>:w<CR>:!just<CR>")
 map("n", "<C-c>", "<ESC>:w<CR>:!just<CR>")
 
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index b91c298..ee321c5 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -29,13 +29,14 @@ opt("updatetime", 100)
 opt("mouse", "a")
 opt("mousescroll", "ver:1,hor:1")
 
-vim.cmd[[autocmd FocusGained * CheckTime]]
+vim.cmd[[autocmd FocusGained * checktime]]
 
 vim.g.mapleader = " "
 vim.g.copilot_no_tab_map = true
 vim.g.maplocalleader = ","
 
 vim.wo.wrap = false
+vim.opt.signcolumn = "yes"
 
 require("plugins")
 require("mappings")
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 5ed3ee6..307ecc7 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -1,8 +1,9 @@
 local lspconfig = require("lspconfig")
-local saga = require("lspsaga")
 local cmp = require("cmp")
 local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
 
+require('lspsaga').setup {}
+
 cmp.setup({
     snippet = {
         expand = function(args)
@@ -10,8 +11,8 @@ cmp.setup({
         end,
     },
     window = {
-        completion = cmp.config.window.bordered(),
-        documentation = cmp.config.window.bordered(),
+        -- completion = cmp.config.window.bordered(),
+        -- documentation = cmp.config.window.bordered(),
     },
     mapping = cmp.mapping.preset.insert({
         ['<C-b>'] = cmp.mapping.scroll_docs(-4),
@@ -79,7 +80,7 @@ local on_attach = function(client, bufnr)
     -- Mappings
     key('n', '<leader>cD', '<cmd>lua vim.lsp.buf.declaration()<CR>')
     key('n', '<leader>cd', '<cmd>lua vim.lsp.buf.definition()<CR>')
-    key('n', '<leader>cp', '<cmd>Lspsaga preview_definition<CR>')
+    key('n', '<leader>cp', '<cmd>Lspsaga peek_definition<CR>')
     key('n', '<leader>ch', '<cmd>Lspsaga hover_doc<CR>')
     key('n', '<leader>ci', '<cmd>lua vim.lsp.buf.implementation()<CR>')
     key('n', '<leader>sh', '<cmd>Lspsaga signature_help<CR>')
@@ -90,7 +91,7 @@ local on_attach = function(client, bufnr)
     key('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>')
     key('n', '<leader>ca', '<cmd>Lspsaga code_action<CR>')
     key('n', '<leader>cr', '<cmd>lua vim.lsp.buf.references()<CR>')
-    key('n', '<space>f', '<cmd>lua vim.lsp.buf.format()<CR>')
+    -- key('n', '<space>f', '<cmd>lua vim.lsp.buf.format()<CR>')
     key('n', '<leader>cs', '<cmd>lua vim.diagnostic.open_float()<CR>')
 end
 
@@ -170,4 +171,7 @@ lspconfig.sumneko_lua.setup {
     capabilities = capabilities,
 }
 
-saga.init_lsp_saga()
+lspconfig.clojure_lsp.setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index c83c6cd..4acb9d8 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -7,6 +7,9 @@ local function map(mode, lhs, rhs, opts)
     vim.api.nvim_set_keymap(mode, lhs, rhs, options)
 end
 
+-- format
+map('n', '<leader>f', ':Format<CR>')
+
 -- open terminal
 map("n", "<leader>ott", ":ToggleTerm<CR>")
 map("n", "<leader>otf", ":ToggleTerm direction=float<CR>")
@@ -26,8 +29,9 @@ map("n", "<leader>tg", ":Telescope live_grep<CR>")
 -- copilot
 map('i', '<C-a>', 'copilot#Accept("<CR>")', {expr=true, silent=true})
 
--- neogit
+-- neogit / git related
 map('n', '<leader>gg', ':Neogit<CR>')
+map('n', '<leader>gb', ':Gitsigns blame_line<CR>')
 
 -- symbols outline
 map("n", "<leader>os", ":SymbolsOutline<CR>")
@@ -46,3 +50,9 @@ map("n", "<A-k>", ":let ayucolor=\"light\"<CR>:colorscheme ayu<CR>")
 -- horizontal scrolling
 map("n", "<C-l>", "zl")
 map("n", "<C-h>", "zh")
+
+-- bufferline
+map("n", "<C-k>", ":BufferLineCycleNext<CR>")
+map("n", "<C-j>", ":BufferLineCyclePrev<CR>")
+map("n", "<C-S-k>", ":BufferLineMoveNext<CR>")
+map("n", "<C-S-j>", ":BufferLineMovePrev<CR>")
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 1a0bdbc..ecb552d 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -8,6 +8,9 @@ packer.startup(function()
     -- lib
     use("nvim-lua/plenary.nvim")
 
+    -- setup
+    use("Olical/aniseed")
+
     -- language
     use("nvim-treesitter/nvim-treesitter")
     use("neovim/nvim-lspconfig")
@@ -15,6 +18,7 @@ packer.startup(function()
     use("onsails/lspkind-nvim")
     use("wlangstroth/vim-racket")
     use("Olical/conjure")
+    use("yioneko/nvim-yati")
 
     -- ui
     use("ayu-theme/ayu-vim")
@@ -26,6 +30,8 @@ packer.startup(function()
     use("nvim-lualine/lualine.nvim")
     use{"akinsho/toggleterm.nvim",branch="main"}
     use("simrat39/symbols-outline.nvim")
+    use("lcheylus/overlength.nvim")
+    use("akinsho/bufferline.nvim")
 
     -- completion
     use("hrsh7th/cmp-nvim-lsp")
@@ -45,6 +51,10 @@ packer.startup(function()
     use("TimUntersberger/neogit")
     use("ggandor/leap.nvim")
     use("eraserhd/parinfer-rust")
+    use("windwp/nvim-autopairs")
+    use("mhartington/formatter.nvim")
+    use{"kylechui/nvim-surround",branch="main"}
+    use("numToStr/Comment.nvim")
 
     if packer_bootstrap then
       require('packer').sync()
@@ -64,7 +74,7 @@ require("nvim-treesitter.configs").setup {
 require("fidget").setup {}
 
 -- ayu
-vim.cmd([[let ayucolor="dark"]])
+vim.cmd([[let ayucolor="light"]])
 vim.cmd([[colorscheme ayu]])
 
 -- telescope
@@ -138,7 +148,7 @@ vim.cmd[[
 ]]
 
 -- todo-comments
--- require('todo-comments').setup {}
+require('todo-comments').setup {}
 
 -- copilot
 vim.g.copilot_filetypes = {
@@ -151,3 +161,55 @@ require('symbols-outline').setup {}
 
 -- leap
 require('leap').setup {}
+
+-- overlength
+require('overlength').setup {}
+
+-- formatter
+require('formatter').setup {
+    filetype = {
+        rust = {
+            -- Rustfmt
+            function()
+                return {
+                    exe = "rustfmt",
+                    args = {"--emit=stdout", "--edition=2021"},
+                    stdin = true
+                }
+            end
+        },
+        cpp = {
+            require('formatter.filetypes.cpp').clangformat
+        },
+        ocaml = {
+            require('formatter.filetypes.ocaml').ocamlformat
+        },
+        python = {
+            require('formatter.filetypes.python').black
+        },
+        javascript = {
+            require('formatter.filetypes.javascript').prettier
+        },
+        tex = {
+            require('formatter.filetypes.latex').latexindent
+        },
+        -- apply to all filetypes
+        ["*"] = {
+            require('formatter.filetypes.any').remove_trailing_whitespace
+        },
+    }
+}
+
+-- bufferline
+require('bufferline').setup {}
+
+-- nvim surround
+require('nvim-surround').setup {}
+
+-- Comment
+require('Comment').setup {}
+
+-- autopairs
+require("nvim-autopairs").setup {
+    disable_filetype = { "TelescopePrompt", "racket" }
+}
diff --git a/.config/nvim/lua/treesitter.lua b/.config/nvim/lua/treesitter.lua
index 59fd7cf..dc4e646 100644
--- a/.config/nvim/lua/treesitter.lua
+++ b/.config/nvim/lua/treesitter.lua
@@ -31,5 +31,12 @@ ts_config.setup {
     highlight = {
         enable = true,
         use_languagetree = true
+    },
+    indent = {
+        enable = false,
+        disable = { "python" }
+    },
+    yati = {
+        enable = true,
     }
 }