.config/nixpkgs/neovim/flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1721933792,
-        "narHash": "sha256-zYVwABlQnxpbaHMfX6Wt9jhyQstFYwN2XjleOJV3VVg=",
+        "lastModified": 1728249353,
+        "narHash": "sha256-7NBJm1jfMeAowE1J2oljYqWVvI9X7FyyxBY4O8uB/Os=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2122a9b35b35719ad9a395fe783eabb092df01b1",
+        "rev": "c8a17040be4a20b29589cb4043a9e0c36af1930e",
         "type": "github"
       },
       "original": {

.config/nixpkgs/neovim/plugins.lua

@@ -258,6 +258,12 @@ require('treesj').setup({
   use_default_keymaps = false,
 })
 
+-- Treesitter context
+require('treesitter-context').setup({
+  enable = true,
+  multiline_threshold = 5,
+})
+
 -- completion
 local cmp = require('cmp')
 local cmp_types = require('cmp.types')

.config/nixpkgs/neovim/plugins/default.nix

@@ -6,6 +6,10 @@ let
     "nvim-telescope/telescope-fzf-native.nvim" = {
       dontBuild = false;
     };
+
+    "jose-elias-alvarez/typescript.nvim" = {
+      patches = [ ./typescript-nvim-tsserver.patch ];
+    };
   };
 
   buildPlugin = name: spec:

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

