From add1882062071480e353c68d1d42eaaa1d54c933 Mon Sep 17 00:00:00 2001 From: Dario48 Date: Thu, 6 Aug 2026 20:18:28 +0200 Subject: [PATCH 1/8] attept at a better linting experience --- lua/plugins/nvim-lint.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/nvim-lint.lua b/lua/plugins/nvim-lint.lua index 4d95fd4..66ddb1f 100644 --- a/lua/plugins/nvim-lint.lua +++ b/lua/plugins/nvim-lint.lua @@ -16,6 +16,7 @@ return { underline = true, update_in_insert = false, virtual_text = true, + virtual_lines = { current_line = true }, }) require("lint").linters_by_ft = require("mason-bridge").get_linters() From dac9d33960a6d4026d437a5015f69bb70d8e1eff Mon Sep 17 00:00:00 2001 From: Dario48 Date: Fri, 21 Aug 2026 14:44:25 +0200 Subject: [PATCH 2/8] blink.lib + neorg --- init.lua | 2 +- lua/plugins/blink-cmp.lua | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/init.lua b/init.lua index 1d18b23..3ed62a3 100644 --- a/init.lua +++ b/init.lua @@ -13,7 +13,7 @@ local plugins = { "treesitter", "nvim-lint", - -- "neorg", + "neorg", "nightfox", diff --git a/lua/plugins/blink-cmp.lua b/lua/plugins/blink-cmp.lua index ebe1919..dcee929 100644 --- a/lua/plugins/blink-cmp.lua +++ b/lua/plugins/blink-cmp.lua @@ -7,8 +7,10 @@ return { require("lazydev").setup({}) load("rafamadriz/friendly-snippets") + load("saghen/blink.lib") load("saghen/blink.cmp") + ---@module "blink.cmp" require("blink.cmp").setup({ keymap = { preset = "super-tab" }, @@ -47,22 +49,7 @@ return { end, onUpdate = function() vim.notify("Building blink.cmp", vim.log.levels.INFO) - local cmd - if vim.fn.executable("nix") == 1 then - cmd = { "nix", "run", ".#build-plugin" } - elseif vim.fn.executable("cargo") == 1 then - cmd = { "cargo", "build", "--release" } - else - print("either cargo or nix is needed to build blink.cmp fzf") - return - end - local obj = vim.system(cmd, { cwd = vim.pack.get({ "blink.cmp" })[1].path }) - :wait() - if obj.code == 0 then - vim.notify("Building blink.cmp done", vim.log.levels.INFO) - else - vim.notify("Building blink.cmp failed", vim.log.levels.ERROR) - end + require('blink.cmp').build():pwait() end, } From c9e686a19d366593d04b96442f954b17929b00be Mon Sep 17 00:00:00 2001 From: Dario48 Date: Fri, 21 Aug 2026 16:19:13 +0200 Subject: [PATCH 3/8] remove outdated plugin --- lua/plugins/neorg.lua | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index f84e0d3..6580206 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -5,17 +5,9 @@ return { configure = function(load) load("nvim-neotest/nvim-nio") load("pysan3/pathlib.nvim") - load("nvim-neorg/lua-utils.nvim") - load("juniorsundar/neorg-extras") load("nvim-neorg/neorg") require("neorg").setup({ load = { - ["external.many-mans"] = { - config = { - metadata_fold = true, -- If want @data property ... @end to fold - code_fold = true, -- If want @code ... @end to fold - }, - }, ["core.defaults"] = {}, ["core.concealer"] = {}, -- ["core.completion"] = { config = { engine = "nvim-cmp" } }, From 35718a7b1ccd32c31102045a1ffaf0c3be7971fc Mon Sep 17 00:00:00 2001 From: Dario48 Date: Fri, 21 Aug 2026 16:22:31 +0200 Subject: [PATCH 4/8] remove outdated plugin --- lua/plugins/neorg.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index 6580206..92fc851 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -5,6 +5,7 @@ return { configure = function(load) load("nvim-neotest/nvim-nio") load("pysan3/pathlib.nvim") + load("nvim-neorg/lua-utils.nvim") load("nvim-neorg/neorg") require("neorg").setup({ load = { From 9c2b8d00aa1d6dc4572eb1682ae178876631ab0d Mon Sep 17 00:00:00 2001 From: Dario48 Date: Fri, 21 Aug 2026 16:27:39 +0200 Subject: [PATCH 5/8] added parser install --- lua/plugins/neorg.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index 92fc851..33e7a4e 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -27,5 +27,6 @@ return { }, }, }) + require("nvim-treesitter").install({ "norg", "norg_meta" }):wait(300000) end, } From 408555ba205af506b1980f0b6c9cb8f0615d8a57 Mon Sep 17 00:00:00 2001 From: Dario48 Date: Fri, 21 Aug 2026 17:10:12 +0200 Subject: [PATCH 6/8] add treesitter hopefully --- lua/plugins/neorg.lua | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index 33e7a4e..7943a4b 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -6,13 +6,46 @@ return { load("nvim-neotest/nvim-nio") load("pysan3/pathlib.nvim") load("nvim-neorg/lua-utils.nvim") + load("nvim-neorg/tree-sitter-norg") + -- parser {{{ + local data = vim.fn.stdpath("data") + local src = data .. "/site/pack/core/opt/tree-sitter-norg" + local src_meta = data .. "/site/pack/core/opt/tree-sitter-norg-meta" + local parser_dir = data .. "/site/parser" + local out = parser_dir .. "/norg.so" + local out_meta = parser_dir .. "/norg_meta.so" + + + if not vim.uv.fs_stat(out) and vim.uv.fs_stat(src) then + -- not already built, and present + vim.fn.mkdir(parser_dir, "p") + local result = vim.system({ "nix", "build" }, { cwd = src }):wait() + if result.code == 0 then + vim.system({ "cp", "result/lib/lua/5.1/parser/norg.so", out }, { cwd = src }):wait() + else + vim.notify("failed to run nix build for norg treesitter, got result " .. tostring(result), + vim.log.levels.ERROR) + end + result = vim.system({ "nix", "build" }, { cwd = src_meta }):wait() + if result.code == 0 then + vim.system({ "cp", "result/parser", out_meta }, { cwd = src_meta }):wait() + else + vim.notify("failed to run nix build for norg_meta treesitter, got result " .. tostring(result), + vim.log.levels.ERROR) + end + end + + -- }}} + load("nvim-neorg/neorg") require("neorg").setup({ load = { ["core.defaults"] = {}, ["core.concealer"] = {}, -- ["core.completion"] = { config = { engine = "nvim-cmp" } }, - -- ["core.integrations.treesitter"] = {}, + ["core.integrations.treesitter"] = { + config = { configure_parsers = false }, + }, ["core.clipboard.code-blocks"] = {}, ["core.esupports.indent"] = {}, ["core.dirman"] = { From 63d295a739ec4341dd80fa1f41c69a9677112cc6 Mon Sep 17 00:00:00 2001 From: Dario48 Date: Fri, 21 Aug 2026 17:12:45 +0200 Subject: [PATCH 7/8] add treesitter hopefully --- lua/plugins/neorg.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index 7943a4b..cd9e598 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -12,13 +12,14 @@ return { local src = data .. "/site/pack/core/opt/tree-sitter-norg" local src_meta = data .. "/site/pack/core/opt/tree-sitter-norg-meta" local parser_dir = data .. "/site/parser" + vim.fn.mkdir(parser_dir, "p") + local out = parser_dir .. "/norg.so" local out_meta = parser_dir .. "/norg_meta.so" if not vim.uv.fs_stat(out) and vim.uv.fs_stat(src) then - -- not already built, and present - vim.fn.mkdir(parser_dir, "p") + -- not already built, and src present local result = vim.system({ "nix", "build" }, { cwd = src }):wait() if result.code == 0 then vim.system({ "cp", "result/lib/lua/5.1/parser/norg.so", out }, { cwd = src }):wait() @@ -26,7 +27,10 @@ return { vim.notify("failed to run nix build for norg treesitter, got result " .. tostring(result), vim.log.levels.ERROR) end - result = vim.system({ "nix", "build" }, { cwd = src_meta }):wait() + end + if not vim.uv.fs_stat(out_meta) and vim.uv.fs_stat(src_meta) then + -- not already built, and src present + local result = vim.system({ "nix", "build" }, { cwd = src_meta }):wait() if result.code == 0 then vim.system({ "cp", "result/parser", out_meta }, { cwd = src_meta }):wait() else From 327651d68dd8fa3ba184e43485c723011bcc25f6 Mon Sep 17 00:00:00 2001 From: Dario48 Date: Fri, 21 Aug 2026 17:15:03 +0200 Subject: [PATCH 8/8] remove thing that not exist --- lua/plugins/neorg.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index cd9e598..9294fcc 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -64,6 +64,5 @@ return { }, }, }) - require("nvim-treesitter").install({ "norg", "norg_meta" }):wait(300000) end, }