From e7c5986b794aa0a6a12bd9a6f46d949c3d13b9db Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Tue, 30 Jul 2024 13:39:06 -0400
Subject: [PATCH] feat(nvim): upgrade to nvim v10 and nixvim unstable

---
 flake.nix                                     |  4 +-
 .../languages/treesitter/treesitter.nix       |  5 ++-
 pkgs/nvim/config/none-ls/none-ls.nix          | 37 +++++++++----------
 pkgs/nvim/config/utils/flash.nix              | 26 +++++++------
 pkgs/nvim/default.nix                         |  7 ++--
 5 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/flake.nix b/flake.nix
index c5e4934..8351884 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,8 +22,8 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     treefmt-nix.url = "github:numtide/treefmt-nix";
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.05";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "unstable";
     };
     rust-overlay.url = "github:oxalica/rust-overlay";
     nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
diff --git a/pkgs/nvim/config/languages/treesitter/treesitter.nix b/pkgs/nvim/config/languages/treesitter/treesitter.nix
index 8ff420f..d35a9c7 100644
--- a/pkgs/nvim/config/languages/treesitter/treesitter.nix
+++ b/pkgs/nvim/config/languages/treesitter/treesitter.nix
@@ -1,8 +1,11 @@
 {
   plugins.treesitter = {
     enable = true;
-    indent = true;
     folding = true;
     nixvimInjections = true;
+    settings = {
+      highlight.enable = true;
+      indent.enable = true;
+    };
   };
 }
diff --git a/pkgs/nvim/config/none-ls/none-ls.nix b/pkgs/nvim/config/none-ls/none-ls.nix
index 5eaaf6d..9e3d8f9 100644
--- a/pkgs/nvim/config/none-ls/none-ls.nix
+++ b/pkgs/nvim/config/none-ls/none-ls.nix
@@ -2,21 +2,23 @@
   plugins.none-ls = {
     enable = false;
     enableLspFormat = false;
-    updateInInsert = false;
-    onAttach = ''
-      function(client, bufnr)
-          if client.supports_method "textDocument/formatting" then
-            vim.api.nvim_clear_autocmds { group = augroup, buffer = bufnr }
-            vim.api.nvim_create_autocmd("BufWritePre", {
-              group = augroup,
-              buffer = bufnr,
-              callback = function()
-                vim.lsp.buf.format { bufnr = bufnr }
-              end,
-            })
+    settings = {
+      update_in_insert = false;
+      on_attach = ''
+        function(client, bufnr)
+            if client.supports_method "textDocument/formatting" then
+              vim.api.nvim_clear_autocmds { group = augroup, buffer = bufnr }
+              vim.api.nvim_create_autocmd("BufWritePre", {
+                group = augroup,
+                buffer = bufnr,
+                callback = function()
+                  vim.lsp.buf.format { bufnr = bufnr }
+                end,
+              })
+            end
           end
-        end
-    '';
+      '';
+    };
     sources = {
       code_actions = {
         gitsigns.enable = true;
@@ -36,11 +38,6 @@
         };
         prettier = {
           enable = true;
-          withArgs = ''
-            {
-              extra_args = { "--no-semi", "--single-quote" },
-            }
-          '';
         };
         google_java_format = {
           enable = true;
@@ -50,7 +47,7 @@
         };
         black = {
           enable = true;
-          withArgs = ''
+          settings = ''
             {
               extra_args = { "--fast" },
             }
diff --git a/pkgs/nvim/config/utils/flash.nix b/pkgs/nvim/config/utils/flash.nix
index b531743..b53f057 100644
--- a/pkgs/nvim/config/utils/flash.nix
+++ b/pkgs/nvim/config/utils/flash.nix
@@ -1,18 +1,20 @@
 {
   plugins.flash = {
     enable = false;
-    labels = "asdfghjklqwertyuiopzxcvbnm";
-    search = {
-      mode = "fuzzy";
-    };
-    jump = {
-      autojump = true;
-    };
-    label = {
-      uppercase = false;
-      rainbow = {
-        enabled = false;
-        shade = 5;
+    settings = {
+      labels = "asdfghjklqwertyuiopzxcvbnm";
+      search = {
+        mode = "fuzzy";
+      };
+      jump = {
+        autojump = true;
+      };
+      label = {
+        uppercase = false;
+        rainbow = {
+          enabled = false;
+          shade = 5;
+        };
       };
     };
   };
diff --git a/pkgs/nvim/default.nix b/pkgs/nvim/default.nix
index 079b173..f5852fd 100644
--- a/pkgs/nvim/default.nix
+++ b/pkgs/nvim/default.nix
@@ -3,12 +3,13 @@
   inputs,
   ...
 }: let
-  system = pkgs.system;
+  inherit (pkgs) system;
   nixvim = inputs.nixvim.legacyPackages.${system};
   icons = import ./config/icons.nix;
   nixvimModule = {
-    inherit pkgs;
+    pkgs = inputs.unstable.legacyPackages.${system};
     module = import ./config;
     extraSpecialArgs = {inherit icons;};
   };
-in (nixvim.makeNixvimWithModule nixvimModule)
+in
+  nixvim.makeNixvimWithModule nixvimModule