From 164edd02ccf742c8af5b6cfb408f741596ef1dcd Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 17 Nov 2023 20:00:28 +0800
Subject: [PATCH] home,vscode: cleanup

---
 .../home-manager/modules/editor/vscode.nix    | 56 +++++++++----------
 .../home-manager/modules/lang/nix.nix         | 16 ++++--
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/users/guanranwang/home-manager/modules/editor/vscode.nix b/users/guanranwang/home-manager/modules/editor/vscode.nix
index feb9d73..9b9c9f6 100644
--- a/users/guanranwang/home-manager/modules/editor/vscode.nix
+++ b/users/guanranwang/home-manager/modules/editor/vscode.nix
@@ -15,44 +15,42 @@
         when = "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus || suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion";
       }
       {
-        "key" = "shift+tab";
-        "command" = "selectPrevSuggestion";
-        "when" = "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus || suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion";
+        key = "shift+tab";
+        command = "selectPrevSuggestion";
+        when = "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus || suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion";
       }
     ];
     userSettings = {
-      "diffEditor.ignoreTrimWhitespace" = false;
-      "editor.cursorBlinking" = "smooth";
-      "editor.cursorSmoothCaretAnimation" = "on";
-      "editor.fontFamily" = lib.mkDefault "Monospace";
-      "editor.fontWeight" = 600;
-      "editor.tabSize" = 2;
-      "explorer.confirmDragAndDrop" = false;
-      "explorer.confirmDelete" = false;
-      "files.autoSave" = "onFocusChange";
-      "files.trimTrailingWhitespace" = true;
-      "files.trimFinalNewlines" = true;
-      "security.workspace.trust.enabled" = false;
-      "telemetry.telemetryLevel" = "off";
-      "terminal.external.osxExec" = "Alacritty.app";
-      "terminal.integrated.cursorBlinking" = true;
-      "update.mode" = "none";
-      "window.menuBarVisibility" = "toggle";
-      "workbench.colorTheme" = "Tokyo Night";
+      diffEditor.ignoreTrimWhitespace = false;
+      editor.cursorBlinking = "smooth";
+      editor.cursorSmoothCaretAnimation = "on";
+      editor.fontFamily = lib.mkDefault "Monospace";
+      editor.fontWeight = 600;
+      editor.tabSizem = 2;
+      explorer.confirmDragAndDrop = false;
+      explorer.confirmDelete = false;
+      files.autoSave = "onFocusChange";
+      files.trimTrailingWhitespace = true;
+      files.trimFinalNewlines = true;
+      security.workspace.trust.enabled = false;
+      telemetry.telemetryLevel = "off";
+      terminal.external.osxExec = "Alacritty.app";
+      terminal.integrated.cursorBlinking = true;
+      update.mode = "none";
+      window.menuBarVisibility = "toggle";
+      workbench.colorTheme = "Tokyo Night";
 
-      "window.titleBarStyle" = "custom"; # workaround
+      window.titleBarStyle = "custom"; # workaround
+
+      # Language specific
+      ### Nix
+      "[nix]".editor.tabSize = 2;
 
       # Extensions
       ### GitLens
-      "gitlens.telemetry.enabled" = false;
+      gitlens.telemetry.enabled = false;
     };
     extensions = with pkgs.vscode-extensions; [
-      ### LSP
-      #ms-python.python
-      rust-lang.rust-analyzer
-      tamasfe.even-better-toml
-      #bungcip.better-toml
-
       ### QoL
       eamodio.gitlens
       esbenp.prettier-vscode
diff --git a/users/guanranwang/home-manager/modules/lang/nix.nix b/users/guanranwang/home-manager/modules/lang/nix.nix
index 6305384..e4c3d53 100644
--- a/users/guanranwang/home-manager/modules/lang/nix.nix
+++ b/users/guanranwang/home-manager/modules/lang/nix.nix
@@ -1,15 +1,21 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    ### LSP
-    nil
+    nil # LSP
+    alejandra # Formatter
   ];
 
   ### VSCode
   programs.vscode = {
     userSettings = {
-      ### Nix IDE
-      "nix.enableLanguageServer" = true;
-      "nix.serverPath" = "${pkgs.nil}/bin/nil";
+      # Extensions
+      ## Nix IDE
+      nix.enableLanguageServer = true;
+      ### For "nixd" LSP
+      nix.serverPath = "nil";
+      nix.serverSettings.nil = {
+        formatting.command = ["alejandra"];
+        nix.flake.autoArchive = true;
+      };
     };
     extensions = with pkgs.vscode-extensions; [
       jnoortheen.nix-ide