@@ -1,11 +1,11 @@
 {
   "tpope/vim-sleuth": {
-    "rev": "1cc4557420f215d02c4d2645a748a816c220e99b",
-    "sha256": "0l8mw3r6lb6q1p3afvf5psp6cg8vdi84b5j8whmdm83f4mynsn8a"
+    "rev": "be69bff86754b1aa5adcbb527d7fcd1635a84080",
+    "sha256": "0wqxdjgplf04nq428ialw1w03f8nh5vb629a17vl5gc9gf3zfanq"
   },
   "tpope/vim-fugitive": {
-    "rev": "0444df68cd1cdabc7453d6bd84099458327e5513",
-    "sha256": "0sx67lwz1f6kd2751qbbzpgq0hjik1g8x4svp788yvzbjdgdmc9l"
+    "rev": "d4877e54cef67f5af4f950935b1ade19ed6b7370",
+    "sha256": "17cf21k77fwsl67m4f1ln17dadz5i5g8fjhsw1cc1y1c3jn1xdh2"
   },
   "tpope/vim-rhubarb": {
     "rev": "ee69335de176d9325267b0fd2597a22901d927b1",
@@ -16,48 +16,48 @@
     "sha256": "1yvpk0cnsx1b1q2wp52fv4mj71w8ssz4dcbbdix65m8qna6d0m9h"
   },
   "mbbill/undotree": {
-    "rev": "56c684a805fe948936cda0d1b19505b84ad7e065",
-    "sha256": "1yy7y344b906z04rrnvy2hkrgsrxjm6ij399qmfw8b20rxdyi2jh"
+    "rev": "78b5241191852ffa9bb5da5ff2ee033160798c3b",
+    "sha256": "1w4sdbcvlicb3n4dpzv8l9g41xl3pqslni227lf88b4p5pjsfkax"
   },
   "Wansmer/treesj": {
-    "rev": "275f83c81a5a1f5ae23c1eac30c4ac28beebbca2",
-    "sha256": "0wjhhzs65myl3hrwi12v4vqgjcqdmkh5cczpx164vcxkqa0zz06p"
+    "rev": "0d81326b5afd36babe7dd480aabbb0b05f33e688",
+    "sha256": "0r2njhwbvia4rw919ncblyf9rgq3n1mqlsyl76jqjwiw6bccvzmr"
   },
   "nvim-telescope/telescope.nvim": {
-    "rev": "10b8a82b042caf50b78e619d92caf0910211973d",
-    "sha256": "0i6znzbcv5m87nakhqdqn5cfkghdhbfww5avd0x8m25a2lkgl77g"
+    "rev": "dc6fc321a5ba076697cca89c9d7ea43153276d81",
+    "sha256": "0jknzk7fi5w05zwl7l5yymgn80nb6sdlqmmkiqzrqn2808aaa4bf"
   },
   "nvim-telescope/telescope-fzf-native.nvim": {
     "rev": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b",
     "sha256": "0h741m7rcm5kl0mq9kkzw6za2h53chavpkai1qp433plaxzlyj0q"
   },
   "nvim-lua/plenary.nvim": {
-    "rev": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683",
-    "sha256": "0n2p8krzwiw682f0yb6n8faamffpp336rjy50pbqf3jmc6czd5z4"
+    "rev": "2d9b06177a975543726ce5c73fca176cedbffe9d",
+    "sha256": "1blmh0qr010jhydw61kiynll2m7q4xyrvrva8b5ipf1g81x8ysbf"
   },
   "echasnovski/mini.nvim": {
-    "rev": "657ef75b52a548090fb7906735517b7ddbf39e88",
-    "sha256": "11y3ga65pgn90fplx7nbyyp007s15ihpzknvla3sbbk96p2b0mq7"
+    "rev": "e52ac74bd4e9c0ce6a182ee551eb099236b5a89d",
+    "sha256": "18kl8hlrkgywq6s9lz53fy4wyzh76j8wpyic12dxhm57clc6hkny"
   },
   "lewis6991/gitsigns.nvim": {
-    "rev": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a",
-    "sha256": "07q5mh82p9y6h047xifj0fpan6ny6cb56y4ghymrvq1ziahi0xcw"
+    "rev": "863903631e676b33e8be2acb17512fdc1b80b4fb",
+    "sha256": "15mp1yh989njsj6fmklr4vxgzkbj4lmwzrgjqayqdf687vpkjrm3"
   },
   "neovim/nvim-lspconfig": {
-    "rev": "9c762dcd457d2ab99edb3f3433cea9865ded47ad",
-    "sha256": "0ydb8phh5iyd4k6nawlsy63cmm2pmgz41fxdsgk9259p15iv05ij"
+    "rev": "04680101ff79e99b4e33a4386ec27cbd0d360c75",
+    "sha256": "1qv90xhs7i9mqh66kar7awjz1vhnn12i3fc1sbjck50gqsy3131b"
   },
   "nvim-treesitter/nvim-treesitter-textobjects": {
-    "rev": "34867c69838078df7d6919b130c0541c0b400c47",
-    "sha256": "0c8f2y8glhsbd2nbb0iwjly8f07mjy55z3j53l0p360dgj23kmpw"
+    "rev": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf",
+    "sha256": "08chzl9943657f7mp8f83k95cic14br0d8n9233nj17fng0k127v"
   },
   "jose-elias-alvarez/typescript.nvim": {
     "rev": "4de85ef699d7e6010528dcfbddc2ed4c2c421467",
     "sha256": "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm"
   },
   "sainnhe/sonokai": {
-    "rev": "598d29bef1cdea1eef4749c96824af0ae2f9350c",
-    "sha256": "12q9zi5vn5mvs4kl8r6wfsk4l66f7lmk9yx0acyvszl3isgyq085"
+    "rev": "3dcd97c0c5e4118bc171df6ba33800dfd9524a00",
+    "sha256": "026fksby6v2vl52q1n6pk4v8vrlh71cl8fjqcq4d6arz7lv2fk4j"
   },
   "LnL7/vim-nix": {
     "rev": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0",
@@ -73,8 +73,8 @@
     "sha256": "13zcw6c7zppvbsjlr8yj3vml6ayalvhjbbqszljmn1f9hmkpwg89"
   },
   "hrsh7th/nvim-cmp": {
-    "rev": "d818fd0624205b34e14888358037fb6f5dc51234",
-    "sha256": "18yjwihrr4ykq2h8yv67550358bmxi6maqvrhhbvxf402r01zkld"
+    "rev": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30",
+    "sha256": "0fk7s6apvq4r9h82jqm5azf1zg9aklyycgh7ivnb98bw9a0ivjim"
   },
   "hrsh7th/cmp-vsnip": {
     "rev": "989a8a73c44e926199bfd05fa7a516d51f2d2752",
@@ -85,12 +85,16 @@
     "sha256": "06j0fph91x3gdhbf9bb0yv95j34gf827p97vak0l4jb0ib7vmyc2"
   },
   "nvim-treesitter/nvim-treesitter": {
-    "rev": "63be47f203d3e9174fdac3872fb9766e5bcc5a11",
-    "sha256": "0sfcmci0braphr96l5p5l4r5ripj4nslynrjs1bmzxv8c1lkcq39"
+    "rev": "45e0d66246f31306d890b91301993fa1623e79f1",
+    "sha256": "1dpfzs118rv5717i81y9cibxqqy0x6xy98r93xcnkba75yyn0qbi"
   },
   "bfredl/nvim-luadev": {
     "optional": true,
     "rev": "3ba0c02c378503739f1fdb95cff3ea2aad48db3e",
     "sha256": "0pvb25bdmx4hxs3g7pkdqfjg3qpnr9p5szzbqqwaw3lbdnbyykzy"
+  },
+  "nvim-treesitter/nvim-treesitter-context": {
+    "rev": "78a81c7494e7d1a08dd1200b556933e513fd9f29",
+    "sha256": "19vf1wlvi7nggwzawaqyp81jk8hp85xsg1nm9cgjzk9fvywddnpc"
   }
 }

