Вс 15 июн 2025 16:32:01 MSK

4 files changed, 29 insertions, 16 deletions

diff --git a/config/nvim/lua/autocommands.lua b/config/nvim/lua/autocommands.lua
index 802d9e9..1225718 100644
--- a/config/nvim/lua/autocommands.lua
+++ b/config/nvim/lua/autocommands.lua
@@ -85,12 +85,6 @@ vim.api.nvim_create_autocmd("BufEnter", {
 	end,
 })
 
-vim.api.nvim_create_autocmd({ "BufEnter", "BufAdd", "BufNew", "BufNewFile", "BufWinEnter" }, {
-	group = vim.api.nvim_create_augroup("TS_FOLD_WORKAROUND", {}),
-	callback = function()
-		-- vim.cmd([[normal zR]])
-	end,
-})
 vim.api.nvim_create_autocmd("FileType", {
 	pattern = "*",
 	callback = function(args)
@@ -129,6 +123,7 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
 		require("nvim-tree.api").tree.open()
 	end,
 })
+
 vim.api.nvim_create_autocmd("FileType", {
 	pattern = "go",
 	callback = function()
@@ -140,17 +135,12 @@ vim.api.nvim_create_autocmd("FileType", {
 		vim.opt_local.cindent = false
 	end,
 })
+
 vim.filetype.add({
 	extension = {
 		hjson = "hjson",
 	},
 })
-vim.api.nvim_create_autocmd("VimResized", {
-	pattern = "*",
-	callback = function()
-		vim.opt.scrolloff = vim.fn.floor(vim.fn.winheight(0) / 2)
-	end,
-})
 
 vim.api.nvim_create_autocmd("InsertEnter", {
 	pattern = "*",
diff --git a/config/nvim/lua/options.lua b/config/nvim/lua/options.lua
index 8d55306..d80d242 100644
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -29,15 +29,11 @@ local options = {
 	numberwidth = 4,
 	signcolumn = "yes",
 	wrap = true,
-	scrolloff = 8,
-	sidescrolloff = 8,
 	syntax = "on",
 	foldmethod = "expr",
 	foldexpr = "v:lua.vim.treesitter.foldexpr()",
-	-- foldexpr = "nvim_treesitter#foldexpr()"
 	foldnestmax = 10,
 	foldlevel = 9,
-	-- foldlevelstart = 99,
 	scrolloff = 999,
 	so = vim.fn.floor(vim.fn.winheight(0) / 2),
 	guicursor = "n-v-c:block,i-ci-ve:hor10,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175",
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 0e9701d..26bc1e8 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -27,6 +27,7 @@ require("lazy").setup({
 	require("plugins.lualine"),
 	require("plugins.telescope"),
 	require("plugins.columns"),
+	require("plugins.zk"),
 }, {
 	performance = {
 		rtp = {
diff --git a/config/nvim/lua/plugins/zk.lua b/config/nvim/lua/plugins/zk.lua
new file mode 100644
index 0000000..1640b77
--- /dev/null
+++ b/config/nvim/lua/plugins/zk.lua
@@ -0,0 +1,26 @@
+return {
+	"zk-org/zk-nvim",
+	version = "v0.3.0",
+	config = function()
+		require("zk").setup({
+			picker = "telescope",
+
+			lsp = {
+				-- `config` is passed to `vim.lsp.start(config)`
+				config = {
+					name = "zk",
+					cmd = { "zk", "lsp" },
+					filetypes = { "markdown" },
+					-- on_attach = ...
+					-- etc, see `:h vim.lsp.start()`
+				},
+
+				-- automatically attach buffers in a zk notebook that match the given filetypes
+				auto_attach = {
+					enabled = true,
+					filetypes = { "markdown" }, -- moved to lsp.config above
+				},
+			},
+		})
+	end,
+}