From 4205344bb6fae502afaee2f7a3a2a62ce5684ce2 Mon Sep 17 00:00:00 2001
From: Avery <aveeryy@protonmail.com>
Date: Tue, 22 Jul 2025 15:00:06 +0200
Subject: [PATCH] refactor(nixvim): Change autoformatting method

---
 common/home-manager/nixvim/lsp.nix     | 10 ++++++++++
 common/home-manager/nixvim/none-ls.nix | 14 --------------
 flake.lock                             | 18 +++++++++---------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/common/home-manager/nixvim/lsp.nix b/common/home-manager/nixvim/lsp.nix
index aff3fff..b45a33b 100644
--- a/common/home-manager/nixvim/lsp.nix
+++ b/common/home-manager/nixvim/lsp.nix
@@ -3,6 +3,15 @@
     lsp = {
       enable = true;
       keymaps.lspBuf."<leader>ca" = "code_action";
+      luaConfig.post = ''
+        vim.api.nvim_create_augroup("FormatOnSave", {})
+        vim.api.nvim_create_autocmd("BufWritePre", {
+          group = "FormatOnSave",
+          callback = function()
+            vim.lsp.buf.format({ async = false })
+          end,
+        })
+      '';
       servers = {
         cssls.enable = true;
         dartls.enable = true;
@@ -13,6 +22,7 @@
           enable = true;
           installCargo = false;
           installRustc = false;
+          settings.rustfmt.extraArgs = [ "--edition" "2024" ];
         };
         svelte.enable = true;
         volar = {
diff --git a/common/home-manager/nixvim/none-ls.nix b/common/home-manager/nixvim/none-ls.nix
index 887bb64..3703392 100644
--- a/common/home-manager/nixvim/none-ls.nix
+++ b/common/home-manager/nixvim/none-ls.nix
@@ -1,20 +1,6 @@
 { ... }: {
   programs.nixvim.plugins.none-ls = {
     enable = true;
-    settings.on_attach = ''
-      function(client, bufnr)
-        if client.supports_method("textDocument/formatting") then
-          vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-          vim.api.nvim_create_autocmd("BufWritePre", {
-            group = augroup,
-            buffer = bufnr,
-            callback = function()
-              vim.lsp.buf.format({ async = false })
-            end,
-          })
-        end
-      end
-    '';
     sources = {
       formatting = {
         black.enable = true;
diff --git a/flake.lock b/flake.lock
index e3e23b2..48216b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -194,11 +194,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1751413152,
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
         "type": "github"
       },
       "original": {
@@ -531,11 +531,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1750731501,
-        "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=",
+        "lastModified": 1752077645,
+        "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "69dfebb3d175bde602f612915c5576a41b18486b",
+        "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
         "type": "github"
       },
       "original": {
@@ -553,11 +553,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1750788551,
-        "narHash": "sha256-7tQIndetzeVtTuYQ7vYTaABUS1muiigdXK3XyXuPzvg=",
+        "lastModified": 1752976861,
+        "narHash": "sha256-59HcrqHfbSJUdmpzrAa9x8fW1PoS+ZGhCjL5k5HbyV8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "6a15c2ffc50ca7998df2fd6b86c3c9f298e9137a",
+        "rev": "0c50ed9349199219583cb1ed1a972d71e06039ec",
         "type": "github"
       },
       "original": {