.config/nixpkgs/neovim/autocmd.lua

@@ -90,12 +90,3 @@ vim.api.nvim_create_autocmd('FileType', {
     vim.bo.textwidth = 80
   end,
 })
-
-vim.api.nvim_create_autocmd('FileType', {
-  pattern = 'http',
-  callback = function(opts)
-    vim.keymap.set('n', '<Leader>r', '<Plug>RestNvim', {
-      buffer = opts.buf,
-    })
-  end,
-})

.config/nixpkgs/neovim/flake.lock

@@ -9,11 +9,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745118754,
-        "narHash": "sha256-a8OWYMmcTpjc3ir2RVQ1LWWXbu75RpmaXc/js9rno3Q=",
+        "lastModified": 1747813658,
+        "narHash": "sha256-WiS4CZn8OvU01MvSqveZt2FhKznu2FbIlvKP8dZ2cm4=",
         "owner": "Saghen",
         "repo": "blink.cmp",
-        "rev": "3ce61ae041927082f962791f59e3aadc774b206c",
+        "rev": "196711b89a97c953877d6c257c62f18920a970f3",
         "type": "github"
       },
       "original": {
@@ -31,11 +31,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1734676450,
-        "narHash": "sha256-iwcxhTVe4h5TqW0HsNiOQP27eMBmbBshF+q2UjEy5aU=",
+        "lastModified": 1747032090,
+        "narHash": "sha256-htgrHIR/P7V8WeRW/XDWJHXBzbTSWCDYZHsxPAzDuUY=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "46e19fa0eb3260b2c3ee5b2cf89e73343c1296ab",
+        "rev": "1436bb8b85b35ca3ba64ad97df31a3b23c7610a3",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744868846,
-        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "lastModified": 1747920628,
+        "narHash": "sha256-IlAuXnIi+ZmyS89tt1YOFDCv7FKs9bNBHd3MXMp8PxE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "rev": "e314d5c6d3b3a0f40ec5bcbc007b0cbe412f48ae",
         "type": "github"
       },
       "original": {
@@ -118,11 +118,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1734622712,
-        "narHash": "sha256-2Oc2LbFypF1EG3zTVIVcuT5XFJ7R3oAwu2tS8B0qQ0I=",
+        "lastModified": 1746889290,
+        "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "fe027d79d22f2a7645da4143f5cc0f5f56239b97",
+        "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc",
         "type": "github"
       },
       "original": {

.config/nixpkgs/neovim/lsp.lua

@@ -3,6 +3,12 @@ vim.diagnostic.config({
   virtual_text = { severity = { min = vim.diagnostic.severity.WARN } },
 })
 
+vim.lsp.config("*", {
+  flags = {
+    debounce_text_changes = 250,
+  }
+})
+
 vim.lsp.enable("bashls");
 vim.lsp.enable("eslint");
 
@@ -44,9 +50,6 @@ else
         vim.notify(string.format('Typescript %s', result.version))
       end,
     },
-    flags = {
-      debounce_text_changes = 150,
-    },
     on_init = function(client)
       -- mark tsserver as not having formatting available as we rely on
       -- eslint and dprint for that

.config/nixpkgs/neovim/overrides/after/compiler/typescript.lua

@@ -1,2 +1,6 @@
-vim.bo.makeprg = "tsc --noEmit --incremental $*"
+if vim.fn.executable("tsgo") == 1 then
+  vim.bo.makeprg = "tsgo --noEmit --pretty false $*"
+else
+  vim.bo.makeprg = "tsc --noEmit --incremental $*"
+end
 vim.bo.errorformat = "%+A %#%f %#(%l\\,%c): %m,%C%m"

.config/nixpkgs/neovim/plugins.lua

@@ -273,7 +273,10 @@ require('mini.files').setup({
 })
 
 -- rest client
