less

programs/nvim/default.nix

@@ -5,10 +5,12 @@ inputs@{ machine, ... }:
     inherit inputs;
     requirements = [ "cli" ];
     home-config =
-      { pkgs
-      , flakes
-      , lib
-      , ...
+      {
+        pkgs,
+        pkgs-unstable,
+        flakes,
+        lib,
+        ...
       }:
       let
         nvim_mime_types = [
@@ -50,6 +52,10 @@ inputs@{ machine, ... }:
           sessionVariables = {
             EDITOR = "nvim";
           };
+
+          packages = with pkgs-unstable; [
+            tree-sitter
+          ];
         };
 
         home.file.".local/share/applications/${desktop-entry-name}.desktop" = {
@@ -57,11 +63,9 @@ inputs@{ machine, ... }:
         };
 
         xdg.mimeApps.associations.added = lib.mergeAttrsList (
-          map
-            (mime: {
-              ${mime} = [ "${desktop-entry-name}.desktop" ];
-            })
-            nvim_mime_types
+          map (mime: {
+            ${mime} = [ "${desktop-entry-name}.desktop" ];
+          }) nvim_mime_types
         );
 
         imports = [
@@ -90,11 +94,10 @@ inputs@{ machine, ... }:
           performance = {
             byteCompileLua.enable = true;
             combinePlugins = {
-              enable = true;
+              enable = false;
 
               standalonePlugins = [
                 # clashes with lualine
-                "onedark.nvim"
               ];
             };
           };
@@ -103,7 +106,8 @@ inputs@{ machine, ... }:
           extraPackages = [ pkgs.imagemagick ];
 
           # package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped;
-          package = pkgs.neovim-unwrapped;
+          # package = pkgs.neovim-unwrapped;
+          package = with pkgs-unstable; neovim-unwrapped;
 
           colorschemes.onedark = {
             enable = true;