From b5069d742c287f442373f601d53cdadbd24a7d6c Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Mon, 25 Dec 2023 15:39:20 +0800
Subject: [PATCH] chore(vscode): update settings

---
 flake.lock           | 56 +++++++++++++++++++-------------------------
 flake.nix            |  2 --
 home/apps/vscode.nix | 12 ++++++++--
 3 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/flake.lock b/flake.lock
index 436242d..f1c796c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,20 +21,12 @@
       }
     },
     "catppuccin": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1699141637,
-        "narHash": "sha256-gNW6jw/lzxIYdenbxN7ZPkdEy1dmFFXO206twDemprM=",
+        "lastModified": 1702771919,
+        "narHash": "sha256-l6zkit3WPXuukWrQDpaNVNEQ2Y0lq1K+7OQmvtqFIJU=",
         "owner": "Stonks3141",
         "repo": "ctp-nix",
-        "rev": "cceb51991e943e15b58d1d2483f93d5025ac1dd8",
+        "rev": "4a76ba2815b6db301597630d14e4e40f4fb5fb0f",
         "type": "github"
       },
       "original": {
@@ -86,11 +78,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1702448575,
-        "narHash": "sha256-Gm8lI5vumDEryeUI+bT8w0AIvbolZIGh0F/E0mQSLcw=",
+        "lastModified": 1703485398,
+        "narHash": "sha256-eJkxehEmQjSLD/UwPCXlHxH6g41R66fY7Hw9AOSsQA8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "dcf3ca909bd069e6a5737461b64c8d894c6dee85",
+        "rev": "57a533b99ebe646449b71718e43ca29b550bd254",
         "type": "github"
       },
       "original": {
@@ -168,11 +160,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702423270,
-        "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=",
+        "lastModified": 1703368619,
+        "narHash": "sha256-ZGPMYL7FMA6enhuwby961bBANmoFX14EA86m2/Jw5Jo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db",
+        "rev": "a2523ea0343b056ba240abbac90ab5f116a7aa7b",
         "type": "github"
       },
       "original": {
@@ -228,11 +220,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "lastModified": 1703415240,
+        "narHash": "sha256-SgsAYwDo2wWHUdZeNKKRRT402sRzQ/rLmzxH/wqMUPw=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "f454cff5fe84adca9e8aa8d546d2c9879b789950",
         "type": "github"
       },
       "original": {
@@ -243,11 +235,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702272962,
-        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "lastModified": 1703134684,
+        "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523",
         "type": "github"
       },
       "original": {
@@ -264,11 +256,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702296501,
-        "narHash": "sha256-5G7R/Pl7W47h13LOYN9dsvEAyaBnnW1TTARvbZ9qSR0=",
+        "lastModified": 1703489168,
+        "narHash": "sha256-ogmMzEBwSNvS3btSvZuV5deYp0DXXGkwVGPoZjChWKw=",
         "owner": "ryanccn",
         "repo": "nrr",
-        "rev": "2e59f5cd741319bea29920e70f638cc305c87dc6",
+        "rev": "4eb4e706b9b07a8bf845364d141706d00c47c990",
         "type": "github"
       },
       "original": {
@@ -299,11 +291,11 @@
     "ohmyzsh": {
       "flake": false,
       "locked": {
-        "lastModified": 1701850926,
-        "narHash": "sha256-OZc6FxmfQoFfEd589g4f022F6CUHQyEWwV/Ka0HCGag=",
+        "lastModified": 1703407251,
+        "narHash": "sha256-b1qKHk2y9zCSFtGKS+yuXdi8FMI8Vd6XgI3zf/UoWa4=",
         "owner": "ohmyzsh",
         "repo": "ohmyzsh",
-        "rev": "48ccc7b36de8efb2bd7beb9bd6e0a6f6fe03b95d",
+        "rev": "f74add6cb215b55722f9e64273be82d7bae5014e",
         "type": "github"
       },
       "original": {
@@ -336,11 +328,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1702418101,
-        "narHash": "sha256-XyrXFAiMS5r9Kl4lPpmkTTclPKGwJBxln6enERe5nvk=",
+        "lastModified": 1703421399,
+        "narHash": "sha256-GRRhRsZvVgH/Rx2zic0c1Rxt7VumRPqsan6sqculRvU=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "b3af1916ccfb85233571ce9ecb45a3a7c74ba0fb",
+        "rev": "85fb463fc586594925f05fc8e285b1568f98f41a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index fdbd3c7..aee654d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,8 +18,6 @@
 
     catppuccin = {
       url = "github:Stonks3141/ctp-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
     };
 
     am = {
diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix
index f3e1428..9dd4c23 100644
--- a/home/apps/vscode.nix
+++ b/home/apps/vscode.nix
@@ -109,6 +109,9 @@ in {
       "terminal.integrated.inheritEnv" = false;
       "terminal.integrated.shellIntegration.enabled" = true;
 
+      "javascript.preferGoToSourceDefinition" = true;
+      "typescript.preferGoToSourceDefinition" = true;
+
       "shellcheck.ignorePatterns" = {
         ".envrc" = true;
       };
@@ -140,8 +143,6 @@ in {
       "[python]"."editor.defaultFormatter" = "charliermarsh.ruff";
       "[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";
       "[svelte]"."editor.defaultFormatter" = "svelte.svelte-vscode";
       "[go][go.mod][go.sum]"."editor.defaultFormatter" = "golang.go";
       "[xml]"."editor.defaultFormatter" = "DotJoshJohnson.xml";
@@ -150,6 +151,8 @@ in {
       "[mdx]"."editor.wordWrap" = "on";
       "[astro]"."editor.defaultFormatter" = "astro-build.astro-vscode";
 
+      "[rust]"."editor.tabSize" = 4;
+      "[rust]"."editor.defaultFormatter" = "rust-lang.rust-analyzer";
       "rust-analyzer.server.path" = "${pkgs.rust-analyzer}/bin/rust-analyzer";
 
       "files.associations" = {
@@ -174,6 +177,7 @@ in {
 
       "clang-format.executable" = "${pkgs.clang-tools}/bin/clang-format";
 
+      "[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide";
       "nix.enableLanguageServer" = true;
       "nix.serverPath" = "${pkgs.nil}/bin/nil";
       "nix.serverSettings" = {
@@ -183,6 +187,10 @@ in {
           };
         };
       };
+
+      "typst-lsp.exportPdf" = "never";
+      "typst-lsp.experimentalFormatterMode" = "on";
+      "[typst]"."editor.defaultFormatter" = "nvarner.typst-lsp";
     };
   };