-require('rest-nvim').setup({})
+require('kulala').setup({
+  global_keymaps = true,
+  global_keymaps_prefix = '<leader>r'
+})
 
 -- Use Treesitter for syntax highlighting
 require('nvim-treesitter.configs').setup({

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

@@ -20,12 +20,12 @@
     "sha256": "0vp4wl4kiby7dlchki975fq682sw8c1vr9c6nhcndmxyhx7ghrqw"
   },
   "Wansmer/treesj": {
-    "rev": "f4049f8ba2177e7c5c03fb9e34d4e039c685d744",
-    "sha256": "01dfifx4cw4kkqgix1hd92q6capg4rmdhnzpjxddcq9rnlb0xgi4"
+    "rev": "3b4a2bc42738a63de17e7485d4cc5e49970ddbcc",
+    "sha256": "0ydl72p2zp4yn50r5fzsdnfpr5ji04vfff7rs37jvb48lmfw2rlh"
   },
   "nvim-telescope/telescope.nvim": {
-    "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5",
-    "sha256": "0vc2fr5nhbc39d55zn09fh8zpy4472ic4xmwvmk5dda8fqw76p8q"
+    "rev": "b4da76be54691e854d3e0e02c36b0245f945c2c7",
+    "sha256": "161qlx099ymi62qsd89srda605ynks1sswx3djamrwqp3dxb9596"
   },
   "nvim-telescope/telescope-fzf-native.nvim": {
     "rev": "1f08ed60cafc8f6168b72b80be2b2ea149813e55",
@@ -36,20 +36,20 @@
     "sha256": "0jxx9nfga7z87v78cifglqs8w4mrpf99wcp483kb0hbv6537jmgh"
   },
   "echasnovski/mini.nvim": {
-    "rev": "2b3cd8127258f78c7c18b1a5d32af578389b32ce",
-    "sha256": "164vkikwb0iykignh120sn8jldxiazkpdsbzbap0lnj8cy9j9hi8"
+    "rev": "14ce72476995255fc5cb919da8067f65865e1225",
+    "sha256": "1g0bqsgidbn4nm0wdnax6hnlvkmdq7df9lw95ng03w6rgwyz3fdr"
   },
   "lewis6991/gitsigns.nvim": {
-    "rev": "2149fc2009d1117d58e86e56836f70c969f60a82",
-    "sha256": "01h4lx190vd25vnr1zmmzsi195v45f83dvsisgrqvbqgrbdkhr7d"
+    "rev": "8b729e489f1475615dc6c9737da917b3bc163605",
+    "sha256": "06ag4vksr64l8yffrsahl86x45c1klyyfzw7b0fzzncp918drrmi"
   },
   "neovim/nvim-lspconfig": {
-    "rev": "c48fac0936f24a5a2dbea9c8379ec9414a45eb8b",
-    "sha256": "1csggqvgn9pr71jmpndfcv3qglgvzwsngs40j1yq4201x38v7z1g"
+    "rev": "562487bc108bf73c2493f9e701b9334b48163216",
+    "sha256": "0v13snamlh42icj5yv6bbq52h5npbimyqfyckhzg5pwyyr2whyk2"
   },
   "nvim-treesitter/nvim-treesitter-textobjects": {
-    "rev": "205e3369bc83d8cb83f7409c36120e24611f8c5c",
-    "sha256": "13qmsnahlj88wxs75kvpn9hj89gnhm4dm6rb400ysrzmmx5ypg39"
+    "rev": "0f051e9813a36481f48ca1f833897210dbcfffde",
+    "sha256": "1vy2ihqknjrbmn4lw81hvhhqdg1pc2wc32ir96506bb3d273am7b"
   },
   "sainnhe/sonokai": {
     "rev": "f59c796780655c3b9da442d310ad2f2d735f2e56",
@@ -59,14 +59,9 @@
     "rev": "7235c7ce2cea530cb6b59bc3e46d4bfe917d15c8",
     "sha256": "109narpbw9kbih7ai49p1zw7j2bj7nzpk3n02z80jcbgb48zqs8y"
   },
-  "rest-nvim/rest.nvim": {
-    "branch": "v1.2.1",
-    "rev": "1ce984c694345f3801bc656072f9a8dd51286a04",
-    "sha256": "07q3kss0f6ggil2h4jcfxkwy0gm3q7bl3p4ysy725vnnmhhhlzkx"
-  },
   "nvim-treesitter/nvim-treesitter": {
-    "rev": "684eeac91ed8e297685a97ef70031d19ac1de25a",
-    "sha256": "00ccbnnvpcf0lrpbaygzz9wdnf59ixp43z0zry1qvblnjplrlwb7"
+    "rev": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79",
+    "sha256": "0ial9z35b3918l4q8gqdng50ifal0a4dcgdsr92nrnm2b0hz11kd"
   },
   "bfredl/nvim-luadev": {
     "optional": true,
@@ -74,7 +69,11 @@
     "sha256": "0pvb25bdmx4hxs3g7pkdqfjg3qpnr9p5szzbqqwaw3lbdnbyykzy"
   },
   "nvim-treesitter/nvim-treesitter-context": {
-    "rev": "6daca3ad780f045550b820f262002f35175a6c04",
-    "sha256": "0qprwd44hw9sz0vh14p6lpvs9vxrick462pfkradmal6ak1kfwn3"
+    "rev": "4976d8b90401cba9b85f6861e4e5a6edef2f2086",
+    "sha256": "1lyfc196vsivkf8hn2s05m7x91nghw65dxzssjw3vyrzlc1jpp9d"
+  },
+  "mistweaverco/kulala.nvim": {
+    "rev": "8d612b2a0f8be1afa2ec5e612def3707a7dff028",
+    "sha256": "11g6makp0ivy7abhg4cf5ba06zj4z46rqggpzl3pvxd1favjymhy"
   }
 }

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

