From 1cd12ecf978fe11271acf70777bc6815d6818937 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Wed, 22 Nov 2023 08:31:01 +0800
Subject: [PATCH] home, sway: modify vscode configuration

---
 .../home-manager/modules/editor/vscode.nix        | 15 ++++++++++-----
 .../profiles/graphical-stuff/darwin/default.nix   | 11 ++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/users/guanranwang/home-manager/modules/editor/vscode.nix b/users/guanranwang/home-manager/modules/editor/vscode.nix
index 9b9c9f6..f3d5528 100644
--- a/users/guanranwang/home-manager/modules/editor/vscode.nix
+++ b/users/guanranwang/home-manager/modules/editor/vscode.nix
@@ -26,7 +26,8 @@
       editor.cursorSmoothCaretAnimation = "on";
       editor.fontFamily = lib.mkDefault "Monospace";
       editor.fontWeight = 600;
-      editor.tabSizem = 2;
+      editor.smoothScrolling = true;
+      editor.tabSize = 2;
       explorer.confirmDragAndDrop = false;
       explorer.confirmDelete = false;
       files.autoSave = "onFocusChange";
@@ -34,13 +35,17 @@
       files.trimFinalNewlines = true;
       security.workspace.trust.enabled = false;
       telemetry.telemetryLevel = "off";
-      terminal.external.osxExec = "Alacritty.app";
-      terminal.integrated.cursorBlinking = true;
-      update.mode = "none";
+      terminal.integrated.cursorStyle = "line";
+      terminal.integrated.smoothScrolling = true;
       window.menuBarVisibility = "toggle";
       workbench.colorTheme = "Tokyo Night";
+      workbench.list.smoothScrolling = true;
 
-      window.titleBarStyle = "custom"; # workaround
+      # Workaround for VSCode crashing
+      # https://github.com/microsoft/vscode/issues/184124
+      window.titleBarStyle = "custom";
+      workbench.layoutControl.enabled = false;
+      window.commandCenter = false;
 
       # Language specific
       ### Nix
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix b/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
index 0d992d8..c9ed4ca 100644
--- a/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
+++ b/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
@@ -53,14 +53,15 @@
     monospace = "JetBrainsMono Nerd Font";
   in {
     ### VSCode
-    vscode.userSettings."editor.fontFamily" = "${monospace}";
+    vscode.userSettings.editor.fontFamily = monospace;
+    vscode.userSettings.terminal.external.osxExec = "Alacritty.app";
 
     ### Alacritty
     alacritty.settings.font = {
-      normal.family = "${monospace}";
-      bold.family = "${monospace}";
-      bold_italic.family = "${monospace}";
-      italic.family = "${monospace}";
+      normal.family = monospace;
+      bold.family = monospace;
+      bold_italic.family = monospace;
+      italic.family = monospace;
     };
   };
 }