fix(neovim): use correct formatter name option

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782949081,
+        "lastModified": 1788450739,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785496534,
+        "lastModified": 1789867870,
-        "narHash": "sha256-EASdusMYLuPhOCrE3LmsAGOvGhX3vnKBLxFvj9lI8tU=",
+        "narHash": "sha256-sOag/7DTqw4tXLI7UxjrZxPGV+dlTe6zFtJn0VSkgFM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e8827fbbb12015a8dd9f66285aec79d655bcb9f6",
+        "rev": "d2a22a3659a6ae99847ea9176114f6957b8ac62e",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785454630,
+        "lastModified": 1789785513,
-        "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=",
+        "narHash": "sha256-B44WL6h0XoLjJ41bUPJk0X5SDinLCII//6EcBLXKiJ0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746",
+        "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1784555310,
+        "lastModified": 1789073787,
-        "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=",
+        "narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493",
+        "rev": "aff8a0b28396750446e5537a96461bc4facdb287",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1785364321,
+        "lastModified": 1789740794,
-        "narHash": "sha256-BLuHl+nZKb+FDq3GAM6L+UBEiyVepXANA31fT1F56pw=",
+        "narHash": "sha256-c25hFVF7muJOFNfvLWyXZh+W9b5rW7mcZ2tTij1jrP8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "acd69cc15d57004e8cb4495034320263a3d362ea",
+        "rev": "56839cde1c3239470ec38545e8dadc6f9267cc8d",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783174389,
+        "lastModified": 1789890976,
-        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
+        "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
+        "rev": "7214124c20c1542c90deb54af50e2f53ae02711f",
         "type": "github"
       },
       "original": {
@@ -122,6 +122,7 @@
       }
     },
     "systems": {
+      "flake": false,
       "locked": {
         "lastModified": 1774449309,
         "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",

home-manager/base/nixvim/plugins/cmp.nix

@@ -7,13 +7,11 @@
     ];
 
     plugins = {
-      lspkind = {
+      lspkind.enable = true;
-        enable = true;
-        settings.mode = "symbol";
-      };
 
       cmp = {
         enable = true;
+
         autoEnableSources = true;
 
         settings = {
@@ -21,7 +19,7 @@
 
           formatting.fields = [
             "abbr"
-            "kind"
+            "icon"
             "menu"
           ];
 

home-manager/base/nixvim/plugins/default.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ./cmp.nix
-    #./dap.nix
+    ./dap.nix
     ./lsp.nix
     ./fmt.nix
     ./treesitter.nix

home-manager/base/nixvim/plugins/fmt.nix

@@ -21,34 +21,29 @@
       };
       settings = {
         default_format_opts.lsp_format = "fallback";
-        format_on_save = ''
+        format_on_save = {
-          function(bufnr)
+          lsp_format = "fallback";
-            local disable_filetypes = { c = true, cpp = true }
+          timeout_ms = 500;
-            local lsp_format_opt
+        };
-            if disable_filetypes[vim.bo[bufnr].filetype] then
-              lsp_format_opt = 'never'
-            else
-              lsp_format_opt = 'fallback'
-            end
-            return {
-              timeout_ms = 500,
-              lsp_format = lsp_format_opt,
-            }
-          end
-        '';
 
         formatters_by_ft = {
+          c = [ "clang-format" ];
           lua = [ "stylua" ];
           nix = [ "nixfmt" ];
-          python = [ "black" ];
+          python = [ "ruff_format" ];
         };
+
+        formatters.clang-format.prepend_args = [
+          "--style=file"
+          "--fallback-style=LLVM"
+        ];
       };
     };
 
     extraPackages = with pkgs; [
       stylua
       nixfmt
-      black
+      ruff
     ];
   };
 }

home-manager/base/nixvim/plugins/lsp.nix

@@ -43,7 +43,7 @@
         servers = {
           lua_ls.enable = true;
           nil_ls.enable = true;
-          pyright.enable = true;
+          basedpyright.enable = true;
           ts_ls.enable = true;
           vue_ls.enable = true;
           rust_analyzer = {
@@ -51,13 +51,7 @@
             installCargo = false;
             installRustc = false;
           };
-          qmlls = {
+          clangd.enable = true;
-            enable = true;
-            cmd = [
-              "qmlls"
-              "-E"
-            ];
-          };
         };
       };
     };