From 9fef716261612bbfbc3ff19c7e3f938cc797906f Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Tue, 19 Sep 2023 22:10:13 +0800
Subject: [PATCH] feat(vscode): add clang-format

---
 flake.lock           | 48 ++++++++++++++++++++++----------------------
 home/apps/vscode.nix |  6 ++++--
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index b481664..1f8e9da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694795069,
-        "narHash": "sha256-Y0BlJ3DMxABXbqcHXuOcqkC2LfjmOhVcW9GtGWSTSoU=",
+        "lastModified": 1695003887,
+        "narHash": "sha256-ZgeWw3228YJ5wSSLA7SLoMp8dRKfmgZxcaBxjTFrhNY=",
         "owner": "ryanccn",
         "repo": "am",
-        "rev": "a1eb614655eb16d837671cff1e2de8dd3aee0d04",
+        "rev": "2c7c541267432abbda1efbe8102cde9cd0ddcaf2",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693787605,
-        "narHash": "sha256-rwq5U8dy+a9JFny/73L0SJu1GfWwATMPMTp7D+mjHy8=",
+        "lastModified": 1695081215,
+        "narHash": "sha256-r2r4/aQwqXPnKyduPR6hkByeiJi00DFp6CXX1YtEL8k=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "8b4f7a4dab2120cf41e7957a28a853f45016bd9d",
+        "rev": "681ad0016630ded86c386a3dbcc13c702650ba08",
         "type": "github"
       },
       "original": {
@@ -127,11 +127,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1694931580,
-        "narHash": "sha256-S05uPvgL4TyE8CWSv9H65F1Fsh0kz6BmrGRUI1K1C8s=",
+        "lastModified": 1695104496,
+        "narHash": "sha256-B+itawD+o58jjolphhMLnSvtY6aPAZtExE24Eqq5FBA=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "9f7ae8cf9a4886627b4db257183231d372690012",
+        "rev": "82619f17173aae0216eedd589445541a7804ba4e",
         "type": "github"
       },
       "original": {
@@ -208,11 +208,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694643239,
-        "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
+        "lastModified": 1695103414,
+        "narHash": "sha256-/kr1AQ8aPWl3OaTzZARhGPSS044vZq1Vh4wYX77T1DE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
+        "rev": "92364581dd3ada6981c4ddc5def8a35a1b945e75",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694810318,
-        "narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=",
+        "lastModified": 1695114819,
+        "narHash": "sha256-/aIfbZxP39QZ8m7qX2RzQTy5PWzz2e22cCcZ+AOO7lA=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8",
+        "rev": "afeddc412b3a3b0e7c9ef7ea5fbdf2186781d102",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694760568,
-        "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
+        "lastModified": 1694948089,
+        "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
+        "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1694882901,
-        "narHash": "sha256-ps6eZmuSXV48jzwBB3c0jiS5FKQAxdKLeo3Zc2Nuh5M=",
+        "lastModified": 1695027950,
+        "narHash": "sha256-u4lq0LBmXqEfppyeYQqg6w+4Abk2qDnmsPEF+C2xFdQ=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "9d0ccf01a16f4ab72417a804c5a7414f312d95a0",
+        "rev": "258b15c506a2d3ad862fd17ae24eaf272443f477",
         "type": "github"
       },
       "original": {
@@ -362,11 +362,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694916722,
-        "narHash": "sha256-DBxuPOyhaHw3WY6s2KsaGyGrOkvmuiORC4DjIz8XTbM=",
+        "lastModified": 1695089518,
+        "narHash": "sha256-mOBsJpwnW/Z/1Mz6/WLMq+wCBw1aDHF8xkDThKL+kfc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9d34219b9788fb5cde6f5b5759211d606f5131ec",
+        "rev": "a66b7aa98a2a54b9bf81d8ef4e78db2eaad80d5c",
         "type": "github"
       },
       "original": {
diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix
index 747fc6d..c3d2249 100644
--- a/home/apps/vscode.nix
+++ b/home/apps/vscode.nix
@@ -11,6 +11,7 @@
     "bradlc.vscode-tailwindcss"
     "Catppuccin.catppuccin-vsc"
     "Catppuccin.catppuccin-vsc-icons"
+    "xaver.clang-format"
     "csstools.postcss"
     "denoland.vscode-deno"
     "dbaeumer.vscode-eslint"
@@ -31,7 +32,6 @@
     "ms-python.vscode-pylance"
     "ms-python.python"
     "mvllow.rose-pine"
-    "ms-vscode.cpptools"
     "Prisma.prisma"
     "nvarner.typst-lsp"
     "ronnidc.nunjucks"
@@ -134,7 +134,7 @@ in {
 
       "[python]"."editor.tabSize" = 4;
       "[python]"."editor.defaultFormatter" = "ms-python.black-formatter";
-      "[cpp]"."editor.defaultFormatter" = "ms-vscode.cpptools";
+      "[cpp]"."editor.defaultFormatter" = "xaver.clang-format";
       "[toml]"."editor.defaultFormatter" = "tamasfe.even-better-toml";
       "[rust]"."editor.defaultFormatter" = "rust-lang.rust-analyzer";
       "[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide";
@@ -168,6 +168,8 @@ in {
 
       "svelte.enable-ts-plugin" = true;
 
+      "clang-format.executable" = "${pkgs.clang-tools}/bin/clang-format";
+
       "nix.enableLanguageServer" = true;
       "nix.serverPath" = "${pkgs.nil}/bin/nil";
       "nix.serverSettings" = {