@@ -14,8 +14,8 @@
   },
   "http": {
     "repo": "rest-nvim/tree-sitter-http",
-    "rev": "77ecf6385f1b5d422e0bbd12204374d287d61ad2",
-    "sha256": "018wzazajc1ma9lbd61sd6vkq11nmkhqwxjhrm7pmsf3g6sycg7x"
+    "rev": "db8b4398de90b6d0b6c780aba96aaa2cd8e9202c",
+    "sha256": "1wwkdnx9wff6haqnsn8zbw5rgs2v0qnc9hid5vkhs8n42fiviwsg"
   },
   "go": {
     "rev": "5e73f476efafe5c768eda19bbe877f188ded6144",
@@ -31,19 +31,19 @@
   },
   "lua": {
     "repo": "MunifTanjim/tree-sitter-lua",
-    "rev": "68d29aa745b68ae22cbbdb5dcb68c20232521ff6",
-    "sha256": "00rl78nqdy4pinaxl5ch3x9prmp7q3dyr34hbzpv4aa0isw3hkwq"
+    "rev": "db16e76558122e834ee214c8dc755b4a3edc82a9",
+    "sha256": "0q78bfq24cz8ds0q73fqvrss63j0ci5bmk8ziqk5zw77a2m5g5xq"
   },
   "markdown": {
     "repo": "MDeiml/tree-sitter-markdown",
     "path": "tree-sitter-markdown",
-    "rev": "192407ab5a24bfc24f13332979b5e7967518754a",
-    "sha256": "1xdk8xms2k6jq48r77myw7qrjznnvk1531bylmzkkkspqn8bb727"
+    "rev": "413285231ce8fa8b11e7074bbe265b48aa7277f9",
+    "sha256": "0r8jlmyr1bnyqqipmpmxxw4qw81c9n0l29xdfkz2n2zmjqps5v9r"
   },
   "nix": {
     "repo": "nix-community/tree-sitter-nix",
-    "rev": "48057cf966641e7a49b09700550751195c34bcb5",
-    "sha256": "1dchzvmlh58jm9660iw57rxsarv2y6qh0197iyhj4rakjwfr74am"
+    "rev": "cfc53fd287d23ab7281440a8526c73542984669b",
+    "sha256": "0bmalpgvfcz1zd72wq43r5qvhj3dqqp7zn9kfb6bs0valrxagaks"
   },
   "ruby": {
     "rev": "89bd7a8e5450cb6a942418a619d30469f259e5d6",
@@ -66,8 +66,8 @@
   },
   "vimdoc": {
     "repo": "neovim/tree-sitter-vimdoc",
-    "rev": "d2e4b5c172a109966c2ce0378f73df6cede39400",
-    "sha256": "04is98rwjc37ikd5swlzayza21880yd5j7n1a2jkbyabqvypifan"
+    "rev": "2694c3d27e2ca98a0ccde72f33887394300d524e",
+    "sha256": "0dmb889sryrgd34gm66f2jm7l9crshv7c2fr50yk9x4xva2cw08c"
   },
   "java": {
     "rev": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a",
@@ -75,7 +75,7 @@
   },
   "query": {
     "repo": "tree-sitter-grammars/tree-sitter-query",
-    "rev": "0555ac0da902abff06076e40501102cee3ba68bd",
-    "sha256": "0dqy7i2jdd9dqf1ppqzcmkzd9yndb11r78l0pv1zyl7dm7h5g76q"
+    "rev": "930202c2a80965a7a9ca018b5b2a08b25dfa7f12",
+    "sha256": "0274iz2z55m29yk56lmb7sans2k6hpd0nzgrznfx3jwr8dm2jw5r"
   }
 }