Добавил автокоманду для сборки templ

4 files changed, 62 insertions, 7 deletions

diff --git a/nvim/init.lua b/nvim/init.lua
index 0b47056..988f88a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -16,5 +16,3 @@ require("keymaps")
 require("autocommands")
 require("lsp")
 require("dap")
-
-vim.cmd([[colorscheme moonfly]])
diff --git a/nvim/lua/autocommands.lua b/nvim/lua/autocommands.lua
index 4a565db..ef7353f 100644
--- a/nvim/lua/autocommands.lua
+++ b/nvim/lua/autocommands.lua
@@ -1,3 +1,30 @@
+local function async_cmd(cmd)
+	local job_id = vim.fn.jobstart(cmd, {
+		on_stdout = function(_, data)
+			for _, line in pairs(data or {}) do
+				print(line)
+			end
+		end,
+		on_stderr = function(_, data)
+			for _, line in pairs(data or {}) do
+				print(line)
+			end
+		end,
+		on_exit = function(_, code)
+			if code ~= 0 then
+				vim.notify(
+					string.format("Команда завершилась с ошибкой (%d)", code),
+					vim.log.levels.ERROR
+				)
+			else
+				vim.notify("OK", vim.log.levels.INFO)
+			end
+		end,
+	})
+
+	return job_id
+end
+
 vim.api.nvim_create_autocmd({ "BufWritePre" }, {
 	pattern = "*.go",
 	callback = function()
@@ -82,6 +109,14 @@ vim.api.nvim_create_autocmd("BufEnter", {
 	end,
 })
 
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+	pattern = "*.templ",
+	callback = function()
+		local cmd = "templ generate"
+		async_cmd(cmd)
+	end,
+})
+
 -- vim.api.nvim_create_autocmd("InsertEnter", {
 -- 	pattern = "*",
 -- 	command = "set norelativenumber",
diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua
index 518329a..359586c 100644
--- a/nvim/lua/options.lua
+++ b/nvim/lua/options.lua
@@ -37,9 +37,6 @@ local options = {
 	syntax = "on",
 	foldmethod = "expr",
 	foldexpr = "nvim_treesitter#foldexpr()",
-	foldnestmax = 4,
-	foldlevel = 99,
-	foldlevelstart = 1,
 }
 
 vim.opt.shortmess:append("c")
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index f3e7030..b27e33f 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -3,7 +3,15 @@ return require("packer").startup({
 		use("wbthomason/packer.nvim")
 		use("nvim-lua/plenary.nvim")
 		use("neovim/nvim-lspconfig")
-		use("bluz71/vim-moonfly-colors")
+		use({
+			"srt0/codescope.nvim",
+			config = function()
+				require("codescope").setup({
+					transparent = false, -- Set to true for transparency
+				})
+				vim.cmd.colorscheme("codescope")
+			end,
+		})
 		use("Snyssfx/goerr-nvim")
 		use({
 			"lukas-reineke/indent-blankline.nvim",
@@ -15,7 +23,24 @@ return require("packer").startup({
 			"rcarriga/nvim-dap-ui",
 			requires = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" },
 			config = function()
-				require("dapui").setup()
+				local dap, dapui = require("dap"), require("dapui")
+				dapui.setup()
+				dap.listeners.before.attach.dapui_config = function()
+					dapui.open()
+					vim.cmd(":NvimTreeClose<CR>")
+				end
+				dap.listeners.before.launch.dapui_config = function()
+					dapui.open()
+					vim.cmd(":NvimTreeClose<CR>")
+				end
+				dap.listeners.before.event_terminated.dapui_config = function()
+					dapui.close()
+					vim.cmd(":NvimTreeOpen<CR>")
+				end
+				dap.listeners.before.event_exited.dapui_config = function()
+					dapui.close()
+					vim.cmd(":NvimTreeOpen<CR>")
+				end
 			end,
 		})
 		use({