diff --git a/flake.lock b/flake.lock
index 65b8f048..bd5cf0aa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -108,33 +108,10 @@
         "type": "github"
       }
     },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "ref": "master",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "git-hooks",
+          "pre-commit-hooks",
           "nixpkgs"
         ]
       },
@@ -159,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743869639,
-        "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
+        "lastModified": 1740624780,
+        "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
+        "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
         "type": "github"
       },
       "original": {
@@ -175,11 +152,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744777043,
-        "narHash": "sha256-O6jgTxz9BKUiaJl03JsVHvSjtCOC8gHfDvC2UCfcLMc=",
+        "lastModified": 1740560979,
+        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7a6f7f4c1c69eee05641beaa40e7f85da8e69fb0",
+        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
         "type": "github"
       },
       "original": {
@@ -200,11 +177,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1741294988,
-        "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=",
+        "lastModified": 1740655932,
+        "narHash": "sha256-BSTcgL2C74x0TgVdVEWfIz2SHkwIFMN0Dvv1lCoOhCA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e",
+        "rev": "1ca8ff37f33a560c4a292ed83774434854f0b39a",
         "type": "github"
       },
       "original": {
@@ -214,15 +191,38 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "master",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "flake-parts": "flake-parts",
         "futils": "futils",
-        "git-hooks": "git-hooks",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
+        "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems"
       }
     },
diff --git a/flake.nix b/flake.nix
index 50767290..afd3c805 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,10 +61,10 @@
       };
     };
 