.config/nixpkgs/neovim/plugins/typescript-nvim-tsserver.patch

@@ -0,0 +1,13 @@
+diff --git a/lua/typescript/lsp.lua b/lua/typescript/lsp.lua
+index a2e01ec..3855580 100644
+--- a/lua/typescript/lsp.lua
++++ b/lua/typescript/lsp.lua
+@@ -22,7 +22,7 @@ local renameHandler = ____handlers.renameHandler
+ local ____methods = require("typescript.types.methods")
+ local TypescriptMethods = ____methods.TypescriptMethods
+ local ____lspconfig = require("lspconfig")
+-local tsserver = ____lspconfig.tsserver
++local tsserver = ____lspconfig.ts_ls
+ ____exports.setupLsp = function(overrides)
+     local resolvedConfig = __TS__ObjectAssign({}, config, overrides or ({}))
+     local ____resolvedConfig_server_0 = resolvedConfig.server

.config/nixpkgs/neovim/treesitter/grammars.json

@@ -1,11 +1,11 @@
 {
   "bash": {
-    "rev": "2fbd860f802802ca76a6661ce025b3a3bca2d3ed",
-    "sha256": "1diy2v5csp7v6bincvba1p8gwlly6izk9pla54b78fh0fip90axc"
+    "rev": "c8713e50f0bd77d080832fc61ad128bc8f2934e9",
+    "sha256": "12669g75zhn0rxghw209dayw4qmccrm620dc9fjz77bv34k99a66"
   },
   "css": {
-    "rev": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af",
-    "sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp"
+    "rev": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7",
+    "sha256": "1apypprrqn23ghay11w35vz31crpjdby6imjhnxq9cqj9rvhxgx3"
   },
   "elvish": {
     "repo": "elves/tree-sitter-elvish",
@@ -14,55 +14,55 @@
   },
   "http": {
     "repo": "rest-nvim/tree-sitter-http",
-    "rev": "e061995f0caf2fa30f68fa1fdf2c08bcbd4629a8",
-    "sha256": "0aicy74pbznfbrvwljidjna6x9h39lb01xb5p5kf1p35pqxwh0yg"
+    "rev": "231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94",
+    "sha256": "1k6vj0ml90l0hc3qj05hhkzyrf437cf594dgprsgk99dfyxkpj5b"
   },
   "go": {
-    "rev": "7ee8d928db5202f6831a78f8112fd693bf69f98b",
-    "sha256": "19z2819gfhynp8c5rbcvy75ah5w14d4bs2a3pply1jwpqiyfj5q1"
+    "rev": "ecc20866d1bd4d80f3aef06456ed3014d4d598e6",
+    "sha256": "19f5acxn0ai9l4018plw3bk8zrdmhglzx3gb1k04pcsqyn9fllvs"
   },
   "javascript": {
-    "rev": "12e45374422f6051648717be62f0ffc40a279ee2",
-    "sha256": "0p4vwy1rz362i8p6avyxaipg0yxhhxfj0p2cdq2q6gw8jcb0j498"
+    "rev": "b6f0624c1447bc209830b195999b78a56b10a579",
+    "sha256": "03lyqswy7h9iw2mhjlsa7an3g76hqi074c06pvdjb57h637zisf5"
   },
   "json": {
-    "rev": "94f5c527b2965465956c2000ed6134dd24daf2a7",
-    "sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp"
+    "rev": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571",
+    "sha256": "0z9nq267cx0c6dpkq3hm24jcxv37l3lhpwabxpmmpmx2f758yjyc"
   },
   "lua": {
     "repo": "MunifTanjim/tree-sitter-lua",
-    "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a",
-    "sha256": "1184dazb4agqf3v55sz8i7xmynsn4rkddhbph3mgmh5qsnk88mmq"
+    "rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
+    "sha256": "0wrbxmb6j8xyckf5jw14jf97cb9fn7yhalap6xxgsag84ypfsqj3"
   },
   "markdown": {
     "repo": "MDeiml/tree-sitter-markdown",
     "path": "tree-sitter-markdown",
-    "rev": "7fe453beacecf02c86f7736439f238f5bb8b5c9b",
-    "sha256": "1virik97kq9s1ykhwqx3b0ylvjkp1madv1j1gila6dvdypjk0bq2"
+    "rev": "b7eba93e6a3e588e259e831416ac11abdaa8616a",
+    "sha256": "1gfzsd0lp2hlisyypp934d38v5qsfj5likhjz550nd16fcfcpqll"
   },
   "nix": {
     "repo": "nix-community/tree-sitter-nix",
-    "rev": "0fdada10f1f845ca9116e279ad8f5d0ca93e9949",
-    "sha256": "1vnf28sgzck9i020is5m5ff95b6sxp2kams21nwrajvq66a38xl6"
+    "rev": "9ef77ceefff61d31a63133d8d697f219ab62c841",
+    "sha256": "0jr59cr7fhhkgni1hn5qwynmkcmh982k06nafbnq6ancjswnn5w4"
   },
   "ruby": {
-    "rev": "0ffe457fb6aabf064f173fd30ea356845cef2513",
-    "sha256": "0yzbj03b318xscyp9rgnhd6c4gas5n6l77qccwb972hsx7xri3hk"
+    "rev": "0b4729672f9aec4810c01a0f971541dcb433fef5",
+    "sha256": "1acxgrirmrfdbhcl548mhf4idim0ahvx6via5glzlvxw9lpzylgq"
   },
   "tsx": {
     "repo": "tree-sitter/tree-sitter-typescript",
     "path": "tsx",
-    "rev": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6",
-    "sha256": "1dff1in14va80mx1hydz46llcn396r8xhisgkmw4fsi0izx7p7sk"
+    "rev": "9951831c5f05be434514dce38b30eef213667601",
+    "sha256": "1p9wps6q0884b1vyxriayylf4d442df0g4d2648d099ay56ihl88"
   },
   "typescript": {
     "path": "typescript",
-    "rev": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6",
-    "sha256": "1dff1in14va80mx1hydz46llcn396r8xhisgkmw4fsi0izx7p7sk"
+    "rev": "9951831c5f05be434514dce38b30eef213667601",
+    "sha256": "1p9wps6q0884b1vyxriayylf4d442df0g4d2648d099ay56ihl88"
   },
   "jsdoc": {
-    "rev": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14",
-    "sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii"
+    "rev": "bc09606fc786ead131a301e4b7524888f2d5c517",
+    "sha256": "080dzr7547vsapxdd7vs4id3m9mfnzqfzjzkssgyb1vpcdmrhl5m"
   },
   "vimdoc": {
     "repo": "neovim/tree-sitter-vimdoc",
@@ -70,8 +70,8 @@
     "sha256": "0raqlzi2x9a0qrfidgw0gqda8030jz518kdwzvyxjndnd5cd5rdz"
   },
   "java": {
-    "rev": "953abfc8bb3eb2f578e1f461edba4a9885f974b8",
-    "sha256": "0f0mi8s0sm9l3hkz23rcfgmdww9lfadj2qmyg44s68skqwzc9sh8"
+    "rev": "490d878cf33b0ad5ae7a7253ff30597a5bdc348e",
+    "sha256": "1m4806bq6ga90vf00dbjkjvz64k06raw2w984yhnpgghbrvgm5xj"
   },
   "query": {
     "repo": "tree-sitter-grammars/tree-sitter-query",