From 28961fe11446ac25acaf605768f70d35034b4581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sun, 8 Oct 2023 13:32:42 +0200
Subject: [PATCH] feat(nvim): update null-ls-nvim

---
 flake.lock                                      | 17 +++++++++++++++++
 flake.nix                                       |  2 ++
 modules/programs/nvim/default.nix               |  6 ++++++
 .../programs/nvim/plugins/lua/null-ls-nvim.lua  |  6 ++++++
 overlays/vimPlugins.nix                         |  5 +++++
 5 files changed, 36 insertions(+)

diff --git a/flake.lock b/flake.lock
index 297db61..926e2e1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -930,6 +930,22 @@
         "type": "github"
       }
     },
+    "none-ls-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696658105,
+        "narHash": "sha256-4+B2F4ZweWTqXlhSs0jiBaKSv52G4X7p37KHfYl6sPo=",
+        "owner": "nvimtools",
+        "repo": "none-ls.nvim",
+        "rev": "ae339f45590cc421a68de885fc5a3261cc247362",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvimtools",
+        "repo": "none-ls.nvim",
+        "type": "github"
+      }
+    },
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
@@ -1040,6 +1056,7 @@
         "nix-lazy-nvim": "nix-lazy-nvim",
         "nix-super": "nix-super",
         "nixpkgs": "nixpkgs_8",
+        "none-ls-nvim": "none-ls-nvim",
         "nvim-lspconfig": "nvim-lspconfig",
         "nvim-puppeteer": "nvim-puppeteer",
         "nvim-treesitter": "nvim-treesitter",
diff --git a/flake.nix b/flake.nix
index e086c52..282e8af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,6 +48,8 @@
     telekasten-nvim.url = "github:renerocksai/telekasten.nvim";
     telescope-nvim.flake = false;
     telescope-nvim.url = "github:nvim-telescope/telescope.nvim";
+    none-ls-nvim.flake = false;
+    none-ls-nvim.url = "github:nvimtools/none-ls.nvim";
 
     # Hyprland
     hypr-contrib.url = "github:hyprwm/contrib";
diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 96e7683..a7fdfcd 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -30,12 +30,17 @@ in
           [
             alejandra
             black
+            checkmake
             deadnix
+            dotenv-linter
+            fish
             isort
             jq
             nixd
             nixpkgs-fmt
             nodePackages.bash-language-server
+            nodePackages.jsonlint
+            ruff-lsp
             rustfmt
             shellcheck
             shfmt
@@ -46,6 +51,7 @@ in
             typst
             typst-lsp
             yamlfmt
+            yamllint
           ];
         extraLuaConfig = readFile ./options.lua;
         lazy.enable = true;
diff --git a/modules/programs/nvim/plugins/lua/null-ls-nvim.lua b/modules/programs/nvim/plugins/lua/null-ls-nvim.lua
index 6701630..32a1f7e 100644
--- a/modules/programs/nvim/plugins/lua/null-ls-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/null-ls-nvim.lua
@@ -8,9 +8,15 @@ null_ls.setup({
     -- Completion
     null_ls.builtins.completion.spell,
     -- Diagnostics
+    null_ls.builtins.diagnostics.checkmake,
     null_ls.builtins.diagnostics.deadnix,
+    null_ls.builtins.diagnostics.dotenv_linter,
+    null_ls.builtins.diagnostics.fish,
+    null_ls.builtins.diagnostics.jsonlint,
     null_ls.builtins.diagnostics.shellcheck,
     null_ls.builtins.diagnostics.statix,
+    null_ls.builtins.diagnostics.trail_space,
+    null_ls.builtins.diagnostics.yamllint,
   },
 })
 
diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix
index e1e564a..dda9ccb 100644
--- a/overlays/vimPlugins.nix
+++ b/overlays/vimPlugins.nix
@@ -51,5 +51,10 @@ with lib.my;
       version = mkVersionInput inputs.nvim-puppeteer;
       src = inputs.nvim-puppeteer;
     };
+
+    null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (a: {
+      version = mkVersionInput inputs.none-ls-nvim;
+      src = inputs.none-ls-nvim;
+    });
   };
 }