nixpkgs/neovim: add treesitter text objects

.config/nixpkgs/neovim/flake.nix

@@ -6,69 +6,19 @@
     neovim-flake.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, neovim-flake }: {
-
-    overlay = final: prev: {
-      neovim-unwrapped = neovim-flake.packages.${prev.system}.neovim;
-    };
-
-    packages.x86_64-linux.default =
-      with import nixpkgs {
-        system = "x86_64-linux";
+  outputs = { self, nixpkgs, neovim-flake }:
+    let
+      withOverlay = system: import nixpkgs {
+        inherit system;
         overlays = [ self.overlay ];
       };
-      let
-        extraPath = [
-          fd
-          ripgrep
-          nodePackages.typescript-language-server
-          nodePackages.eslint_d
-        ];
-      in
-      neovim.override {
-        extraMakeWrapperArgs = "--prefix PATH : ${lib.makeBinPath extraPath}";
-        configure = {
-          customRC = ''
-            source ${./settings.lua}
-            source ${./plugins.lua}
-            source ${./mappings.lua}
-            source ${./autocmd.lua}
-            source ${./lsp.lua}
-            source ${./theme.lua}
-          '';
-          packages.myVimPackage = with vimPlugins; {
-            start = [
-              vim-sensible
-              vim-sleuth
-              vim-fugitive
-              vim-surround
-              vim-abolish
-              undotree
-              telescope-nvim
-              telescope-fzf-native-nvim
-              mini-nvim
-              gitsigns-nvim
-              sonokai
-
-              (nvim-treesitter.withPlugins (p: with p; [
-                tree-sitter-css
-                tree-sitter-go
-                tree-sitter-javascript
-                tree-sitter-json
-                tree-sitter-lua
-                tree-sitter-nix
-                tree-sitter-ruby
-                tree-sitter-tsx
-                tree-sitter-typescript
-              ]))
-
-              nvim-lspconfig
-              nvim-lsp-ts-utils
-              null-ls-nvim
-              fidget-nvim
-            ];
-          };
-        };
+    in
+    {
+      overlay = final: prev: {
+        neovim-unwrapped = neovim-flake.packages.${prev.system}.neovim;
       };
-  };
+
+      packages.x86_64-linux.default = (withOverlay "x86_64-linux").callPackage ./neovim.nix {};
+      packages.x86_64-linux.playground = (withOverlay "x86_64-linux").callPackage ./neovim.nix { withPlayground = true; };
+    };
 }

.config/nixpkgs/neovim/neovim.nix

@@ -0,0 +1,80 @@
+{ lib
+, writeTextFile
+, neovim
+, fd
+, ripgrep
+, nodePackages
+, vimPlugins
+, withPlayground ? false
+}:
+let
+  extra-treesitter-textobjects = writeTextFile {
+    name = "extra-treesitter-textobjects";
+    destination = "/after/queries/javascript/textobjects.scm";
+    text = ''
+      ; support swapping elements inside arrays too
+      (array "," . (_) @parameter.inner)
+      (array . (_) @parameter.inner ",")
+    '';
+  };
+  extraPath = [
+    fd
+    ripgrep
+    nodePackages.typescript-language-server
+    nodePackages.eslint_d
+  ];
+in
+neovim.override {
+  extraMakeWrapperArgs = "--prefix PATH : ${lib.makeBinPath extraPath}";
+  configure = {
+    customRC = ''
+      source ${./settings.lua}
+      source ${./plugins.lua}
+      source ${./mappings.lua}
+      source ${./autocmd.lua}
+      source ${./lsp.lua}
+      source ${./theme.lua}
+    '' + lib.optionalString withPlayground ''
+      source ${./playground.lua}
+    '';
+    packages.myVimPackage = with vimPlugins; {
+      start = [
+        vim-sensible
+        vim-sleuth
+        vim-fugitive
+        vim-surround
+        vim-abolish
+        undotree
+        telescope-nvim
+        telescope-fzf-native-nvim
+        mini-nvim
+        gitsigns-nvim
+        sonokai
+
+        (nvim-treesitter.withPlugins (p: with p; [
+          tree-sitter-bash
+          tree-sitter-css
+          tree-sitter-go
+          tree-sitter-javascript
+          tree-sitter-json
+          tree-sitter-lua
+          tree-sitter-nix
+          tree-sitter-ruby
+          tree-sitter-tsx
+          tree-sitter-typescript
+        ] ++ lib.optionals withPlayground [
+          tree-sitter-query
+        ]))
+        nvim-treesitter-textobjects
+        extra-treesitter-textobjects
+
+        nvim-lspconfig
+        nvim-lsp-ts-utils
+        null-ls-nvim
+        fidget-nvim
+      ] ++ lib.optionals withPlayground [
+        playground
+      ];
+    };
+  };
+}

.config/nixpkgs/neovim/playground.lua

@@ -0,0 +1,25 @@
+require "nvim-treesitter.configs".setup({
+  playground = {
+    enable = true,
+    disable = {},
+    updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+    persist_queries = false, -- Whether the query persists across vim sessions
+    keybindings = {
+      toggle_query_editor = 'o',
+      toggle_hl_groups = 'i',
+      toggle_injected_languages = 't',
+      toggle_anonymous_nodes = 'a',
+      toggle_language_display = 'I',
+      focus_language = 'f',
+      unfocus_language = 'F',
+      update = 'R',
+      goto_node = '<cr>',
+      show_help = '?',
+    },
+  },
+  query_linter = {
+    enable = true,
+    use_virtual_text = true,
+    lint_events = {"BufWrite", "CursorHold"},
+  },
+})

.config/nixpkgs/neovim/plugins.lua

@@ -78,4 +78,22 @@ require('nvim-treesitter.configs').setup({
   highlight = {
     enable = true,
   },
+  textobjects = {
+    select = {
+      enable = true,
+      keymaps = {
+        ['i,'] = '@parameter.inner',
+        ['a,'] = '@parameter.outer',
+      },
+    },
+    swap = {
+      enable = true,
+      swap_next = {
+        ['>,'] = '@parameter.inner',
+      },
+      swap_previous = {
+        ['<,'] = '@parameter.inner',
+      },
+    },
+  },
 })