diff --git a/config/default.nix b/config/default.nix
index a894c07..2ba6591 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -22,4 +22,6 @@
     ./treesitter.nix
     ./which-key.nix
   ];
+
+  plugins.web-devicons.enable = true;
 }
diff --git a/config/lsp/conform.nix b/config/lsp/conform.nix
index c55e7e8..dd31e8f 100644
--- a/config/lsp/conform.nix
+++ b/config/lsp/conform.nix
@@ -3,6 +3,25 @@
   plugins.conform-nvim = {
     enable = true;
     settings = {
+      format_on_save = ''
+        function(bufnr)
+          if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+            return
+          end
+
+          if slow_format_filetypes[vim.bo[bufnr].filetype] then
+            return
+          end
+
+          local function on_format(err)
+            if err and err:match("timeout$") then
+              slow_format_filetypes[vim.bo[bufnr].filetype] = true
+            end
+          end
+
+          return { timeout_ms = 200, lsp_fallback = true }, on_format
+         end
+      '';
       format_after_save = ''
         function(bufnr)
           if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
@@ -43,4 +62,8 @@
     taplo
     yq
   ];
+
+  extraConfigLuaPre = ''
+    local slow_format_filetypes = { "scala" }
+  '';
 }