diff --git a/flake.lock b/flake.lock
index 7c061f3..e7abb5e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,11 +74,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724504184,
-        "narHash": "sha256-gP6000c2+zHKJHAxCD3BftvAjmb4CPAZamRAHNxN2MM=",
+        "lastModified": 1725464985,
+        "narHash": "sha256-dabYEAybJPW0g7yhrXqyKe/HBw3g/95Y806v/buggTc=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "51338b58fd666f448db7486ec145dbe52db9b829",
+        "rev": "325588271687d275632958b4c988ef7a05772f65",
         "type": "github"
       },
       "original": {
@@ -314,11 +314,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1725234343,
+        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1725234343,
+        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
         "type": "github"
       },
       "original": {
@@ -520,11 +520,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1724440431,
-        "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
+        "lastModified": 1724857454,
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
         "type": "github"
       },
       "original": {
@@ -547,11 +547,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724440431,
-        "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
+        "lastModified": 1724857454,
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
         "type": "github"
       },
       "original": {
@@ -703,11 +703,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719226092,
-        "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
+        "lastModified": 1724947644,
+        "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
+        "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef",
         "type": "github"
       },
       "original": {
@@ -786,11 +786,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1724651993,
-        "narHash": "sha256-UPASmzd46/5P118t2fg/pIMid5yxEJSmXpPRuKawxUE=",
+        "lastModified": 1725415370,
+        "narHash": "sha256-F5Obt4M07Jal6P0QMkbL9Qrsux7CmhbmEuO4d1NWOrk=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "e87be8db9b99173d375a9ba3b4fd3a57aaa7386e",
+        "rev": "fdc7d407e29b17633d2568b5f46ead383ef85172",
         "type": "github"
       },
       "original": {
@@ -825,11 +825,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1724571360,
-        "narHash": "sha256-N21pypz02a6jrefeRtwyxWM7ryHPW+MMbxq4aCk5d6Y=",
+        "lastModified": 1725402926,
+        "narHash": "sha256-FEwqYuoLu5gZ6Kc8DWTKAWAR0iZ6dSvdIC9RARLKhWc=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "b8135a76b71f1af0d708e3dc58ccb58abad59f7c",
+        "rev": "7b7c95dac97d6ea4f10855cc198dce650a796c20",
         "type": "github"
       },
       "original": {
@@ -972,14 +972,14 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1722555339,
-        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
+        "lastModified": 1725233747,
+        "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       }
     },
     "nixpkgs-lib_2": {
@@ -1129,11 +1129,11 @@
     },
     "nixpkgs_13": {
       "locked": {
-        "lastModified": 1724242322,
-        "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
+        "lastModified": 1725001927,
+        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "224042e9a3039291f22f4f2ded12af95a616cca0",
+        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
         "type": "github"
       },
       "original": {
@@ -1177,11 +1177,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1724395761,
-        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
+        "lastModified": 1725194671,
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
         "type": "github"
       },
       "original": {
@@ -1225,11 +1225,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1724395761,
-        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
+        "lastModified": 1725194671,
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
         "type": "github"
       },
       "original": {
@@ -1425,11 +1425,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724638882,
-        "narHash": "sha256-ap2jIQi/FuUHR6HCht6ASWhoz8EiB99XmI8Esot38VE=",
+        "lastModified": 1725416653,
+        "narHash": "sha256-iNBv7ILlZI6ubhW0ExYy8YgiLKUerudxY7n8R5UQK2E=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "19b70f147b9c67a759e35824b241f1ed92e46694",
+        "rev": "e5d3f9c2f24d852cddc79716daf0f65ce8468b28",
         "type": "github"
       },
       "original": {
@@ -1656,11 +1656,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721866826,
-        "narHash": "sha256-0CqSZKEJBjWHL2YPWr7GSUZfHTS2BASUAWN91t/MPs4=",
+        "lastModified": 1724890906,
+        "narHash": "sha256-kRRmMMSRqfiGnSWUBXK2GpviDiAF2sfto/P54ABpzEs=",
         "owner": "willruggiano",
         "repo": "vscode-js-debug.nix",
-        "rev": "2144bcb1dedcd1cc28c3cdcd9962a99aa7f2ee83",
+        "rev": "5858621f15f3dcc7182ea57040c07aac68ad5d76",
         "type": "github"
       },
       "original": {
@@ -1679,11 +1679,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724328603,
-        "narHash": "sha256-5udGQrqbdxkQ/nIuI0KAdohxuZtOzYhxVuERUkqde+E=",
+        "lastModified": 1725106169,
+        "narHash": "sha256-FS2i56CV5BcLOrErWPLTHldw29AK8DcnE7aKUUoS2FU=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "1f0785c9b064455d5ba78002470f6dfad65de2a8",
+        "rev": "695df248dde30f61298951a8d96faa984ac84581",
         "type": "github"
       },
       "original": {
@@ -1700,11 +1700,11 @@
         "zig-overlay": "zig-overlay"
       },
       "locked": {
-        "lastModified": 1724341248,
-        "narHash": "sha256-4f2BhcZxhBpTRCNa16n1DsLvsmOynRwqqJxp1YdGoGM=",
+        "lastModified": 1725202623,
+        "narHash": "sha256-+UdfnVQIMYEBNN5lVK/Pn6fs2YMohP+f/4XAU7qTTHo=",
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "b481aaeac81ffccffb0ce5cf2f05310f3661c6b2",
+        "rev": "ace6f6da90a4420cd6632363b30762e577e2b922",
         "type": "github"
       },
       "original": {
diff --git a/nix/sources.json b/nix/sources.json
index cbd4555..bbb29f7 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -14,7 +14,7 @@
     "SchemaStore.nvim": {
         "branch": "main",
         "repo": "git@github.com:b0o/SchemaStore.nvim",
-        "rev": "54a2cf0105166d5a48172e81f12a2bf10cfc8b2c",
+        "rev": "c97985bbe5a0988767216f9b54a8e05d70ce8505",
         "type": "git"
     },
     "clang-format.nvim": {
@@ -62,7 +62,7 @@
     "conform.nvim": {
         "branch": "master",
         "repo": "git@github.com:stevearc/conform.nvim",
-        "rev": "62eba813b7501b39612146cbf29cd07f1d4ac29c",
+        "rev": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d",
         "type": "git"
     },
     "cpsm": {
@@ -74,7 +74,7 @@
     "crates.nvim": {
         "branch": "main",
         "repo": "ssh://git@github.com/saecki/crates.nvim",
-        "rev": "891063a2dc8471501b9742406a514be62a20c138",
+        "rev": "b3b9ac6ed9618955b24bf9adede7530ef608495b",
         "type": "git"
     },
     "dial.nvim": {
@@ -104,7 +104,7 @@
     "fzf": {
         "branch": "master",
         "repo": "git@github.com:junegunn/fzf",
-        "rev": "2775b771f27d7a1d89cdf067a56cc0e9238f101d",
+        "rev": "8af0af3400fc36651b59a7e3f9a2bedd4a51daed",
         "type": "git"
     },
     "fzy-lua-native": {
@@ -116,7 +116,7 @@
     "gitsigns.nvim": {
         "branch": "main",
         "repo": "ssh://git@github.com/lewis6991/gitsigns.nvim",
-        "rev": "80214a857ce512cc64964abddc1d8eb5a3e28396",
+        "rev": "1ef74b546732f185d0f806860fa5404df7614f28",
         "type": "git"
     },
     "hardtime.nvim": {
@@ -134,7 +134,7 @@
     "indent-blankline.nvim": {
         "branch": "master",
         "repo": "ssh://git@github.com/lukas-reineke/indent-blankline.nvim",
-        "rev": "db926997af951da38e5004ec7b9fbdc480b48f5d",
+        "rev": "18603eb949eba08300799f64027af11ef922283f",
         "type": "git"
     },
     "iron.nvim": {
@@ -149,10 +149,16 @@
         "rev": "817f50c9464ce557c8f7f8f4d4c8d2f7b81fc40c",
         "type": "git"
     },
+    "kulala-fmt": {
+        "branch": "main",
+        "repo": "git@github.com:mistweaverco/kulala-fmt",
+        "rev": "1b45610668bb51579f2af8a013b559d85b644671",
+        "type": "git"
+    },
     "kulala.nvim": {
         "branch": "main",
         "repo": "git@github.com:mistweaverco/kulala.nvim",
-        "rev": "7649576ca459146658b4c415d1a320bbedc3f564",
+        "rev": "18fd207fbf01ba311f2c4bc7b9ad60b1cad633ec",
         "type": "git"
     },
     "leap.nvim": {
@@ -200,7 +206,7 @@
     "none-ls.nvim": {
         "branch": "main",
         "repo": "git@github.com:nvimtools/none-ls.nvim",
-        "rev": "203f5ebde4a1af48ba2eb146401b5be2e7866942",
+        "rev": "9b98991e15dce8fc502993e23caac2528b8b667f",
         "type": "git"
     },
     "nui.nvim": {
@@ -236,7 +242,7 @@
     "nvim-dap-ui": {
         "branch": "master",
         "repo": "ssh://git@github.com/rcarriga/nvim-dap-ui",
-        "rev": "a5606bc5958db86f8d92803bea7400ee26a8d7e4",
+        "rev": "1c351e4e417d4691da12948b6ecf966936a56d28",
         "type": "git"
     },
     "nvim-dap-virtual-text": {
@@ -272,7 +278,7 @@
     "nvim-lspconfig": {
         "branch": "master",
         "repo": "git@github.com:neovim/nvim-lspconfig",
-        "rev": "911167921d49cd5c1c9b2436031d0da3945e787f",
+        "rev": "0ef64599b8aa0187ee5f6d92cb39c951f348f041",
         "type": "git"
     },
     "nvim-nio": {
@@ -302,7 +308,7 @@
     "nvim-snippy": {
         "branch": "master",
         "repo": "git@github.com:dcampos/nvim-snippy",
-        "rev": "32252e1450b1c8a27a4a61cdfde60791192a1d0c",
+        "rev": "6b495947e230a93de7021c275e174b128c7ddaf5",
         "type": "git"
     },
     "nvim-surround": {
@@ -314,13 +320,13 @@
     "nvim-treesitter": {
         "branch": "master",
         "repo": "ssh://git@github.com/nvim-treesitter/nvim-treesitter",
-        "rev": "7499f7379459db3b31c75cf5cec45f785be6e2c7",
+        "rev": "3826d0c42ac635f560479b5b6ab522f6627a3466",
         "type": "git"
     },
     "nvim-treesitter-textobjects": {
         "branch": "master",
         "repo": "ssh://git@github.com/nvim-treesitter/nvim-treesitter-textobjects",
-        "rev": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b",
+        "rev": "fe3deb7f67ce0cc4ebfe2ea6c1c7ae1c7a939d73",
         "type": "git"
     },
     "nvim-ts-context-commentstring": {
@@ -476,13 +482,13 @@
     "vim-dispatch": {
         "branch": "master",
         "repo": "git@github.com:tpope/vim-dispatch",
-        "rev": "4c695bc052cad2ae6b980aebbe48d046466e27ae",
+        "rev": "a2ff28abdb2d89725192db5b8562977d392a4d3f",
         "type": "git"
     },
     "vim-fugitive": {
         "branch": "master",
         "repo": "git@github.com:tpope/vim-fugitive",
-        "rev": "0444df68cd1cdabc7453d6bd84099458327e5513",
+        "rev": "1d18c696c4284e9ce9467a5c04d3adf8af43f994",
         "type": "git"
     },
     "vim-markdown": {
@@ -506,7 +512,7 @@
     "which-key.nvim": {
         "branch": "main",
         "repo": "git@github.com:folke/which-key.nvim",
-        "rev": "6c1584eb76b55629702716995cca4ae2798a9cca",
+        "rev": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0",
         "type": "git"
     },
     "zen-mode.nvim": {
diff --git a/pkgs/kulala-fmt/default.nix b/pkgs/kulala-fmt/default.nix
index ba8c1c5..75f063e 100644
--- a/pkgs/kulala-fmt/default.nix
+++ b/pkgs/kulala-fmt/default.nix
@@ -1,18 +1,8 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  ...
-}:
-buildGoModule rec {
-  name = "kulala-fmt";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "mistweaverco";
-    repo = "kulala-fmt";
-    rev = "v${version}";
-    hash = "sha256-Fxxc8dJMiL7OVoovOt58vVaUloRjJX5hc8xSlzkwVc8=";
-  };
-
-  vendorHash = "sha256-uA29P6bcZNfxWsTfzsADBIqYgyfVX8dY8y70ZJKieas=";
-}
+{buildGoModule, ...}: let
+  sources = import ../../nix/sources.nix {};
+in
+  buildGoModule {
+    name = "kulala-fmt";
+    src = sources.kulala-fmt;
+    vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo=";
+  }
diff --git a/pkgs/nvim-treesitter/default.nix b/pkgs/nvim-treesitter/default.nix
index 3f444a0..a30122d 100644
--- a/pkgs/nvim-treesitter/default.nix
+++ b/pkgs/nvim-treesitter/default.nix
@@ -151,7 +151,7 @@
       owner = "ikatyang";
     };
     zig = {
-      owner = "maxxnino";
+      owner = "tree-sitter-grammars";
     };
   };
 
diff --git a/pkgs/nvim-treesitter/grammars/go.json b/pkgs/nvim-treesitter/grammars/go.json
index cb7b894..2bbb910 100644
--- a/pkgs/nvim-treesitter/grammars/go.json
+++ b/pkgs/nvim-treesitter/grammars/go.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-go",
-  "rev": "8c0f0e7a6012283d9f0dd650feb8075ad1ffad5e",
-  "date": "2024-08-17T21:02:09-04:00",
-  "sha256": "1gkp6n27ibq40zqzpik3r31vxv1b4b9r13j1nvhpy32b37sw3rzv",
-  "hash": "sha256-++fB9RlLDH/htkGOkNMiK+y+w8hjxvvxBwSveIQ1d74=",
+  "rev": "6204b7308a32e991a8daed2e9895a90be55a510a",
+  "date": "2024-08-26T12:55:21-04:00",
+  "sha256": "17wnlj4wa85k643bx5ghbk1v0g7wgrfx92h6fx7vxcc1mbacwxs8",
+  "hash": "sha256-SHfO1KqBsb5PdwaK1F1+/Dyww1zwlb4GMbMgxYmklp8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/nvim-treesitter/grammars/http.json b/pkgs/nvim-treesitter/grammars/http.json
index a023c7c..0bb1ae4 100644
--- a/pkgs/nvim-treesitter/grammars/http.json
+++ b/pkgs/nvim-treesitter/grammars/http.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/rest-nvim/tree-sitter-http",
-  "rev": "bbcd67642e5749b90277c353b72e762f3be16993",
-  "date": "2024-08-22T16:52:58Z",
-  "sha256": "1jk4c0mz1ayxxz69dhllvdd7fz9sn1z15vm4a8nydlzbxzqwc2p8",
-  "hash": "sha256-6ArG8e/r0+YtUqTuEn6wOn13WtuUwpbM792r8CtgZMo=",
+  "rev": "49e1ceefcdcf89abfd4d8f013359cf90c615b1cd",
+  "date": "2024-08-31T10:13:43Z",
+  "sha256": "1x34ffm6ki2krhrckwmk65n7argdr8zqxxgvjqhy84sswpfqviw8",
+  "hash": "sha256-iMeN3eVaE+Qhlvv1jj/K7WV1bDGz8skyzFPEaapzZPQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/nvim-treesitter/grammars/java.json b/pkgs/nvim-treesitter/grammars/java.json
index 92ff6be..78727d6 100644
--- a/pkgs/nvim-treesitter/grammars/java.json
+++ b/pkgs/nvim-treesitter/grammars/java.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-java",
-  "rev": "576d8097e495b411f31daaee28cb34c1752ac702",
-  "date": "2024-08-23T21:51:50-04:00",
-  "sha256": "14lp5f0byv4dis5xya383hs59nq52ab7z1hpncg0mjykphkg6l3g",
-  "hash": "sha256-b1DzJrzTywoesxeGf5YSBdtUNBxoKN+Ljo1sv4Arl5I=",
+  "rev": "245b05c6ba900fa708242835f6168ef76f9d951e",
+  "date": "2024-09-01T06:35:15-04:00",
+  "sha256": "1qxiddgk3nqy6xdvbciygryfq9bap8529hl2dpx7ma9888qfxkhb",
+  "hash": "sha256-C87uMEIoqXr6bYLCJAq6aiXsfH4+srVbNx7bMV9rseM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/nvim-treesitter/grammars/javascript.json b/pkgs/nvim-treesitter/grammars/javascript.json
index b17bd63..53065d7 100644
--- a/pkgs/nvim-treesitter/grammars/javascript.json
+++ b/pkgs/nvim-treesitter/grammars/javascript.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "15887341e5b57ffdb423aff840aef142b8f53d6d",
-  "date": "2024-08-17T20:53:44-04:00",
-  "sha256": "07gg712aymp0jbycwf1pk2ph6g8hgvv4hqbl5dlv7dj8bakwyafa",
-  "hash": "sha256-yinPp1pItrNpK3RhSPZ+ED0Dr5g3OM78kuBWr0Q47x0=",
+  "rev": "463fec0831011cab830429fbe1da2796cfc1cfb4",
+  "date": "2024-09-01T23:33:31-04:00",
+  "sha256": "1nc0da3c34c8dimh1ww1pmg5h7f7cpqffp4czsbpg3x160kdxnqa",
+  "hash": "sha256-CtveJjChj3eX/oxc5/Blxx1YXr2B8wBrbIiRwYZqgNk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/nvim-treesitter/grammars/nix.json b/pkgs/nvim-treesitter/grammars/nix.json
index a0a2a79..21ce32a 100644
--- a/pkgs/nvim-treesitter/grammars/nix.json
+++ b/pkgs/nvim-treesitter/grammars/nix.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/cstrahan/tree-sitter-nix",
-  "rev": "0553955c53f564e5205f4f187d94973078c05ee7",
-  "date": "2024-08-23T11:50:29Z",
-  "sha256": "0ljykvawppz6bbvwm1gna41w3d5wrfmqrbvjwy945z513s0s6c5p",
-  "hash": "sha256-tzCjgR6h/EKS53KvjKvLvLTBA1H2hcr3Wubfy9WeXlI=",
+  "rev": "537095ddc80cf610fa75a2a0149fe9799b011014",
+  "date": "2024-08-26T18:13:41Z",
+  "sha256": "038gwrracjpldvxc53avg0whdv88hr1yyp9nizis2k2dg4d9xiih",
+  "hash": "sha256-MMaeGnlNTKHjjzZd70OGCO0GOXhbjcL6bvRKpnLmDw0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/nvim-treesitter/grammars/scheme.json b/pkgs/nvim-treesitter/grammars/scheme.json
index b363131..d474852 100644
--- a/pkgs/nvim-treesitter/grammars/scheme.json
+++ b/pkgs/nvim-treesitter/grammars/scheme.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/6cdh/tree-sitter-scheme",
-  "rev": "8f9dff3d038f09934db5ea113cebc59c74447743",
-  "date": "2024-04-12T09:33:55+08:00",
-  "sha256": "1n9f9zala2mv7bllwjb2nsh2xsr56zjh7j09vxzd77jnb10rjh20",
-  "hash": "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk=",
+  "rev": "432c338093c69222efbeb124feb90715da306cc7",
+  "date": "2024-09-01T21:26:25+08:00",
+  "sha256": "1afn9zn214iv85p74vcqy5z5wfqqriwha2gvn7v10ra18cl01fd4",
+  "hash": "sha256-pLkAKENBZRD2sfsJBXnMGDtefvGYbXJuQTuSIOxP1qk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/nvim-treesitter/grammars/sql.json b/pkgs/nvim-treesitter/grammars/sql.json
index 27ef5b0..10757fe 100644
--- a/pkgs/nvim-treesitter/grammars/sql.json
+++ b/pkgs/nvim-treesitter/grammars/sql.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/DerekStride/tree-sitter-sql",
-  "rev": "c67ecbd37d8d12f22e4cc7138afd14bc20253e10",
-  "date": "2024-08-09T20:13:32Z",
-  "sha256": "0fdn3rkk0d3003h3vn1s14yva707rzqna025vasa3d7h81iqr23z",
-  "hash": "sha256-f4iMY0DwtKG02kUAZfHPBxy1PQk62D3gAGA0MGcetjk=",
+  "rev": "a8b10c76759a372d0f92bb070b4f5c993e0ce5f9",
+  "date": "2024-08-26T20:57:03Z",
+  "sha256": "14j36c7s7mrah7gkgg47w2ici69sc6glrisxp1laf8czsazjiyn1",
+  "hash": "sha256-wfoov9KfIadouF3HTJ9hOpnIouCHvDffgSrXow8zQ5I=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/nvim-treesitter/grammars/zig.json b/pkgs/nvim-treesitter/grammars/zig.json
index 303a6a7..be6831d 100644
--- a/pkgs/nvim-treesitter/grammars/zig.json
+++ b/pkgs/nvim-treesitter/grammars/zig.json
@@ -1,9 +1,9 @@
 {
-  "url": "https://github.com/maxxnino/tree-sitter-zig",
-  "rev": "2bac4cc6c697d46a193905fef6d003bfa0bfabfd",
-  "date": "2024-06-28T17:20:16+07:00",
-  "sha256": "1ix401wq0raz8sxp88r6wkkzrv6653yk5fi604i026yrm04n9br0",
-  "hash": "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc=",
+  "url": "https://github.com/tree-sitter-grammars/tree-sitter-zig",
+  "rev": "21e2218e0ec7f4e3c0640d16bf8c67e6f0a61e18",
+  "date": "2024-08-29T22:28:57-04:00",
+  "sha256": "0mh4dpfvamgq0c2djqpxhjrsk62jscaswf8q2mv2yvnl2rxyp7h4",
+  "hash": "sha256-BJ7rexbUbi92FRg5rhXTUpips4T9YtkEA/hVtd1tBFY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/plugins/dbee.lua b/plugins/dbee.lua
index ceb5d39..ea253e7 100644
--- a/plugins/dbee.lua
+++ b/plugins/dbee.lua
@@ -50,7 +50,15 @@ return function()
       },
     },
     sources = {
-      require("dbee.sources").FileSource:new(vim.fn.getcwd() .. "/.db.json"),
+      require("dbee.sources").MemorySource:new {
+        {
+          name = "DATABASE_URL",
+          type = "postgres",
+          url = vim.env.DATABASE_URL,
+        },
+      },
+      require("dbee.sources").EnvSource:new "DBEE_CONNECTIONS",
+      require("dbee.sources").FileSource:new(vim.fn.stdpath "cache" .. "/dbee/persistence.json"),
     },
     -- window_layout = {
     --   -- I can manage my own window layouts thank you very much
diff --git a/plugins/spec.nix b/plugins/spec.nix
index e1f3b0b..577ae1d 100644
--- a/plugins/spec.nix
+++ b/plugins/spec.nix
@@ -219,6 +219,9 @@ in rec {
   kulala = {
     src = sources."kulala.nvim";
     config = ./kulala.lua;
+    dependencies = {
+      inherit nvim-treesitter;
+    };
     paths = [
       config.packages.kulala-fmt
     ];
@@ -343,7 +346,12 @@ in rec {
   };
 
   matchup = {
-    src = sources.vim-matchup;
+    src = pkgs.fetchFromGitHub {
+      owner = "andymass";
+      repo = "vim-matchup";
+      rev = "pull/358/head";
+      hash = "sha256-8ooI0vSsaHzKY5pmM9hczd1L6cWPCVQ/wvudHduxAkw=";
+    };
     init = ''
       function()
         vim.g.matchup_matchparen_offscreen = { method = "status_manual" }
diff --git a/plugins/treesitter.lua b/plugins/treesitter.lua
index 533927c..eed26d7 100644
--- a/plugins/treesitter.lua
+++ b/plugins/treesitter.lua
@@ -35,6 +35,13 @@ return function()
           ["gK"] = "@*",
         },
       },
+      select = {
+        enable = true,
+        keymaps = {
+          ["ab"] = "@block.outer",
+          ["ib"] = "@block.inner",
+        },
+      },
     },
   }