diff --git a/flake.lock b/flake.lock
index 3f7a9b57..c8c20733 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,15 +53,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768135262,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769069492,
-        "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+        "lastModified": 1765911976,
+        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769442288,
-        "narHash": "sha256-p+Xqr+P22TYW2RqbwccSd4UlUDEwl7PnoW3qiH8wVoE=",
+        "lastModified": 1766171975,
+        "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "384786dc70c4992643f916c7e57f378714fec4f1",
+        "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769170682,
-        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
+        "lastModified": 1766070988,
+        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
+        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769444957,
-        "narHash": "sha256-2VIGLo/Xj7v+ZZqR/k2uoaZ75vpYB1FLa2UAW5ZhIK8=",
+        "lastModified": 1766242030,
+        "narHash": "sha256-GdaKIZrzm4fbFf9jBVmeQFZTwYPxUlSTZrSId/JNMAU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9183819b926f1f58e8af86e86f28cc7d1e87698f",
+        "rev": "30006228925f07c5c2a270bb95dc8da35d9942dc",
         "type": "github"
       },
       "original": {
diff --git a/flake/checks.nix b/flake/checks.nix
index 01d3c7a5..73e64d52 100644
--- a/flake/checks.nix
+++ b/flake/checks.nix
@@ -15,10 +15,6 @@
             enable = true;
           };
 
-          nixf-diagnose = {
-            enable = true;
-          };
-
           nixpkgs-fmt = {
             enable = true;
           };
diff --git a/modules/home/mail/accounts/default.nix b/modules/home/mail/accounts/default.nix
index ca5e6ea6..5216ad5e 100644
--- a/modules/home/mail/accounts/default.nix
+++ b/modules/home/mail/accounts/default.nix
@@ -11,7 +11,7 @@ let
       lib.mkDefault [ (lib.getExe pkgs.ambroisie.rbw-pass) "Mail" passName ];
 
     address = mkMailAddress address domain;
-    aliases = map (lib.flip mkMailAddress domain) aliases;
+    aliases = builtins.map (lib.flip mkMailAddress domain) aliases;
 
     inherit primary;
 
diff --git a/modules/home/vim/lua/ambroisie/lsp.lua b/modules/home/vim/lua/ambroisie/lsp.lua
index 05ca47a9..fef04873 100644
--- a/modules/home/vim/lua/ambroisie/lsp.lua
+++ b/modules/home/vim/lua/ambroisie/lsp.lua
@@ -85,18 +85,4 @@ M.on_attach = function(client, bufnr)
     wk.add(keys)
 end
 
---- list all active LSP clients for specific buffer, or all buffers
---- @param bufnr int? buffer number
---- @return table all active LSP client names
-M.list_clients = function(bufnr)
-    local clients = vim.lsp.get_clients({ bufnr = bufnr })
-    local names = {}
-
-    for _, client in ipairs(clients) do
-        table.insert(names, client.name)
-    end
-
-    return names
-end
-
 return M
diff --git a/modules/home/vim/lua/ambroisie/utils.lua b/modules/home/vim/lua/ambroisie/utils.lua
index 5cb8df10..0ee7c83b 100644
--- a/modules/home/vim/lua/ambroisie/utils.lua
+++ b/modules/home/vim/lua/ambroisie/utils.lua
@@ -7,6 +7,15 @@ M.is_executable = function(cmd)
     return cmd and vim.fn.executable(cmd) == 1
 end
 
+--- return a function that checks if a given command is executable
+--- @param cmd string? command to check
+--- @return fun(): boolean executable
+M.is_executable_condition = function(cmd)
+    return function()
+        return M.is_executable(cmd)
+    end
+end
+
 --- whether or not we are currently in an SSH connection
 --- @return boolean ssh connection
 M.is_ssh = function()
@@ -25,6 +34,20 @@ M.is_ssh = function()
     return false
 end
 
+--- list all active LSP clients for specific buffer, or all buffers
+--- @param bufnr int? buffer number
+--- @return table all active LSP client names
+M.list_lsp_clients = function(bufnr)
+    local clients = vim.lsp.get_clients({ bufnr = bufnr })
+    local names = {}
+
+    for _, client in ipairs(clients) do
+        table.insert(names, client.name)
+    end
+
+    return names
+end
+
 --- partially apply a function with given arguments
 M.partial = function(f, ...)
     local a = { ... }
