nixpkgs/neovim: update flake.lock and packages

.config/nixpkgs/neovim/flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740547748,
-        "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=",
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3a05eebede89661660945da1f151959900903b6a",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
         "type": "github"
       },
       "original": {

.config/nixpkgs/neovim/mappings.lua

@@ -12,6 +12,7 @@ vim.keymap.set({'n', 'v'}, 'k', 'gk', opts)
 
 -- leave insert mode with <ESC><ESC>
 vim.keymap.set('t', '<ESC><ESC>', '<C-\\><C-N>', opts)
+vim.keymap.set('t', '<C-[><C-[>', '<C-\\><C-N>', opts)
 
 -- select pasted text
 vim.keymap.set('n', 'gp', '`[v`]', opts)

.config/nixpkgs/neovim/neovim.nix

@@ -86,13 +86,14 @@ let
       let g:loaded_perl_provider = 0
 
       set runtimepath=${placeholder "out"}/lib,$VIMRUNTIME
-      set packpath=${placeholder "out"}/lib
+      set packpath=${placeholder "out"}/lib,$VIMRUNTIME
 
       lua <<EOF
       -- make sure docs in our packpath are marked as help
       vim.filetype.add({
         pattern = {
-          [vim.o.packpath:gsub('[%.%-]', '%%%0') .. '/pack/.*/doc/.*%.txt'] = 'help'
+          [os.getenv("VIMRUNTIME"):gsub('[%.%-]', '%%%0') .. '/doc/.*%.txt'] = 'help',
+          ['.*/pack/.*/doc/.*%.txt'] = 'help',
         }
       })
       EOF

.config/nixpkgs/neovim/plugins/sources.json

@@ -16,48 +16,48 @@
     "sha256": "1yvpk0cnsx1b1q2wp52fv4mj71w8ssz4dcbbdix65m8qna6d0m9h"
   },
   "mbbill/undotree": {
-    "rev": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f",
-    "sha256": "0cd6xw71aa51qr5vvg53y7hh2vlc7dzc1r7cldcgf31fn5md2ffh"
+    "rev": "b951b87b46c34356d44aa71886aecf9dd7f5788a",
+    "sha256": "0vp4wl4kiby7dlchki975fq682sw8c1vr9c6nhcndmxyhx7ghrqw"
   },
   "Wansmer/treesj": {
-    "rev": "48c1a7539f376fd40ceb9cf12d697040fcf90649",
-    "sha256": "0yha205ajwqz4y1a5l5qh35mivaz2ql1vqfky2cxy90zndq8g08r"
+    "rev": "f4049f8ba2177e7c5c03fb9e34d4e039c685d744",
+    "sha256": "01dfifx4cw4kkqgix1hd92q6capg4rmdhnzpjxddcq9rnlb0xgi4"
   },
   "nvim-telescope/telescope.nvim": {
-    "rev": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4",
-    "sha256": "0lbsq6x5bf7l54x7rkdkh7pa63afsgf0jnm0zf9ig7fw2lh18b8f"
+    "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5",
+    "sha256": "0vc2fr5nhbc39d55zn09fh8zpy4472ic4xmwvmk5dda8fqw76p8q"
   },
   "nvim-telescope/telescope-fzf-native.nvim": {
-    "rev": "2a5ceff981501cff8f46871d5402cd3378a8ab6a",
-    "sha256": "0n5yaslwmjn2057njyn604wb60zhqgad439zxaafd7qmvyjazlfi"
+    "rev": "1f08ed60cafc8f6168b72b80be2b2ea149813e55",
+    "sha256": "137a05qwbpcrcrfj4az7dwx5a43yyfib4crx1hi8bhjx9j5gqav7"
   },
   "nvim-lua/plenary.nvim": {
     "rev": "857c5ac632080dba10aae49dba902ce3abf91b35",
     "sha256": "0jxx9nfga7z87v78cifglqs8w4mrpf99wcp483kb0hbv6537jmgh"
   },
   "echasnovski/mini.nvim": {
-    "rev": "3a354c754656538ad76d1add93ca21e75b7f3181",
-    "sha256": "0h7apm2snx5j4jbmlwwk3qw0n1ng1nxcwdgc4i7fawz0a2jg8c5i"
+    "rev": "2b3cd8127258f78c7c18b1a5d32af578389b32ce",
+    "sha256": "164vkikwb0iykignh120sn8jldxiazkpdsbzbap0lnj8cy9j9hi8"
   },
   "lewis6991/gitsigns.nvim": {
-    "rev": "4c40357994f386e72be92a46f41fc1664c84c87d",
-    "sha256": "1d3i82g5barb9afk7ra3gmcwwjvaqp49sbdz0acki4a0yc80m31w"
+    "rev": "2149fc2009d1117d58e86e56836f70c969f60a82",
+    "sha256": "01h4lx190vd25vnr1zmmzsi195v45f83dvsisgrqvbqgrbdkhr7d"
   },
   "neovim/nvim-lspconfig": {
-    "rev": "d793c5cb0206d976a38e70e62479a60ba87722ca",
-    "sha256": "1sshkb34w57s306grfgfgc1lbxbr7g93xdanj7hpa7m1f1ais0wk"
+    "rev": "5dae152ee422ed9383217965aff92b331c4c248e",
+    "sha256": "055fc8xpzjvrz9zmzqlnl6wb3cqdqh34ljg6rngxzb3g3fljdpfr"
   },
   "nvim-treesitter/nvim-treesitter-textobjects": {
-    "rev": "88fce4e6496950dab867a7c63a819df0ead56751",
-    "sha256": "13rxfmc8w10lv3z0yljgv2ld45v7vwy6ccdr76d43x08d96wcxm9"
+    "rev": "205e3369bc83d8cb83f7409c36120e24611f8c5c",
+    "sha256": "13qmsnahlj88wxs75kvpn9hj89gnhm4dm6rb400ysrzmmx5ypg39"
   },
   "jose-elias-alvarez/typescript.nvim": {
     "rev": "4de85ef699d7e6010528dcfbddc2ed4c2c421467",
     "sha256": "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm"
   },
   "sainnhe/sonokai": {
-    "rev": "9679341d4141ed81376f2bdf5e69b78dc348d212",
-    "sha256": "1jbkfcs3ylsv2xsldjalp9agm4w7c5gda5kaawlrxcfngrh0pvnk"
+    "rev": "f59c796780655c3b9da442d310ad2f2d735f2e56",
+    "sha256": "0sxf6z3yzg4hggad172ljy6vxpnfll9q84pqa7n40m26g2alg29x"
   },
   "LnL7/vim-nix": {
     "rev": "7235c7ce2cea530cb6b59bc3e46d4bfe917d15c8",
@@ -69,24 +69,24 @@
     "sha256": "07q3kss0f6ggil2h4jcfxkwy0gm3q7bl3p4ysy725vnnmhhhlzkx"
   },
   "hrsh7th/cmp-nvim-lsp": {
-    "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
+    "rev": "a8912b88ce488f411177fc8aed358b04dc246d7b",
     "sha256": "08q5mf5jrqjjcl1s4h9zj2vd1kcizz0a5a6p65wv1rc5s1fa3a49"
   },
   "hrsh7th/nvim-cmp": {
-    "rev": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3",
-    "sha256": "06n3barrl80i0y43q250l49q07f7hry9w5ggwlimv7jxvilih43l"
+    "rev": "b5311ab3ed9c846b585c0c15b7559be131ec4be9",
+    "sha256": "07674djcyac9wlj08y9p5gsmdpsm8zxjfgk3fwyvvx8j7qyzx74p"
   },
   "hrsh7th/cmp-vsnip": {
     "rev": "989a8a73c44e926199bfd05fa7a516d51f2d2752",
     "sha256": "1hs1gv7q0vfn82pwdwpy46nsi4n5z6yljnzl0rpvwfp8g79hssfs"
   },
   "hrsh7th/vim-vsnip": {
-    "rev": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9",
-    "sha256": "06j0fph91x3gdhbf9bb0yv95j34gf827p97vak0l4jb0ib7vmyc2"
+    "rev": "0a4b8419e44f47c57eec4c90df17567ad4b1b36e",
+    "sha256": "141abjf19l2srzniyg3xd8bv7r7zb1ns3mnxpzmqhss7id3vh5mx"
   },
   "nvim-treesitter/nvim-treesitter": {
-    "rev": "99487eb34a397befce8182ff63347a21c5f4b881",
-    "sha256": "0y8r0krlny0xwbsl65q7rw70w116dm5iszq2yq762n4k0mwj51cf"
+    "rev": "684eeac91ed8e297685a97ef70031d19ac1de25a",
+    "sha256": "00ccbnnvpcf0lrpbaygzz9wdnf59ixp43z0zry1qvblnjplrlwb7"
   },
   "bfredl/nvim-luadev": {
     "optional": true,
@@ -94,7 +94,7 @@
     "sha256": "0pvb25bdmx4hxs3g7pkdqfjg3qpnr9p5szzbqqwaw3lbdnbyykzy"
   },
   "nvim-treesitter/nvim-treesitter-context": {
-    "rev": "198720b4016af04c9590f375d714d5bf8afecc1a",
-    "sha256": "13msw9i509ncysbgkqbl2wr1c23iw3f4mxkw30sc1yk9x9nx49ri"
+    "rev": "6daca3ad780f045550b820f262002f35175a6c04",
+    "sha256": "0qprwd44hw9sz0vh14p6lpvs9vxrick462pfkradmal6ak1kfwn3"
   }
 }

.config/nixpkgs/neovim/plugins/treesitter-jsx.patch

@@ -1,12 +1,11 @@
 diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
-index a53b9533..deb3c159 100644
+index 0615d253..17dfc4d3 100644
 --- a/queries/jsx/highlights.scm
 +++ b/queries/jsx/highlights.scm
-@@ -65,87 +65,3 @@
- (jsx_text) @none @spell
+@@ -66,90 +66,6 @@
  
  (html_character_reference) @character.special
--
+ 
 -((jsx_element
 -  (jsx_opening_element
 -    name: (identifier) @_tag)
@@ -90,3 +89,7 @@ index a53b9533..deb3c159 100644
 -  (string
 -    (string_fragment) @string.special.url))
 -  (#any-of? @_attr "href" "src"))
+-
+ ((jsx_element) @_jsx_element
+   (#set! @_jsx_element bo.commentstring "{/* %s */}"))
+