From fc913dd80cd9287c46db9c277d7e9300174c0cde Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin+dev@familleboyer.net>
Date: Wed, 17 Dec 2025 22:40:31 +0100
Subject: [PATCH] neovim: Remove helpers usage

---
 neovim/config/default.nix | 9 ++++-----
 neovim/config/lsp.nix     | 7 +++----
 neovim/config/notes.nix   | 6 +++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/neovim/config/default.nix b/neovim/config/default.nix
index 46074e6..1e85061 100644
--- a/neovim/config/default.nix
+++ b/neovim/config/default.nix
@@ -2,7 +2,6 @@
 {
   pkgs,
   config,
-  helpers,
   lib,
   ...
 }:
@@ -80,7 +79,7 @@
         ".cph"
       ];
       group = "BigFileOptimizer";
-      callback = helpers.mkRaw ''
+      callback = lib.nixvim.mkRaw ''
         function(auEvent)
           local bufferCurrentLinesCount = vim.api.nvim_buf_line_count(0)
 
@@ -153,7 +152,7 @@
         );
       nm = modeKeys [ "n" ];
     in
-    helpers.keymaps.mkKeymaps { options.silent = true; } (nm {
+    lib.nixvim.keymaps.mkKeymaps { options.silent = true; } (nm {
       "ft" = "<cmd>Neotree<CR>";
       "fG" = "<cmd>Neotree git_status<CR>";
       "fR" = "<cmd>Neotree remote<CR>";
@@ -182,7 +181,7 @@
         options.desc = "history";
       };
       "<leader>wS" = {
-        action = helpers.mkRaw ''
+        action = lib.nixvim.mkRaw ''
           function()
             require('telescope.builtin').live_grep({
               cwd = "~/wiki",
@@ -197,7 +196,7 @@
       {
         key = "<leader>rn";
         mode = [ "n" ];
-        action = helpers.mkRaw ''
+        action = lib.nixvim.mkRaw ''
           function()
           	return ":IncRename " .. vim.fn.expand("<cword>")
           end
diff --git a/neovim/config/lsp.nix b/neovim/config/lsp.nix
index 5afc1d0..bf30a58 100644
--- a/neovim/config/lsp.nix
+++ b/neovim/config/lsp.nix
@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  helpers,
   flake,
   config,
   ...
@@ -106,11 +105,11 @@
       html = {
         formatter = [
           "prettier"
-          (helpers.mkRaw "djlint_fmt")
+          (lib.nixvim.mkRaw "djlint_fmt")
         ];
       };
       htmldjango = {
-        formatter = [ (helpers.mkRaw "djlint_fmt") ];
+        formatter = [ (lib.nixvim.mkRaw "djlint_fmt") ];
         linter = "djlint";
       };
       json = {
@@ -217,7 +216,7 @@
       ltex = {
         enable = true;
         config = {
-          on_attach = helpers.mkRaw ''
+          on_attach = lib.nixvim.mkRaw ''
             function(client, bufnr)
               require("ltex_extra").setup{
                 load_langs = { "en-US", "fr-FR" },
diff --git a/neovim/config/notes.nix b/neovim/config/notes.nix
index fe6e47a..d5ff498 100644
--- a/neovim/config/notes.nix
+++ b/neovim/config/notes.nix
@@ -1,10 +1,10 @@
-{ helpers, pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   autoCmd = [
     {
       event = [ "User" ];
       pattern = [ "WikiBufferInitialized" ];
-      callback = helpers.mkRaw ''
+      callback = lib.nixvim.mkRaw ''
         function()
           vim.diagnostic.disable(0)
         end
@@ -16,7 +16,7 @@
     autoCmd = [
       {
         event = [ "InsertEnter" ];
-        callback = helpers.mkRaw ''
+        callback = lib.nixvim.mkRaw ''
           function()
             vim.cmd("Markview disable")
             -- vim.cmd("DiagramBuf disable")