diff --git a/users/guanranwang/home-manager/common/home.nix b/users/guanranwang/home-manager/common/home.nix index cba76b0..c1dad16 100644 --- a/users/guanranwang/home-manager/common/home.nix +++ b/users/guanranwang/home-manager/common/home.nix @@ -176,10 +176,10 @@ enableUpdateCheck = false; userSettings = { "diffEditor.ignoreTrimWhitespace" = false; - "editor.cursorSmoothCaretAnimation" = "on"; "editor.cursorBlinking" = "smooth"; + "editor.cursorSmoothCaretAnimation" = "on"; "editor.fontFamily" = lib.mkDefault "Monospace"; - "editor.fontWeight" = "600"; + "editor.fontWeight" = 600; "editor.tabSize" = 2; "explorer.confirmDragAndDrop" = false; "explorer.confirmDelete" = false; @@ -192,32 +192,30 @@ "terminal.integrated.cursorBlinking" = true; "update.mode" = "none"; "window.menuBarVisibility" = "toggle"; - "workbench.colorTheme" = "Tokyo Night"; + "workbench.colorTheme" = "Tokyo Night"; # Extensions ### Nix IDE "nix.enableLanguageServer" = true; - #"nix.serverPath" = "nixd"; - "nix.serverPath" = "nil"; + "nix.serverPath" = "${pkgs.nil}/bin/nil"; ### GitLens "gitlens.telemetry.enabled" = false; }; extensions = with pkgs.vscode-extensions; [ - # lsp - #bbenoist.nix + ### LSP jnoortheen.nix-ide - #ms-python.python # Temporary disable this, as debugpy is stuck at building (literally waited for 40 minute + 6 hour + 2 hour...) + ms-python.python rust-lang.rust-analyzer tamasfe.even-better-toml #bungcip.better-toml - # qol + ### QoL eamodio.gitlens esbenp.prettier-vscode ritwickdey.liveserver vscodevim.vim - # theme + ### Themes enkia.tokyo-night #catppuccin.catppuccin-vsc-icons #catppuccin.catppuccin-vsc @@ -249,4 +247,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/users/guanranwang/home-manager/darwin/home.nix b/users/guanranwang/home-manager/darwin/home.nix index 5d58db4..d026ec3 100644 --- a/users/guanranwang/home-manager/darwin/home.nix +++ b/users/guanranwang/home-manager/darwin/home.nix @@ -67,12 +67,6 @@ iterm2 ### Misc element-desktop - - - ## Misc - ### LSP - nixd - nil ]; }; diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix index 69db8e6..79de83f 100644 --- a/users/guanranwang/home-manager/nixos/home.nix +++ b/users/guanranwang/home-manager/nixos/home.nix @@ -75,11 +75,6 @@ adw-gtk3 libsForQt5.qtstyleplugin-kvantum # Kvantum, theme engine - # lsp - nixd - nil - - ### flatpak-able