diff --git a/modules/home/vim/plugin/settings/git.lua b/modules/home/vim/plugin/settings/git.lua
index fcae4252..b9b92a69 100644
--- a/modules/home/vim/plugin/settings/git.lua
+++ b/modules/home/vim/plugin/settings/git.lua
@@ -57,12 +57,12 @@ local keys = {
 
 local objects = {
     mode = "o",
-    { "ih", gitsigns.select_hunk, desc = "git hunk" },
+    { "ih", gitsigns.select_hunk, desc = "Git hunk" },
 }
 -- Visual
 local visual = {
     mode = { "x" },
-    { "ih", gitsigns.select_hunk, desc = "git hunk" },
+    { "ih", gitsigns.select_hunk, desc = "Git hunk" },
     { "<leader>g", group = "Git" },
     { "<leader>gp", gitsigns.preview_hunk, desc = "Preview selection" },
     { "<leader>gr", make_visual(gitsigns.reset_hunk), desc = "Restore selection" },
diff --git a/modules/home/vim/plugin/settings/lualine.lua b/modules/home/vim/plugin/settings/lualine.lua
index 2dbc916e..bbe46475 100644
--- a/modules/home/vim/plugin/settings/lualine.lua
+++ b/modules/home/vim/plugin/settings/lualine.lua
@@ -1,6 +1,6 @@
 local lualine = require("lualine")
 local oil = require("oil")
-local lsp = require("ambroisie.lsp")
+local utils = require("ambroisie.utils")
 
 local function list_spell_languages()
     if not vim.opt.spell:get() then
@@ -11,7 +11,7 @@ local function list_spell_languages()
 end
 
 local function list_lsp_clients()
-    local client_names = lsp.list_clients(0)
+    local client_names = utils.list_lsp_clients(0)
 
     if #client_names == 0 then
         return ""
diff --git a/modules/home/vim/plugin/settings/null-ls.lua b/modules/home/vim/plugin/settings/null-ls.lua
index 00295bcc..258a2094 100644
--- a/modules/home/vim/plugin/settings/null-ls.lua
+++ b/modules/home/vim/plugin/settings/null-ls.lua
@@ -10,11 +10,11 @@ null_ls.setup({
 null_ls.register({
     null_ls.builtins.diagnostics.buildifier.with({
         -- Only used if available
-        condition = utils.partial(utils.is_executable, "buildifier"),
+        condition = utils.is_executable_condition("buildifier"),
     }),
     null_ls.builtins.formatting.buildifier.with({
         -- Only used if available
-        condition = utils.partial(utils.is_executable, "buildifier"),
+        condition = utils.is_executable_condition("buildifier"),
     }),
 })
 
@@ -22,7 +22,7 @@ null_ls.register({
 null_ls.register({
     null_ls.builtins.formatting.nixpkgs_fmt.with({
         -- Only used if available
-        condition = utils.partial(utils.is_executable, "nixpkgs-fmt"),
+        condition = utils.is_executable_condition("nixpkgs-fmt"),
     }),
 })
 
@@ -30,19 +30,19 @@ null_ls.register({
 null_ls.register({
     null_ls.builtins.diagnostics.mypy.with({
         -- Only used if available
-        condition = utils.partial(utils.is_executable, "mypy"),
+        condition = utils.is_executable_condition("mypy"),
     }),
     null_ls.builtins.diagnostics.pylint.with({
         -- Only used if available
-        condition = utils.partial(utils.is_executable, "pylint"),
+        condition = utils.is_executable_condition("pylint"),
     }),
     null_ls.builtins.formatting.black.with({
         extra_args = { "--fast" },
         -- Only used if available
-        condition = utils.partial(utils.is_executable, "black"),
+        condition = utils.is_executable_condition("black"),
     }),
     null_ls.builtins.formatting.isort.with({
         -- Only used if available
-        condition = utils.partial(utils.is_executable, "isort"),
+        condition = utils.is_executable_condition("isort"),
     }),
 })
diff --git a/modules/home/vim/plugin/settings/tree-sitter.lua b/modules/home/vim/plugin/settings/tree-sitter.lua
index ceb04ee6..d5fff465 100644
--- a/modules/home/vim/plugin/settings/tree-sitter.lua
+++ b/modules/home/vim/plugin/settings/tree-sitter.lua
@@ -1,93 +1,54 @@
-local treesitter = require("nvim-treesitter")
-local ts_select = require("nvim-treesitter-textobjects.select")
-local ts_move = require("nvim-treesitter-textobjects.move")
-local utils = require("ambroisie.utils")
-local wk = require("which-key")
+local ts_config = require("nvim-treesitter.configs")
 
-local function select_textobject(query)
-    return utils.partial(ts_select.select_textobject, query)
-end
-
-local function goto_next_start(query)
-    return utils.partial(ts_move.goto_next_start, query)
-end
-local function goto_next_end(query)
-    return utils.partial(ts_move.goto_next_end, query)
-end
-local function goto_previous_start(query)
-    return utils.partial(ts_move.goto_previous_start, query)
-end
-local function goto_previous_end(query)
-    return utils.partial(ts_move.goto_previous_end, query)
-end
-
-local objects = {
-    mode = { "x", "o" },
-    { "aa", select_textobject("@parameter.outer"), desc = "a parameter" },
-    { "ia", select_textobject("@parameter.inner"), desc = "inner parameter" },
-    { "ab", select_textobject("@block.outer"), desc = "a block" },
-    { "ib", select_textobject("@block.inner"), desc = "inner block" },
-    { "ac", select_textobject("@class.outer"), desc = "a class" },
-    { "ic", select_textobject("@class.inner"), desc = "inner class" },
-    { "af", select_textobject("@function.outer"), desc = "a function" },
-    { "if", select_textobject("@function.inner"), desc = "inner function" },
-    { "ak", select_textobject("@comment.outer"), desc = "a comment" },
-    { "aS", select_textobject("@statement.outer"), desc = "a statement" },
-}
-local moves = {
-    mode = { "n", "x", "o" },
-    -- Next start
-    { "]m", goto_next_start("@function.outer"), desc = "Next method start" },
-    { "]S", goto_next_start("@statement.outer"), desc = "Next statement start" },
-    { "]]", goto_next_start("@class.outer"), desc = "Next class start" },
-    -- Next end
-    { "]M", goto_next_end("@function.outer"), desc = "Next method end" },
-    { "][", goto_next_end("@class.outer"), desc = "Next class end" },
-    -- Previous start
-    { "[m", goto_previous_start("@function.outer"), desc = "Previous method start" },
-    { "[S", goto_previous_start("@statement.outer"), desc = "Previous statement start" },
-    { "[[", goto_previous_start("@class.outer"), desc = "Previous class start" },
-    -- Previous end
-    { "[M", goto_previous_end("@function.outer"), desc = "Previous method end" },
-    { "[]", goto_previous_end("@class.outer"), desc = "Previous class end" },
-}
-
-require("nvim-treesitter-textobjects").setup({
-    select = {
-        -- Jump to matching text objects
-        lookahead = true,
+ts_config.setup({
+    highlight = {
+        enable = true,
+        -- Avoid duplicate highlighting
+        additional_vim_regex_highlighting = false,
     },
-    move = {
-        -- Add to jump list
-        set_jumps = true,
+    indent = {
+        enable = true,
+    },
+    textobjects = {
+        select = {
+            enable = true,
+            -- Jump to matching text objects
+            lookahead = true,
+            keymaps = {
+                ["aa"] = { query = "@parameter.outer", desc = "a parameter" },
+                ["ia"] = { query = "@parameter.inner", desc = "inner parameter" },
+                ["ab"] = { query = "@block.outer", desc = "a block" },
+                ["ib"] = { query = "@block.inner", desc = "inner block" },
+                ["ac"] = { query = "@class.outer", desc = "a class" },
+                ["ic"] = { query = "@class.inner", desc = "inner class" },
+                ["af"] = { query = "@function.outer", desc = "a function" },
+                ["if"] = { query = "@function.inner", desc = "inner function" },
+                ["ak"] = { query = "@comment.outer", desc = "a comment" },
+                ["aS"] = { query = "@statement.outer", desc = "a statement" },
+            },
+        },
+        move = {
+            enable = true,
+            -- Add to jump list
+            set_jumps = true,
+            goto_next_start = {
+                ["]m"] = { query = "@function.outer", desc = "Next method start" },
+                ["]S"] = { query = "@statement.outer", desc = "Next statement start" },
+                ["]]"] = { query = "@class.outer", desc = "Next class start" },
+            },
+            goto_next_end = {
+                ["]M"] = { query = "@function.outer", desc = "Next method end" },
+                ["]["] = { query = "@class.outer", desc = "Next class end" },
+            },
+            goto_previous_start = {
+                ["[m"] = { query = "@function.outer", desc = "Previous method start" },
+                ["[S"] = { query = "@statement.outer", desc = "Previous statement start" },
+                ["[["] = { query = "@class.outer", desc = "Previous class start" },
+            },
+            goto_previous_end = {
+                ["[M"] = { query = "@function.outer", desc = "Previous method end" },
+                ["[]"] = { query = "@class.outer", desc = "Previous class end" },
+            },
+        },
     },
 })
-
--- Automatically setup treesitter for supported filetypes
-local function treesitter_try_attach(buf, language)
-    -- Try to load language
-    -- NOTE: the best way I found to check if a filetype has a grammar
-    if not vim.treesitter.language.add(language) then
-        return false
-    end
-
-    -- Syntax highlighting
-    vim.treesitter.start(buf, language)
-    -- Indentation
-    vim.bo.indentexpr = "v:lua.require('nvim-treesitter').indentexpr()"
-
-    return true
-end
-
-vim.api.nvim_create_autocmd("FileType", {
-    pattern = "*",
-    group = vim.api.nvim_create_augroup("treesitter_attach", { clear = true }),
-    callback = function(args)
-        local buf, filetype = args.buf, args.match
-        local language = vim.treesitter.language.get_lang(filetype)
-        if not language then
-            return
-        end
-        treesitter_try_attach(buf, language)
-    end,
-})
diff --git a/modules/home/wm/i3bar/default.nix b/modules/home/wm/i3bar/default.nix
index 28c19355..5ae0e7d7 100644
--- a/modules/home/wm/i3bar/default.nix
+++ b/modules/home/wm/i3bar/default.nix
@@ -69,7 +69,7 @@ in
                     inactive_state = "Idle";
                   };
                 in
-                map (block: defaults // block) cfg.vpn.blockConfigs
+                builtins.map (block: defaults // block) cfg.vpn.blockConfigs
               )
             )
             {
diff --git a/modules/nixos/programs/steam/default.nix b/modules/nixos/programs/steam/default.nix
index c859bdb2..0c7f9dad 100644
--- a/modules/nixos/programs/steam/default.nix
+++ b/modules/nixos/programs/steam/default.nix
@@ -23,7 +23,7 @@ in
       enable = true;
     };
 
-    environment.systemPackages = map lib.hiPrio [
+    environment.systemPackages = builtins.map lib.hiPrio [
       # Respect XDG conventions, leave my HOME alone
       (pkgs.writeShellScriptBin "steam" ''
         mkdir -p "${cfg.dataDir}"
diff --git a/modules/nixos/services/backup/default.nix b/modules/nixos/services/backup/default.nix
index 79884063..8aeeae19 100644
--- a/modules/nixos/services/backup/default.nix
+++ b/modules/nixos/services/backup/default.nix
@@ -96,7 +96,7 @@ in
       # Contains the UID/GID map, and other useful state
       "/var/lib/nixos"
       # SSH host keys (and public keys for convenience)
-      (map (key: [ key.path "${key.path}.pub" ]) config.services.openssh.hostKeys)
+      (builtins.map (key: [ key.path "${key.path}.pub" ]) config.services.openssh.hostKeys)
     ];
 
     services.restic.backups.backblaze = {
diff --git a/modules/nixos/services/nginx/default.nix b/modules/nixos/services/nginx/default.nix
index 153a299f..ff530b0a 100644
--- a/modules/nixos/services/nginx/default.nix
+++ b/modules/nixos/services/nginx/default.nix
@@ -188,14 +188,14 @@ in
       ++ (lib.flip lib.mapAttrsToList cfg.virtualHosts (_: { subdomain, ... } @ args:
       let
         conflicts = [ "port" "root" "socket" "redirect" ];
-        optionsNotNull = map (v: args.${v} != null) conflicts;
+        optionsNotNull = builtins.map (v: args.${v} != null) conflicts;
         optionsSet = lib.filter lib.id optionsNotNull;
       in
       {
         assertion = builtins.length optionsSet == 1;
         message = ''
           Subdomain '${subdomain}' must have exactly one of ${
-            lib.concatStringsSep ", " (map (v: "'${v}'") conflicts)
+            lib.concatStringsSep ", " (builtins.map (v: "'${v}'") conflicts)
           } configured.
         '';
       }))
@@ -208,7 +208,7 @@ in
         assertion = args.websocketsLocations != [ ] -> proxyPassUsed;
         message = ''
           Subdomain '${subdomain}' can only use 'websocketsLocations' with one of ${
-            lib.concatStringsSep ", " (map (v: "'${v}'") proxyPass)
+            lib.concatStringsSep ", " (builtins.map (v: "'${v}'") proxyPass)
           }.
         '';
       }))
diff --git a/overlays/default.nix b/overlays/default.nix
index d3e30aa8..683e021b 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,6 +1,6 @@
 # Automatically import all overlays in the directory
 let
   files = builtins.readDir ./.;
-  overlays = removeAttrs files [ "default.nix" ];
+  overlays = builtins.removeAttrs files [ "default.nix" ];
 in
 builtins.mapAttrs (name: _: import "${./.}/${name}") overlays