-    git-hooks = {
+    pre-commit-hooks = {
       type = "github";
       owner = "cachix";
-      repo = "git-hooks.nix";
+      repo = "pre-commit-hooks.nix";
       ref = "master";
       inputs = {
         nixpkgs.follows = "nixpkgs";
diff --git a/flake/checks.nix b/flake/checks.nix
index 73e64d52..98e49bd5 100644
--- a/flake/checks.nix
+++ b/flake/checks.nix
@@ -1,7 +1,7 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.git-hooks.flakeModule
+    inputs.pre-commit-hooks.flakeModule
   ];
 
   perSystem = { ... }: {
diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix
index 87464a48..d5f5989b 100644
--- a/flake/dev-shells.nix
+++ b/flake/dev-shells.nix
@@ -6,6 +6,7 @@
         name = "NixOS-config";
 
         nativeBuildInputs = with pkgs; [
+          gitAndTools.pre-commit
           nixpkgs-fmt
         ];
 
diff --git a/flake/home-manager.nix b/flake/home-manager.nix
index 093ae8cf..add889eb 100644
--- a/flake/home-manager.nix
+++ b/flake/home-manager.nix
@@ -3,11 +3,6 @@ let
   defaultModules = [
     # Include generic settings
     "${self}/modules/home"
-    {
-      nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
-        inputs.nur.overlays.default
-      ];
-    }
     {
       # Basic user information defaults
       home.username = lib.mkDefault "ambroisie";
@@ -26,15 +21,18 @@ let
     # * not letting me set `lib` as an extraSpecialArgs
     # * not respecting `nixpkgs.overlays` [1]
     # [1]: https://github.com/nix-community/home-manager/issues/2954
-    pkgs = inputs.nixpkgs.legacyPackages.${system};
+    pkgs = import inputs.nixpkgs {
+      inherit system;
+
+      overlays = (lib.attrValues self.overlays) ++ [
+        inputs.nur.overlays.default
+      ];
+    };
 
     modules = defaultModules ++ [
       "${self}/hosts/homes/${name}"
     ];
 
-    # Use my extended lib in NixOS configuration
-    inherit (self) lib;
-
     extraSpecialArgs = {
       # Inject inputs to use them in global registry
       inherit inputs;
diff --git a/flake/nixos.nix b/flake/nixos.nix
index bf9eac8c..fa656dc0 100644
--- a/flake/nixos.nix
+++ b/flake/nixos.nix
@@ -3,7 +3,7 @@ let
   defaultModules = [
     {
       # Let 'nixos-version --json' know about the Git revision
-      system.configurationRevision = self.rev or self.dirtyRev or "dirty";
+      system.configurationRevision = self.rev or "dirty";
     }
     {
       nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
diff --git a/hosts/nixos/porthos/secrets/secrets.nix b/hosts/nixos/porthos/secrets/secrets.nix
index b3812b43..68e90f2e 100644
--- a/hosts/nixos/porthos/secrets/secrets.nix
+++ b/hosts/nixos/porthos/secrets/secrets.nix
@@ -80,9 +80,6 @@ in
 
   "pyload/credentials.age".publicKeys = all;
 
-  "servarr/autobrr/session-secret.age".publicKeys = all;
-  "servarr/cross-seed/configuration.json.age".publicKeys = all;
-
   "sso/auth-key.age" = {
     owner = "nginx-sso";
     publicKeys = all;
diff --git a/hosts/nixos/porthos/secrets/servarr/autobrr/session-secret.age b/hosts/nixos/porthos/secrets/servarr/autobrr/session-secret.age
deleted file mode 100644
index e98b94ad..00000000
--- a/hosts/nixos/porthos/secrets/servarr/autobrr/session-secret.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 cKojmg bu09lB+fjaPP31cUQZP6EqSPuseucgNK7k9vAS08iS0
-+NGL+b2QD/qGo6hqHvosAXzHZtDvfodmPdcgnrKlD1o
--> ssh-ed25519 jPowng QDCdRBGWhtdvvMCiDH52cZHz1/W7aomhTatZ4+9IKwI
-Ou3jjV/O55G1CPgGS33l3eWhhYWrVdwVNPSiE14d5rE
---- q0ssmpG50OX1WaNSInc2hbtH3DbTwQGDU74VGEoMh94
-��mC���Ƒ'hK.��/�Xu(����g$�'��M{fK��!�MZ�oR�����՝͟�;yb
\ No newline at end of file
diff --git a/hosts/nixos/porthos/secrets/servarr/cross-seed/configuration.json.age b/hosts/nixos/porthos/secrets/servarr/cross-seed/configuration.json.age
deleted file mode 100644
index e9af03f4..00000000
Binary files a/hosts/nixos/porthos/secrets/servarr/cross-seed/configuration.json.age and /dev/null differ
diff --git a/hosts/nixos/porthos/services.nix b/hosts/nixos/porthos/services.nix
index 96f15d38..ffd150a0 100644
--- a/hosts/nixos/porthos/services.nix
+++ b/hosts/nixos/porthos/services.nix
@@ -51,9 +51,9 @@ in
         passwordFile = secrets."forgejo/mail-password".path;
       };
     };
-    # Home inventory
-    homebox = {
-      enable = true;
+    # Meta-indexers
+    indexers = {
+      prowlarr.enable = true;
     };
     # Jellyfin media server
     jellyfin.enable = true;
@@ -144,24 +144,11 @@ in
     sabnzbd.enable = true;
     # The whole *arr software suite
     servarr = {
-      enableAll = true;
-      autobrr = {
-        sessionSecretFile = secrets."servarr/autobrr/session-secret".path;
-      };
-      cross-seed = {
-        secretSettingsFile = secrets."servarr/cross-seed/configuration.json".path;
-      };
+      enable = true;
       # ... But not Lidarr because I don't care for music that much
       lidarr = {
         enable = false;
       };
-      # I only use Prowlarr nowadays
-      jackett = {
-        enable = false;
-      };
-      nzbhydra = {
-        enable = false;
-      };
     };
     # Because I still need to play sysadmin
     ssh-server.enable = true;
diff --git a/modules/home/atuin/default.nix b/modules/home/atuin/default.nix
index dbd9690a..3f062638 100644
--- a/modules/home/atuin/default.nix
+++ b/modules/home/atuin/default.nix
@@ -8,10 +8,6 @@ in
 
     # I want the full experience by default
     package = mkPackageOption pkgs "atuin" { };
-
-    daemon = {
-      enable = my.mkDisableOption "atuin daemon";
-    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -19,18 +15,12 @@ in
       enable = true;
       inherit (cfg) package;
 
-      daemon = lib.mkIf cfg.daemon.enable {
-        enable = true;
-      };
-
       flags = [
         # I *despise* this hijacking of the up key, even though I use Ctrl-p
         "--disable-up-arrow"
       ];
 
       settings = {
-        # Reasonable date format
-        dialect = "uk";
         # The package is managed by Nix
         update_check = false;
         # I don't care for the fancy display
diff --git a/modules/home/jq/default.nix b/modules/home/jq/default.nix
index 53e59865..57e266fa 100644
--- a/modules/home/jq/default.nix
+++ b/modules/home/jq/default.nix
@@ -17,7 +17,6 @@ in
       strings = "0;32";
       arrays = "1;39";
       objects = "1;39";
-      objectKeys = "1;34";
     };
   };
 }
diff --git a/modules/home/tmux/default.nix b/modules/home/tmux/default.nix
index 82ceb3a3..08b9202c 100644
--- a/modules/home/tmux/default.nix
+++ b/modules/home/tmux/default.nix
@@ -6,7 +6,7 @@ let
     (config.my.home.wm.windowManager != null)
   ];
 
-  mkTerminalFeature = opt: flag:
+  mkTerminalFlags = opt: flag:
     let
       mkFlag = term: ''set -as terminal-features ",${term}:${flag}"'';
       enabledTerminals = lib.filterAttrs (_: v: v.${opt}) cfg.terminalFeatures;
@@ -123,9 +123,9 @@ in
       }
 
       # Force OSC8 hyperlinks for each relevant $TERM
-      ${mkTerminalFeature "hyperlinks" "hyperlinks"}
+      ${mkTerminalFlags "hyperlinks" "hyperlinks"}
       # Force 24-bit color for each relevant $TERM
-      ${mkTerminalFeature "trueColor" "RGB"}
+      ${mkTerminalFlags "trueColor" "RGB"}
     '';
   };
 }
diff --git a/modules/home/vim/after/plugin/mappings/unimpaired.lua b/modules/home/vim/after/plugin/mappings/unimpaired.lua
index 765b6b11..82aab059 100644
--- a/modules/home/vim/after/plugin/mappings/unimpaired.lua
+++ b/modules/home/vim/after/plugin/mappings/unimpaired.lua
@@ -31,6 +31,8 @@ local keys = {
     { "[u", desc = "URL encode" },
     { "[x", desc = "XML encode" },
     { "[y", desc = "C string encode" },
+    -- Custom
+    { "[d", lsp.goto_prev_diagnostic, desc = "Previous diagnostic" },
 
     -- Next
     { "]", group = "Next" },
@@ -60,6 +62,8 @@ local keys = {
     { "]u", desc = "URL decode" },
     { "]x", desc = "XML decode" },
     { "]y", desc = "C string decode" },
+    -- Custom
+    { "]d", lsp.goto_next_diagnostic, desc = "Next diagnostic" },
 
     -- Enable option
     { "[o", group = "Enable option" },
diff --git a/modules/home/vim/after/queries/gitcommit/highlights.scm b/modules/home/vim/after/queries/gitcommit/highlights.scm
deleted file mode 100644
index 05162c9d..00000000
--- a/modules/home/vim/after/queries/gitcommit/highlights.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-; extends
-
-; Highlight over-extended subject lines (rely on wrapping for message body)
-((subject) @comment.error
-  (#vim-match? @comment.error ".\{50,}")
-  (#offset! @comment.error 0 50 0 0))
diff --git a/modules/home/vim/default.nix b/modules/home/vim/default.nix
index 20a74fff..8e6bd5c6 100644
--- a/modules/home/vim/default.nix
+++ b/modules/home/vim/default.nix
@@ -59,6 +59,7 @@ in
       # LSP and linting
       nvim-lspconfig # Easy LSP configuration
       lsp-format-nvim # Simplified formatting configuration
+      lsp_lines-nvim # Show diagnostics *over* regions
       none-ls-nvim # LSP integration for linters and formatters
       nvim-treesitter.withAllGrammars # Better highlighting
       nvim-treesitter-textobjects # More textobjects
@@ -66,6 +67,7 @@ in
 
       # Completion
       luasnip # Snippet manager compatible with LSP
+      friendly-snippets # LSP snippets collection
       nvim-cmp # Completion engine
       cmp-async-path # More responsive path completion
       cmp-buffer # Words from open buffers
diff --git a/modules/home/vim/init.vim b/modules/home/vim/init.vim
index 39ef32e3..0b546765 100644
--- a/modules/home/vim/init.vim
+++ b/modules/home/vim/init.vim
@@ -68,6 +68,8 @@ set listchars=tab:>─,trail:·,nbsp:¤
 
 " Use patience diff
 set diffopt+=algorithm:patience
+" Align similar lines in each hunk
+set diffopt+=linematch:50
 
 " Don't redraw when executing macros
 set lazyredraw
diff --git a/modules/home/vim/lua/ambroisie/lsp.lua b/modules/home/vim/lua/ambroisie/lsp.lua
index e48de128..eb53da68 100644
--- a/modules/home/vim/lua/ambroisie/lsp.lua
+++ b/modules/home/vim/lua/ambroisie/lsp.lua
@@ -3,6 +3,43 @@ local M = {}
 -- Simplified LSP formatting configuration
 local lsp_format = require("lsp-format")
 
+--- Move to the next/previous diagnostic, automatically showing the diagnostics
+--- float if necessary.
+--- @param forward bool whether to go forward or backwards
+local function goto_diagnostic(forward)
+    vim.validate({
+        forward = { forward, "boolean" },
+    })
+
+    local opts = {
+        float = false,
+    }
+
+    -- Only show floating diagnostics if they are otherwise not displayed
+    local config = vim.diagnostic.config()
+    if not (config.virtual_text or config.virtual_lines) then
+        opts.float = true
+    end
+
+    if forward then
+        vim.diagnostic.goto_next(opts)
+    else
+        vim.diagnostic.goto_prev(opts)
+    end
+end
+
+--- Move to the next diagnostic, automatically showing the diagnostics float if
+--- necessary.
+M.goto_next_diagnostic = function()
+    goto_diagnostic(true)
+end
+
+--- Move to the previous diagnostic, automatically showing the diagnostics float
+--- if necessary.
+M.goto_prev_diagnostic = function()
+    goto_diagnostic(false)
+end
+
 --- shared LSP configuration callback
 --- @param client native client configuration
 --- @param bufnr int? buffer number of the attached client
@@ -42,10 +79,6 @@ M.on_attach = function(client, bufnr)
         vim.diagnostic.config({
             virtual_text = text,
             virtual_lines = lines,
-            jump = {
-                -- Show float on jump if no diagnostic text is otherwise shown
-                float = not (text or lines),
-            },
         })
     end
 
diff --git a/modules/home/vim/lua/ambroisie/utils.lua b/modules/home/vim/lua/ambroisie/utils.lua
index 0ee7c83b..c9e92921 100644
--- a/modules/home/vim/lua/ambroisie/utils.lua
+++ b/modules/home/vim/lua/ambroisie/utils.lua
@@ -38,7 +38,7 @@ end
 --- @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 clients = vim.lsp.get_active_clients({ bufnr = bufnr })
     local names = {}
 
     for _, client in ipairs(clients) do
diff --git a/modules/home/vim/plugin/numbertoggle.lua b/modules/home/vim/plugin/numbertoggle.lua
index b1e3df21..80427101 100644
--- a/modules/home/vim/plugin/numbertoggle.lua
+++ b/modules/home/vim/plugin/numbertoggle.lua
@@ -22,3 +22,13 @@ vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter", "WinLeave"
         end
     end,
 })
+
+-- Never show the sign column in a terminal buffer
+vim.api.nvim_create_autocmd({ "TermOpen" }, {
+    pattern = "*",
+    group = numbertoggle,
+    callback = function()
+        vim.opt.number = false
+        vim.opt.relativenumber = false
+    end,
+})
diff --git a/modules/home/vim/plugin/settings/fastfold.lua b/modules/home/vim/plugin/settings/fastfold.lua
new file mode 100644
index 00000000..78ee9378
--- /dev/null
+++ b/modules/home/vim/plugin/settings/fastfold.lua
@@ -0,0 +1,5 @@
+-- Intercept all fold commands
+-- stylua: ignore
+vim.g.fastfold_fold_command_suffixes = {
+    "x", "X", "a", "A", "o", "O", "c", "C", "r", "R", "m", "M", "i", "n", "N",
+}
diff --git a/modules/home/vim/plugin/settings/lsp-lines.lua b/modules/home/vim/plugin/settings/lsp-lines.lua
new file mode 100644
index 00000000..9c79818c
--- /dev/null
+++ b/modules/home/vim/plugin/settings/lsp-lines.lua
@@ -0,0 +1,3 @@
+local lsp_lines = require("lsp_lines")
+
+lsp_lines.setup()
diff --git a/modules/home/vim/plugin/settings/lspconfig.lua b/modules/home/vim/plugin/settings/lspconfig.lua
index 7817d4c1..1f9abfd9 100644
--- a/modules/home/vim/plugin/settings/lspconfig.lua
+++ b/modules/home/vim/plugin/settings/lspconfig.lua
@@ -16,10 +16,6 @@ vim.diagnostic.config({
     update_in_insert = false,
     -- Show highest severity first
     severity_sort = true,
-    jump = {
-        -- Show float on diagnostic jumps
-        float = true,
-    },
 })
 
 -- Inform servers we are able to do completion, snippets, etc...
@@ -100,13 +96,6 @@ if utils.is_executable("starpls") then
 end
 
 -- Generic
-if utils.is_executable("harper-ls") then
-    lspconfig.harper_ls.setup({
-        capabilities = capabilities,
-        on_attach = lsp.on_attach,
-    })
-end
-
 if utils.is_executable("typos-lsp") then
     lspconfig.typos_lsp.setup({
         capabilities = capabilities,
diff --git a/modules/home/vim/plugin/settings/lualine.lua b/modules/home/vim/plugin/settings/lualine.lua
index bbe46475..5219a956 100644
--- a/modules/home/vim/plugin/settings/lualine.lua
+++ b/modules/home/vim/plugin/settings/lualine.lua
@@ -1,5 +1,4 @@
 local lualine = require("lualine")
-local oil = require("oil")
 local utils = require("ambroisie.utils")
 
 local function list_spell_languages()
@@ -31,7 +30,7 @@ lualine.setup({
             { "mode" },
         },
         lualine_b = {
-            { "branch" },
+            { "FugitiveHead" },
             { "filename", symbols = { readonly = "🔒" } },
         },
         lualine_c = {
@@ -58,21 +57,5 @@ lualine.setup({
     extensions = {
         "fugitive",
         "quickfix",
-        {
-            sections = {
-                lualine_a = {
-                    { "mode" },
-                },
-                lualine_b = {
-                    { "branch" },
-                },
-                lualine_c = {
-                    function()
-                        return vim.fn.fnamemodify(oil.get_current_dir(), ":~")
-                    end,
-                },
-            },
-            filetypes = { "oil" },
-        },
     },
 })
diff --git a/modules/home/vim/plugin/settings/luasnip.lua b/modules/home/vim/plugin/settings/luasnip.lua
new file mode 100644
index 00000000..80309d7e
--- /dev/null
+++ b/modules/home/vim/plugin/settings/luasnip.lua
@@ -0,0 +1 @@
+require("luasnip.loaders.from_vscode").lazy_load()
diff --git a/modules/home/vim/plugin/signtoggle.lua b/modules/home/vim/plugin/signtoggle.lua
index 3deca340..9765a818 100644
--- a/modules/home/vim/plugin/signtoggle.lua
+++ b/modules/home/vim/plugin/signtoggle.lua
@@ -1,21 +1,26 @@
 local signtoggle = vim.api.nvim_create_augroup("signtoggle", { clear = true })
 
--- Only show sign column for the currently focused buffer, if it has a number column
+-- Only show sign column for the currently focused buffer
 vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained", "WinEnter" }, {
     pattern = "*",
     group = signtoggle,
     callback = function()
-        if vim.opt.number:get() then
-            vim.opt.signcolumn = "yes"
-        end
+        vim.opt.signcolumn = "yes"
     end,
 })
 vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "WinLeave" }, {
     pattern = "*",
     group = signtoggle,
     callback = function()
-        if vim.opt.number:get() then
-            vim.opt.signcolumn = "no"
-        end
+        vim.opt.signcolumn = "no"
+    end,
+})
+
+-- Never show the sign column in a terminal buffer
+vim.api.nvim_create_autocmd({ "TermOpen" }, {
+    pattern = "*",
+    group = signtoggle,
+    callback = function()
+        vim.opt.signcolumn = "no"
     end,
 })
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index f4092d88..11b6cb24 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -87,26 +87,28 @@ in
         # Modal editing is life, but CLI benefits from emacs gymnastics
         defaultKeymap = "emacs";
 
-        initContent = lib.mkMerge [
-          # Make those happen early to avoid doing double the work
-          (lib.mkBefore (lib.optionalString cfg.launchTmux ''
-            # Launch tmux unless already inside one
-            if [ -z "$TMUX" ]; then
-              exec tmux new-session
-            fi
-          ''))
+        # Make those happen early to avoid doing double the work
+        initExtraFirst = lib.mkBefore ''
+          ${
+            lib.optionalString cfg.launchTmux ''
+              # Launch tmux unless already inside one
+              if [ -z "$TMUX" ]; then
+                exec tmux new-session
+              fi
+            ''
+          }
+        '';
 
-          (lib.mkAfter ''
-            source ${./completion-styles.zsh}
-            source ${./extra-mappings.zsh}
-            source ${./options.zsh}
+        initExtra = lib.mkAfter ''
+          source ${./completion-styles.zsh}
+          source ${./extra-mappings.zsh}
+          source ${./options.zsh}
 
-            # Source local configuration
-            if [ -f "$ZDOTDIR/zshrc.local" ]; then
-              source "$ZDOTDIR/zshrc.local"
-            fi
-          '')
-        ];
+          # Source local configuration
+          if [ -f "$ZDOTDIR/zshrc.local" ]; then
+            source "$ZDOTDIR/zshrc.local"
+          fi
+        '';
 
         localVariables = {
           # I like having the full path
@@ -149,7 +151,7 @@ in
         };
 
         # Use OSC-777 to send the notification through SSH
-        initContent = lib.mkIf cfg.notify.ssh.useOsc777 ''
+        initExtra = lib.mkIf cfg.notify.ssh.useOsc777 ''
           done_send_notification() {
             local exit_status="$1"
             local title="$2"
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index 27f8765a..3992385f 100644
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -15,6 +15,7 @@
     ./gitea
     ./grocy
     ./homebox
+    ./indexers
     ./jellyfin
     ./komga
     ./lohr
diff --git a/modules/nixos/services/homebox/default.nix b/modules/nixos/services/homebox/default.nix
index 8ed5d776..d79e3314 100644
--- a/modules/nixos/services/homebox/default.nix
+++ b/modules/nixos/services/homebox/default.nix
@@ -19,11 +19,6 @@ in
     services.homebox = {
       enable = true;
 
-      # Automatic PostgreSQL provisioning
-      database = {
-        createLocally = true;
-      };
-
       settings = {
         # FIXME: mailer?
         HBOX_WEB_PORT = toString cfg.port;
@@ -33,7 +28,6 @@ in
     my.services.nginx.virtualHosts = {
       homebox = {
         inherit (cfg) port;
-        websocketsLocations = [ "/api" ];
       };
     };
 
diff --git a/modules/nixos/services/indexers/default.nix b/modules/nixos/services/indexers/default.nix
new file mode 100644
index 00000000..8a42345a
--- /dev/null
+++ b/modules/nixos/services/indexers/default.nix
@@ -0,0 +1,78 @@
+# Torrent and usenet meta-indexers
+{ config, lib, ... }:
+let
+  cfg = config.my.services.indexers;
+
+  jackettPort = 9117;
+  nzbhydraPort = 5076;
+  prowlarrPort = 9696;
+in
+{
+  options.my.services.indexers = with lib; {
+    jackett.enable = mkEnableOption "Jackett torrent meta-indexer";
+    nzbhydra.enable = mkEnableOption "NZBHydra2 usenet meta-indexer";
+    prowlarr.enable = mkEnableOption "Prowlarr torrent & usenet meta-indexer";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.jackett.enable {
+      services.jackett = {
+        enable = true;
+      };
+
+      # Jackett wants to eat *all* my RAM if left to its own devices
+      systemd.services.jackett = {
+        serviceConfig = {
+          MemoryHigh = "15%";
+          MemoryMax = "25%";
+        };
+      };
+
+      my.services.nginx.virtualHosts = {
+        jackett = {
+          port = jackettPort;
+        };
+      };
+    })
+
+    (lib.mkIf cfg.nzbhydra.enable {
+      services.nzbhydra2 = {
+        enable = true;
+      };
+
+      my.services.nginx.virtualHosts = {
+        nzbhydra = {
+          port = nzbhydraPort;
+        };
+      };
+    })
+
+    (lib.mkIf cfg.prowlarr.enable {
+      services.prowlarr = {
+        enable = true;
+      };
+
+      my.services.nginx.virtualHosts = {
+        prowlarr = {
+          port = prowlarrPort;
+        };
+      };
+
+      services.fail2ban.jails = {
+        prowlarr = ''
+          enabled = true
+          filter = prowlarr
+          action = iptables-allports
+        '';
+      };
+
+      environment.etc = {
+        "fail2ban/filter.d/prowlarr.conf".text = ''
+          [Definition]
+          failregex = ^.*\|Warn\|Auth\|Auth-Failure ip <HOST> username .*$
+          journalmatch = _SYSTEMD_UNIT=prowlarr.service
+        '';
+      };
+    })
+  ];
+}
diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix
index cf1b876f..fe941778 100644
--- a/modules/nixos/services/nextcloud/default.nix
+++ b/modules/nixos/services/nextcloud/default.nix
@@ -35,7 +35,7 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       enable = true;
-      package = pkgs.nextcloud31;
+      package = pkgs.nextcloud30;
       hostName = "nextcloud.${config.networking.domain}";
       home = "/var/lib/nextcloud";
       maxUploadSize = cfg.maxSize;
diff --git a/modules/nixos/services/servarr/autobrr.nix b/modules/nixos/services/servarr/autobrr.nix
deleted file mode 100644
index c3370cb8..00000000
--- a/modules/nixos/services/servarr/autobrr.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-# IRC-based indexer
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.autobrr;
-in
-{
-  options.my.services.servarr.autobrr = with lib; {
-    enable = mkEnableOption "autobrr IRC announce tracker" // {
-      default = config.my.services.servarr.enableAll;
-    };
-
-    port = mkOption {
-      type = types.port;
-      default = 7474;
-      example = 8080;
-      description = "Internal port for webui";
-    };
-
-    sessionSecretFile = mkOption {
-      type = types.str;
-      example = "/run/secrets/autobrr-secret.txt";
-      description = ''
-        File containing the session secret.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.autobrr = {
-      enable = true;
-
-      settings = {
-        inherit (cfg) port;
-        checkForUpdates = false;
-      };
-
-      secretFile = cfg.sessionSecretFile;
-    };
-
-    my.services.nginx.virtualHosts = {
-      autobrr = {
-        inherit (cfg) port;
-        websocketsLocations = [ "/api" ];
-      };
-    };
-
-    services.fail2ban.jails = {
-      autobrr = ''
-        enabled = true
-        filter = autobrr
-        action = iptables-allports
-      '';
-    };
-
-    environment.etc = {
-      "fail2ban/filter.d/autobrr.conf".text = ''
-        [Definition]
-        failregex = "message":"Auth: Failed login attempt username: \[.*\] ip: <HOST>"
-        journalmatch = _SYSTEMD_UNIT=autobrr.service
-      '';
-    };
-  };
-}
diff --git a/modules/nixos/services/servarr/bazarr.nix b/modules/nixos/services/servarr/bazarr.nix
deleted file mode 100644
index 637da0c7..00000000
--- a/modules/nixos/services/servarr/bazarr.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.bazarr;
-in
-{
-  options.my.services.servarr.bazarr = with lib; {
-    enable = lib.mkEnableOption "Bazarr" // {
-      default = config.my.services.servarr.enableAll;
-    };
-
-    port = mkOption {
-      type = types.port;
-      default = 6767;
-      example = 8080;
-      description = "Internal port for webui";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.bazarr = {
-      enable = true;
-      group = "media";
-      listenPort = cfg.port;
-    };
-
-    # Set-up media group
-    users.groups.media = { };
-
-    my.services.nginx.virtualHosts = {
-      bazarr = {
-        inherit (cfg) port;
-      };
-    };
-
-    # Bazarr does not log authentication failures...
-  };
-}
diff --git a/modules/nixos/services/servarr/cross-seed.nix b/modules/nixos/services/servarr/cross-seed.nix
deleted file mode 100644
index 74f216ae..00000000
--- a/modules/nixos/services/servarr/cross-seed.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-# Automatic cross-seeding for video media
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.cross-seed;
-in
-{
-  options.my.services.servarr.cross-seed = with lib; {
-    enable = mkEnableOption "cross-seed daemon" // {
-      default = config.my.services.servarr.enableAll;
-    };
-
-    port = mkOption {
-      type = types.port;
-      default = 2468;
-      example = 8080;
-      description = "Internal port for daemon";
-    };
-
-    linkDirectory = mkOption {
-      type = types.str;
-      default = "/data/downloads/complete/links";
-      example = "/var/lib/cross-seed/links";
-      description = "Link directory";
-    };
-
-    secretSettingsFile = mkOption {
-      type = types.str;
-      example = "/run/secrets/cross-seed-secrets.json";
-      description = ''
-        File containing secret settings.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.cross-seed = {
-      enable = true;
-      group = "media";
-
-      # Rely on recommended defaults for tracker snatches etc...
-      useGenConfigDefaults = true;
-
-      settings = {
-        inherit (cfg) port;
-        host = "127.0.0.1";
-
-        # Inject torrents to client directly
-        action = "inject";
-        # Query the client for torrents to match
-        useClientTorrents = true;
-        # Use hardlinks
-        linkType = "hardlink";
-        # Use configured link directory
-        linkDirs = [ cfg.linkDirectory ];
-        # Match as many torrents as possible
-        matchMode = "partial";
-        # Cross-seed full season if at least 50% of episodes are already downloaded
-        seasonFromEpisodes = 0.5;
-      };
-
-      settingsFile = cfg.secretSettingsFile;
-    };
-
-    systemd.services.cross-seed = {
-      serviceConfig = {
-        # Loose umask to make cross-seed links readable by `media`
-        UMask = "0002";
-      };
-    };
-
-    # Set-up media group
-    users.groups.media = { };
-
-    my.services.nginx.virtualHosts = {
-      cross-seed = {
-        inherit (cfg) port;
-      };
-    };
-
-    services.fail2ban.jails = {
-      cross-seed = ''
-        enabled = true
-        filter = cross-seed
-        action = iptables-allports
-      '';
-    };
-
-    environment.etc = {
-      "fail2ban/filter.d/cross-seed.conf".text = ''
-        [Definition]
-        failregex = ^.*Unauthorized API access attempt to .* from <HOST>$
-        journalmatch = _SYSTEMD_UNIT=cross-seed.service
-      '';
-    };
-  };
-}
diff --git a/modules/nixos/services/servarr/default.nix b/modules/nixos/services/servarr/default.nix
index dca57cf6..e25d9cfd 100644
--- a/modules/nixos/services/servarr/default.nix
+++ b/modules/nixos/services/servarr/default.nix
@@ -2,22 +2,99 @@
 # Relevant link [1].
 #
 # [1]: https://youtu.be/I26Ql-uX6AM
-{ lib, ... }:
-{
-  imports = [
-    ./autobrr.nix
-    ./bazarr.nix
-    ./cross-seed.nix
-    ./jackett.nix
-    ./nzbhydra.nix
-    ./prowlarr.nix
-    (import ./starr.nix "lidarr")
-    (import ./starr.nix "radarr")
-    (import ./starr.nix "readarr")
-    (import ./starr.nix "sonarr")
-  ];
+{ config, lib, ... }:
+let
+  cfg = config.my.services.servarr;
 
-  options.my.services.servarr = {
-    enableAll = lib.mkEnableOption "media automation suite";
+  ports = {
+    bazarr = 6767;
+    lidarr = 8686;
+    radarr = 7878;
+    readarr = 8787;
+    sonarr = 8989;
   };
+
+  mkService = service: {
+    services.${service} = {
+      enable = true;
+      group = "media";
+    };
+  };
+
+  mkRedirection = service: {
+    my.services.nginx.virtualHosts = {
+      ${service} = {
+        port = ports.${service};
+      };
+    };
+  };
+
+  mkFail2Ban = service: lib.mkIf cfg.${service}.enable {
+    services.fail2ban.jails = {
+      ${service} = ''
+        enabled = true
+        filter = ${service}
+        action = iptables-allports
+      '';
+    };
+
+    environment.etc = {
+      "fail2ban/filter.d/${service}.conf".text = ''
+        [Definition]
+        failregex = ^.*\|Warn\|Auth\|Auth-Failure ip <HOST> username .*$
+        journalmatch = _SYSTEMD_UNIT=${service}.service
+      '';
+    };
+  };
+
+  mkFullConfig = service: lib.mkIf cfg.${service}.enable (lib.mkMerge [
+    (mkService service)
+    (mkRedirection service)
+  ]);
+in
+{
+  options.my.services.servarr = {
+    enable = lib.mkEnableOption "Media automation";
+
+    bazarr = {
+      enable = lib.my.mkDisableOption "Bazarr";
+    };
+
+    lidarr = {
+      enable = lib.my.mkDisableOption "Lidarr";
+    };
+
+    radarr = {
+      enable = lib.my.mkDisableOption "Radarr";
+    };
+
+    readarr = {
+      enable = lib.my.mkDisableOption "Readarr";
+    };
+
+    sonarr = {
+      enable = lib.my.mkDisableOption "Sonarr";
+    };
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      # Set-up media group
+      users.groups.media = { };
+    }
+    # Bazarr does not log authentication failures...
+    (mkFullConfig "bazarr")
+    # Lidarr for music
+    (mkFullConfig "lidarr")
+    (mkFail2Ban "lidarr")
+    # Radarr for movies
+    (mkFullConfig "radarr")
+    (mkFail2Ban "radarr")
+    # Readarr for books
+    (mkFullConfig "readarr")
+    (mkFail2Ban "readarr")
+    # Sonarr for shows
+    (mkFullConfig "sonarr")
+    (mkFail2Ban "sonarr")
+  ]);
 }
diff --git a/modules/nixos/services/servarr/jackett.nix b/modules/nixos/services/servarr/jackett.nix
deleted file mode 100644
index 481cd3de..00000000
--- a/modules/nixos/services/servarr/jackett.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.jackett;
-in
-{
-  options.my.services.servarr.jackett = with lib; {
-    enable = lib.mkEnableOption "Jackett" // {
-      default = config.my.services.servarr.enableAll;
-    };
-
-    port = mkOption {
-      type = types.port;
-      default = 9117;
-      example = 8080;
-      description = "Internal port for webui";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.jackett = {
-      enable = true;
-      inherit (cfg) port;
-    };
-
-    # Jackett wants to eat *all* my RAM if left to its own devices
-    systemd.services.jackett = {
-      serviceConfig = {
-        MemoryHigh = "15%";
-        MemoryMax = "25%";
-      };
-    };
-
-    my.services.nginx.virtualHosts = {
-      jackett = {
-        inherit (cfg) port;
-      };
-    };
-
-    # Jackett does not log authentication failures...
-  };
-}
diff --git a/modules/nixos/services/servarr/nzbhydra.nix b/modules/nixos/services/servarr/nzbhydra.nix
deleted file mode 100644
index 7b639869..00000000
--- a/modules/nixos/services/servarr/nzbhydra.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.nzbhydra;
-in
-{
-  options.my.services.servarr.nzbhydra = with lib; {
-    enable = lib.mkEnableOption "NZBHydra2" // {
-      default = config.my.services.servarr.enableAll;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.nzbhydra2 = {
-      enable = true;
-    };
-
-    my.services.nginx.virtualHosts = {
-      nzbhydra = {
-        port = 5076;
-        websocketsLocations = [ "/" ];
-      };
-    };
-
-    # NZBHydra2 does not log authentication failures...
-  };
-}
diff --git a/modules/nixos/services/servarr/prowlarr.nix b/modules/nixos/services/servarr/prowlarr.nix
deleted file mode 100644
index ce044c63..00000000
--- a/modules/nixos/services/servarr/prowlarr.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-# Torrent and NZB indexer
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.prowlarr;
-in
-{
-  options.my.services.servarr.prowlarr = with lib; {
-    enable = lib.mkEnableOption "Prowlarr" // {
-      default = config.my.services.servarr.enableAll;
-    };
-
-    port = mkOption {
-      type = types.port;
-      default = 9696;
-      example = 8080;
-      description = "Internal port for webui";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.prowlarr = {
-      enable = true;
-
-      settings = {
-        server = {
-          port = cfg.port;
-        };
-      };
-    };
-
-    my.services.nginx.virtualHosts = {
-      prowlarr = {
-        inherit (cfg) port;
-      };
-    };
-
-    services.fail2ban.jails = {
-      prowlarr = ''
-        enabled = true
-        filter = prowlarr
-        action = iptables-allports
-      '';
-    };
-
-    environment.etc = {
-      "fail2ban/filter.d/prowlarr.conf".text = ''
-        [Definition]
-        failregex = ^.*\|Warn\|Auth\|Auth-Failure ip <HOST> username .*$
-        journalmatch = _SYSTEMD_UNIT=prowlarr.service
-      '';
-    };
-  };
-}
diff --git a/modules/nixos/services/servarr/starr.nix b/modules/nixos/services/servarr/starr.nix
deleted file mode 100644
index 2bf7c114..00000000
--- a/modules/nixos/services/servarr/starr.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-# Templated *arr configuration
-starr:
-{ config, lib, ... }:
-let
-  cfg = config.my.services.servarr.${starr};
-  ports = {
-    lidarr = 8686;
-    radarr = 7878;
-    readarr = 8787;
-    sonarr = 8989;
-  };
-in
-{
-  options.my.services.servarr.${starr} = with lib; {
-    enable = lib.mkEnableOption (lib.toSentenceCase starr) // {
-      default = config.my.services.servarr.enableAll;
-    };
-
-    port = mkOption {
-      type = types.port;
-      default = ports.${starr};
-      example = 8080;
-      description = "Internal port for webui";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.${starr} = {
-      enable = true;
-      group = "media";
-
-      settings = {
-        server = {
-          port = cfg.port;
-        };
-      };
-    };
-
-    # Set-up media group
-    users.groups.media = { };
-
-    my.services.nginx.virtualHosts = {
-      ${starr} = {
-        port = cfg.port;
-      };
-    };
-
-    services.fail2ban.jails = {
-      ${starr} = ''
-        enabled = true
-        filter = ${starr}
-        action = iptables-allports
-      '';
-    };
-
-    environment.etc = {
-      "fail2ban/filter.d/${starr}.conf".text = ''
-        [Definition]
-        failregex = ^.*\|Warn\|Auth\|Auth-Failure ip <HOST> username .*$
-        journalmatch = _SYSTEMD_UNIT=${starr}.service
-      '';
-    };
-  };
-}
diff --git a/modules/nixos/services/transmission/default.nix b/modules/nixos/services/transmission/default.nix
index 16d51e3f..ac8b24dd 100644
--- a/modules/nixos/services/transmission/default.nix
+++ b/modules/nixos/services/transmission/default.nix
@@ -65,8 +65,6 @@ in
         # Proxied behind Nginx.
         rpc-whitelist-enabled = true;
         rpc-whitelist = "127.0.0.1";
-
-        umask = "002"; # To go with `downloadDirPermissions`
       };
     };
 
diff --git a/overlays/lsp-format-nvim-indentation/default.nix b/overlays/lsp-format-nvim-indentation/default.nix
new file mode 100644
index 00000000..832e71de
--- /dev/null
+++ b/overlays/lsp-format-nvim-indentation/default.nix
@@ -0,0 +1,4 @@
+self: prev:
+{
+  vimPlugins = prev.vimPlugins.extend (self.callPackage ./generated.nix { });
+}
diff --git a/overlays/lsp-format-nvim-indentation/generated.nix b/overlays/lsp-format-nvim-indentation/generated.nix
new file mode 100644
index 00000000..19022078
--- /dev/null
+++ b/overlays/lsp-format-nvim-indentation/generated.nix
@@ -0,0 +1,14 @@
+{ fetchpatch, ... }:
+
+_final: prev: {
+  lsp-format-nvim = prev.lsp-format-nvim.overrideAttrs (oa: {
+    patches = (oa.patches or [ ]) ++ [
+      # https://github.com/lukas-reineke/lsp-format.nvim/issues/94
+      (fetchpatch {
+        name = "use-effective-indentation";
+        url = "https://github.com/liskin/lsp-format.nvim/commit/3757ac443bdf5bd166673833794553229ee8d939.patch";
+        hash = "sha256-Dv+TvXrU/IrrPxz2MSPbLmRxch+qkHbI3AyFMj/ssDk=";
+      })
+    ];
+  });
+}
diff --git a/templates/c++-cmake/flake.nix b/templates/c++-cmake/flake.nix
index 7796f5e5..db3b35c1 100644
--- a/templates/c++-cmake/flake.nix
+++ b/templates/c++-cmake/flake.nix
@@ -16,18 +16,19 @@
       ref = "nixos-unstable";
     };
 
-    git-hooks = {
+    pre-commit-hooks = {
       type = "github";
       owner = "cachix";
-      repo = "git-hooks.nix";
+      repo = "pre-commit-hooks.nix";
       ref = "master";
       inputs = {
+        flake-utils.follows = "futils";
         nixpkgs.follows = "nixpkgs";
       };
     };
   };
 
-  outputs = { self, futils, nixpkgs, git-hooks }:
+  outputs = { self, futils, nixpkgs, pre-commit-hooks }:
     {
       overlays = {
         default = final: _prev: {
@@ -68,7 +69,7 @@
           ];
         };
 
-        pre-commit = git-hooks.lib.${system}.run {
+        pre-commit = pre-commit-hooks.lib.${system}.run {
           src = self;
 
           hooks = {
@@ -91,12 +92,12 @@
 
         devShells = {
           default = pkgs.mkShell {
-            inputsFrom = [
-              self.packages.${system}.project
+            inputsFrom = with self.packages.${system}; [
+              project
             ];
 
             packages = with pkgs; [
-              self.checks.${system}.pre-commit.enabledPackages
+              clang-tools
             ];
 
             inherit (pre-commit) shellHook;
diff --git a/templates/c++-meson/flake.nix b/templates/c++-meson/flake.nix
index cb14eb56..5957c621 100644
--- a/templates/c++-meson/flake.nix
+++ b/templates/c++-meson/flake.nix
@@ -16,18 +16,19 @@
       ref = "nixos-unstable";
     };
 
-    git-hooks = {
+    pre-commit-hooks = {
       type = "github";
       owner = "cachix";
-      repo = "git-hooks.nix";
+      repo = "pre-commit-hooks.nix";
       ref = "master";
       inputs = {
+        flake-utils.follows = "futils";
         nixpkgs.follows = "nixpkgs";
       };
     };
   };
 
-  outputs = { self, futils, nixpkgs, git-hooks }:
+  outputs = { self, futils, nixpkgs, pre-commit-hooks }:
     {
       overlays = {
         default = final: _prev: {
@@ -68,7 +69,7 @@
           ];
         };
 
-        pre-commit = git-hooks.lib.${system}.run {
+        pre-commit = pre-commit-hooks.lib.${system}.run {
           src = self;
 
           hooks = {
@@ -91,12 +92,12 @@
 
         devShells = {
           default = pkgs.mkShell {
-            inputsFrom = [
-              self.packages.${system}.project
+            inputsFrom = with self.packages.${system}; [
+              project
             ];
 
             packages = with pkgs; [
-              self.checks.${system}.pre-commit.enabledPackages
+              clang-tools
             ];
 
             inherit (pre-commit) shellHook;
diff --git a/templates/default.nix b/templates/default.nix
index 51864cda..44db753a 100644
--- a/templates/default.nix
+++ b/templates/default.nix
@@ -7,10 +7,6 @@
     path = ./c++-meson;
     description = "A C++ project using Meson";
   };
-  "python-uv" = {
-    path = ./python-uv;
-    description = "A Python project using uv";
-  };
   "rust-cargo" = {
     path = ./rust-cargo;
     description = "A Rust project using Cargo";
diff --git a/templates/python-uv/.envrc b/templates/python-uv/.envrc
deleted file mode 100644
index 390d06d4..00000000
--- a/templates/python-uv/.envrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# shellcheck shell=bash
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.0; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.0/direnvrc" "sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg="
-fi
-
-use flake
diff --git a/templates/python-uv/.gitignore b/templates/python-uv/.gitignore
deleted file mode 100644
index c79d1e89..00000000
--- a/templates/python-uv/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# Virtual environments
-.venv
-
-# Nix generated files
-/.pre-commit-config.yaml
-/result
diff --git a/templates/python-uv/.woodpecker/check.yml b/templates/python-uv/.woodpecker/check.yml
deleted file mode 100644
index 272c0e43..00000000
--- a/templates/python-uv/.woodpecker/check.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-labels:
-  backend: local
-
-steps:
-- name: pre-commit check
-  image: bash
-  commands:
-  - nix develop --command pre-commit run --all
-
-- name: nix flake check
-  image: bash
-  commands:
-  - nix flake check
-
-- name: notify
-  image: bash
-  environment:
-    ADDRESS:
-      from_secret: matrix_homeserver
-    ROOM:
-      from_secret: matrix_roomid
-    USER:
-      from_secret: matrix_username
-    PASS:
-      from_secret: matrix_password
-  commands:
-  - nix run github:ambroisie/matrix-notifier
-  when:
-    status:
-    - failure
-    - success
diff --git a/templates/python-uv/flake.nix b/templates/python-uv/flake.nix
deleted file mode 100644
index 5059e646..00000000
--- a/templates/python-uv/flake.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  description = "A Python project";
-
-  inputs = {
-    futils = {
-      type = "github";
-      owner = "numtide";
-      repo = "flake-utils";
-      ref = "main";
-    };
-
-    nixpkgs = {
-      type = "github";
-      owner = "NixOS";
-      repo = "nixpkgs";
-      ref = "nixos-unstable";
-    };
-
-    git-hooks = {
-      type = "github";
-      owner = "cachix";
-      repo = "git-hooks.nix";
-      ref = "master";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-  };
-
-  outputs = { self, futils, nixpkgs, git-hooks }:
-    {
-      overlays = {
-        default = final: _prev: {
-          project = with final; python3.pkgs.buildPythonApplication {
-            pname = "project";
-            version = (final.lib.importTOML ./pyproject.toml).project.version;
-            pyproject = true;
-
-            src = self;
-
-            build-system = with python3.pkgs; [ setuptools ];
-
-            pythonImportsCheck = [ "project" ];
-
-            meta = with lib; {
-              description = "A Python project";
-              homepage = "https://git.belanyi.fr/ambroisie/project";
-              license = licenses.mit;
-              maintainers = with maintainers; [ ambroisie ];
-            };
-          };
-        };
-      };
-    } // futils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [
-            self.overlays.default
-          ];
-        };
-
-        pre-commit = git-hooks.lib.${system}.run {
-          src = self;
-
-          hooks = {
-            mypy = {
-              enable = true;
-            };
-
-            nixpkgs-fmt = {
-              enable = true;
-            };
-
-            ruff = {
-              enable = true;
-            };
-
-            ruff-format = {
-              enable = true;
-            };
-          };
-        };
-      in
-      {
-        checks = {
-          inherit (self.packages.${system}) project;
-
-          inherit pre-commit;
-        };
-
-        devShells = {
-          default = pkgs.mkShell {
-            inputsFrom = [
-              self.packages.${system}.project
-            ];
-
-            packages = with pkgs; [
-              uv
-              self.checks.${system}.pre-commit.enabledPackages
-            ];
-
-            inherit (pre-commit) shellHook;
-          };
-        };
-
-        packages = futils.lib.flattenTree {
-          default = pkgs.project;
-          inherit (pkgs) project;
-        };
-      });
-}
diff --git a/templates/python-uv/pyproject.toml b/templates/python-uv/pyproject.toml
deleted file mode 100644
index 7b2d896d..00000000
--- a/templates/python-uv/pyproject.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
-
-[project]
-name = "project"
-version = "0.0.0"
-description = "project description"
-requires-python = ">=3.12"
-dependencies = []
-
-[project.scripts]
-project = "project:main"
-
-[dependency-groups]
-dev = []
diff --git a/templates/python-uv/src/project/__init__.py b/templates/python-uv/src/project/__init__.py
deleted file mode 100644
index b06117df..00000000
--- a/templates/python-uv/src/project/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def main() -> None:
-    print("Hello, world!")
diff --git a/templates/rust-cargo/flake.nix b/templates/rust-cargo/flake.nix
index efd8358d..6d50369d 100644
--- a/templates/rust-cargo/flake.nix
+++ b/templates/rust-cargo/flake.nix
@@ -16,18 +16,19 @@
       ref = "nixos-unstable";
     };
 
-    git-hooks = {
+    pre-commit-hooks = {
       type = "github";
       owner = "cachix";
-      repo = "git-hooks.nix";
+      repo = "pre-commit-hooks.nix";
       ref = "master";
       inputs = {
+        flake-utils.follows = "futils";
         nixpkgs.follows = "nixpkgs";
       };
     };
   };
 
-  outputs = { self, futils, nixpkgs, git-hooks }:
+  outputs = { self, futils, nixpkgs, pre-commit-hooks }:
     {
       overlays = {
         default = final: _prev: {
@@ -59,7 +60,7 @@
           ];
         };
 
-        pre-commit = git-hooks.lib.${system}.run {
+        pre-commit = pre-commit-hooks.lib.${system}.run {
           src = self;
 
           hooks = {
@@ -87,13 +88,14 @@
 
         devShells = {
           default = pkgs.mkShell {
-            inputsFrom = [
-              self.packages.${system}.project
+            inputsFrom = with self.packages.${system}; [
+              project
             ];
 
             packages = with pkgs; [
+              clippy
               rust-analyzer
-              self.checks.${system}.pre-commit.enabledPackages
+              rustfmt
             ];
 
             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";