From 40011e8ddb45757b64a66c8acca35817d6c0e8a3 Mon Sep 17 00:00:00 2001
From: Rudolf Tucek <rudolf.tucek@watt-analytics.com>
Date: Sat, 19 Sep 2026 23:56:29 +0200
Subject: [PATCH 1/4] neovim: avoid double-formatting

Up until now, we were formatting via auto-command on-safe as well as with any conceivable LSP.
For now, we'll exclusively rely the LSP plugin.
---
 home/neovim/lsp/default.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

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/

From ef8bf48f89e3979b55aebcfff9bb183b1d2c546a Mon Sep 17 00:00:00 2001
From: Rudolf Tucek <rudolf.tucek@watt-analytics.com>
Date: Sat, 19 Sep 2026 23:56:50 +0200
Subject: [PATCH 2/4] neovim: use `none-ls` for formatting

---
 home/neovim/lsp/nix.nix | 6 ++++++
 1 file changed, 6 insertions(+)

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;
+      };
+    };
   };
 }

From edf295614323e08203564b57484d94cb19115540 Mon Sep 17 00:00:00 2001
From: Rudolf Tucek <rudolf.tucek@watt-analytics.com>
Date: Sat, 19 Sep 2026 23:56:51 +0200
Subject: [PATCH 3/4] neovim: use none-ls and Google formatter for Java
 formatting

---
 home/neovim/lsp/java.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/home/neovim/lsp/java.nix b/home/neovim/lsp/java.nix
index 1e783af..3c2ead8 100644
--- a/home/neovim/lsp/java.nix
+++ b/home/neovim/lsp/java.nix
@@ -13,5 +13,17 @@
         };
       };
     };
+
+    plugins.none-ls = {
+      sources.formatting = {
+        google_java_format = {
+          enable = true;
+          package = pkgs.google-java-format;
+          settings = {
+            filetypes = [ "java" ];
+          };
+        };
+      };
+    };
   };
 }

From 6433b3faf2e9c5b8c6a3aa4d38e781c86e0d2f43 Mon Sep 17 00:00:00 2001
From: Rudolf Tucek <rudolf.tucek@watt-analytics.com>
Date: Sat, 19 Sep 2026 23:56:51 +0200
Subject: [PATCH 4/4] neovim: apply Google's aosp mode for Java formatting

---
 home/neovim/lsp/java.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/neovim/lsp/java.nix b/home/neovim/lsp/java.nix
index 3c2ead8..ca82143 100644
--- a/home/neovim/lsp/java.nix
+++ b/home/neovim/lsp/java.nix
@@ -21,6 +21,7 @@
           package = pkgs.google-java-format;
           settings = {
             filetypes = [ "java" ];
+            extra_args = [ "--aosp" ];
           };
         };
       };