From 0b99d6c75c8a4462d4e27a570dcc5057d22fe263 Mon Sep 17 00:00:00 2001
From: Smirnov-O <ss2316544@gmail.com>
Date: Sun, 12 Sep 2021 23:27:06 +0300
Subject: [PATCH] Update lvim

---
 config/lvim/config.lua                    | 10 ++++++----
 config/lvim/ftplugin/go.lua               |  4 +++-
 config/lvim/ftplugin/javascript.lua       |  4 ++++
 config/lvim/lsp-settings/gopls.json       |  5 +++++
 config/lvim/lua/u/package-info.lua        | 14 --------------
 config/lvim/lua/{u => user}/conjure.lua   |  0
 config/lvim/lua/user/dap-virtual-text.lua |  7 +++++++
 config/nvim/fnl/config                    |  1 -
 config/nvim/init.lua                      | 18 ------------------
 9 files changed, 25 insertions(+), 38 deletions(-)
 create mode 100644 config/lvim/lsp-settings/gopls.json
 delete mode 100644 config/lvim/lua/u/package-info.lua
 rename config/lvim/lua/{u => user}/conjure.lua (100%)
 create mode 100644 config/lvim/lua/user/dap-virtual-text.lua
 delete mode 160000 config/nvim/fnl/config
 delete mode 100644 config/nvim/init.lua

diff --git a/config/lvim/config.lua b/config/lvim/config.lua
index 45f59b5..84be97b 100644
--- a/config/lvim/config.lua
+++ b/config/lvim/config.lua
@@ -9,7 +9,7 @@ lvim.builtin.autopairs.active = true
 
 -- GitSigns
 lvim.builtin.gitsigns.opts.current_line_blame = true
-lvim.builtin.gitsigns.opts.current_line_blame_opts = { virt_text = true, virt_text_pos = "eol", delay = 200 }
+lvim.builtin.gitsigns.opts.current_line_blame_opts = { delay = 200 }
 
 -- TreeSitter
 lvim.builtin.treesitter.ensure_installed = { "javascript", "typescript", "jsdoc", "lua", "java" }
@@ -19,6 +19,9 @@ lvim.builtin.treesitter.indent.disable = { "clojure", "java", "python" }
 lvim.builtin.telescope.defaults.layout_config.prompt_position = "top"
 lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env" }
 
+-- Debugger
+lvim.builtin.dap.active = true
+
 -- Mappings
 lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>"
 lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>"
@@ -33,10 +36,9 @@ end
 -- Plugins
 lvim.plugins = {
 	{ "tpope/vim-surround", keys = { "c", "y", "d" } },
-	{ "andymass/vim-matchup", keys = { "%" } },
+	-- { "andymass/vim-matchup", keys = { "%" } },
 	{ "tzachar/cmp-tabnine", run = "./install.sh", event = "InsertEnter" },
 	{ "folke/trouble.nvim", cmd = { "TroubleToggle" } },
 	{ "folke/todo-comments.nvim", event = "BufRead" },
-	{ "mfussenegger/nvim-jdtls", ft = { "java" } },
-	{ "npxbr/glow.nvim", ft = { "markdown" }, cmd = { "Glow" } },
+	{ "theHamsta/nvim-dap-virtual-text", config = "require[[user.dap-virtual-text]].setup()" },
 }
diff --git a/config/lvim/ftplugin/go.lua b/config/lvim/ftplugin/go.lua
index 89a0f53..b61fb5a 100644
--- a/config/lvim/ftplugin/go.lua
+++ b/config/lvim/ftplugin/go.lua
@@ -1,5 +1,7 @@
-lvim.format_on_save = true
 lvim.lang.go.formatters = {
 	{ exe = "gofmt" },
 	{ exe = "goimports" },
 }
+
+-- Debugger
+require("dap-install").config("go_delve", {})
diff --git a/config/lvim/ftplugin/javascript.lua b/config/lvim/ftplugin/javascript.lua
index 9851433..8652940 100644
--- a/config/lvim/ftplugin/javascript.lua
+++ b/config/lvim/ftplugin/javascript.lua
@@ -7,6 +7,10 @@ lvim.lang.javascript.linters = {
 	{ exe = "eslint_d" },
 }
 
+-- Debugger
+require("dap-install").config("jsnode", {})
+
+-- Lsp
 lvim.lang.javascript.lsp.setup.handlers = {
 	["textDocument/publishDiagnostics"] = function(_, _, p, client_id, _, config)
 		if p.diagnostics ~= nil then
diff --git a/config/lvim/lsp-settings/gopls.json b/config/lvim/lsp-settings/gopls.json
new file mode 100644
index 0000000..0a55dbc
--- /dev/null
+++ b/config/lvim/lsp-settings/gopls.json
@@ -0,0 +1,5 @@
+{
+  "go.lintTool": "golint",
+  "go.lintOnSave": "file",
+  "go.formatTool": "gofmt"
+}
diff --git a/config/lvim/lua/u/package-info.lua b/config/lvim/lua/u/package-info.lua
deleted file mode 100644
index 7cb4622..0000000
--- a/config/lvim/lua/u/package-info.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local M = {}
-
-M.config = function()
-	require("package-info").setup({{
-    autostart = true,
-    colors = { up_to_date = "#3C4048", outdated = "#6ec0fa" },
-    icons = {
-      enable = true,
-      style = { up_to_date = "|  ", outdated = "|  " },
-    },
-	}})
-end
-
-return M
diff --git a/config/lvim/lua/u/conjure.lua b/config/lvim/lua/user/conjure.lua
similarity index 100%
rename from config/lvim/lua/u/conjure.lua
rename to config/lvim/lua/user/conjure.lua
diff --git a/config/lvim/lua/user/dap-virtual-text.lua b/config/lvim/lua/user/dap-virtual-text.lua
new file mode 100644
index 0000000..755f7b8
--- /dev/null
+++ b/config/lvim/lua/user/dap-virtual-text.lua
@@ -0,0 +1,7 @@
+local M = {}
+
+M.setup = function ()
+  vim.g.dap_virtual_text = true
+end
+
+return M
diff --git a/config/nvim/fnl/config b/config/nvim/fnl/config
deleted file mode 160000
index 148c430..0000000
--- a/config/nvim/fnl/config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 148c430da4e02dab923ec86c10baf0d7bcb976ee
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
deleted file mode 100644
index 9619c9e..0000000
--- a/config/nvim/init.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-local pack_path = vim.fn.stdpath("data") .. "/site/pack"
-local fmt = string.format
-
-local function ensure(user, repo)
-	local install_path = fmt("%s/packer/start/%s", pack_path, repo, repo)
-	if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
-		vim.api.nvim_command(fmt("!git clone https://github.com/%s/%s %s", user, repo, install_path))
-		vim.api.nvim_command(fmt("packadd %s", repo))
-	end
-end
-
-ensure("wbthomason", "packer.nvim")
-ensure("Olical", "aniseed")
-
-vim.g["aniseed#env"] = {
-	module = "config.init",
-	compile = true,
-}