diff --git a/home/neovim/lsp/default.nix b/home/neovim/lsp/default.nix
index ee113f7..0085488 100644
--- a/home/neovim/lsp/default.nix
+++ b/home/neovim/lsp/default.nix
@@ -12,21 +12,6 @@
       ultisnips
     ];
 
-    autoGroups = {
-      format_on_save = {
-        clear = true;
-      };
-    };
-    autoCmd = [
-      {
-        event = [ "BufWritePre" ];
-        buffer = 0;
-        command = "lua vim.lsp.buf.format()";
-        desc = "Auto-format on save";
-        group = "format_on_save";
-      }
-    ];
-
     # Required for the `lsp-lines` plugin
     diagnostic = {
       settings = {
@@ -74,7 +59,9 @@
       # see https://github.com/lukas-reineke/lsp-format.nvim/
       lsp-format = {
         enable = true;
-        lspServersToEnable = "all";
+        lspServersToEnable = [
+          "null-ls"
+        ];
       };
 
       # see https://github.com/nvimtools/none-ls.nvim/
diff --git a/home/neovim/lsp/java.nix b/home/neovim/lsp/java.nix
index 1e783af..ca82143 100644
--- a/home/neovim/lsp/java.nix
+++ b/home/neovim/lsp/java.nix
@@ -13,5 +13,18 @@
         };
       };
     };
+
+    plugins.none-ls = {
+      sources.formatting = {
+        google_java_format = {
+          enable = true;
+          package = pkgs.google-java-format;
+          settings = {
+            filetypes = [ "java" ];
+            extra_args = [ "--aosp" ];
+          };
+        };
+      };
+    };
   };
 }
diff --git a/home/neovim/lsp/nix.nix b/home/neovim/lsp/nix.nix
index 623d92b..cbb2c18 100644
--- a/home/neovim/lsp/nix.nix
+++ b/home/neovim/lsp/nix.nix
@@ -8,5 +8,11 @@
         enable = true;
       };
     };
+
+    plugins.none-ls.sources = {
+      formatting = {
+        nixfmt.enable = true;
+      };
+    };
   };
 }