diff --git a/hosts/common/configs/user/gui/vscode/default.nix b/hosts/common/configs/user/gui/vscode/default.nix index 934dd48..3eb2fa8 100644 --- a/hosts/common/configs/user/gui/vscode/default.nix +++ b/hosts/common/configs/user/gui/vscode/default.nix @@ -103,7 +103,6 @@ in "window.menuBarVisibility" = "toggle"; "workbench.editor.historyBasedLanguageDetection" = true; "workbench.list.smoothScrolling" = true; - "typescript.updateImportsOnFileMove.enabled" = "always"; }; }; @@ -121,6 +120,7 @@ in ./langs/nix ./langs/python ./langs/svelte + ./langs/typescript ./langs/yaml ]; diff --git a/hosts/common/configs/user/gui/vscode/langs/java/default.nix b/hosts/common/configs/user/gui/vscode/langs/java/default.nix index c8b68d0..8549e5e 100644 --- a/hosts/common/configs/user/gui/vscode/langs/java/default.nix +++ b/hosts/common/configs/user/gui/vscode/langs/java/default.nix @@ -1,13 +1,19 @@ { pkgs, ... }: { - programs.vscode.extensions = - with pkgs; - with vscode-extensions; - [ - redhat.java - vscjava.vscode-java-debug - vscjava.vscode-java-test - vscjava.vscode-maven - vscjava.vscode-gradle - ]; + programs.vscode = { + extensions = + with pkgs; + with vscode-extensions; + [ + redhat.java + vscjava.vscode-java-debug + vscjava.vscode-java-test + vscjava.vscode-maven + vscjava.vscode-gradle + ]; + + userSettings = { + "java.compile.nullAnalysis.mode" = "automatic"; + }; + }; } diff --git a/hosts/common/configs/user/gui/vscode/langs/typescript/default.nix b/hosts/common/configs/user/gui/vscode/langs/typescript/default.nix new file mode 100644 index 0000000..142afc6 --- /dev/null +++ b/hosts/common/configs/user/gui/vscode/langs/typescript/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + programs.vscode.userSettings = { + "typescript.updateImportsOnFileMove.enabled" = "always"; + }; +} diff --git a/hosts/elara/users/nikara/configs/console/go/default.nix b/hosts/elara/users/nikara/configs/console/go/default.nix index 24acc83..82c9a85 100644 --- a/hosts/elara/users/nikara/configs/console/go/default.nix +++ b/hosts/elara/users/nikara/configs/console/go/default.nix @@ -9,7 +9,7 @@ home-manager.users.${user} = { programs.go = { enable = true; - goPath = "${home}/.local/share/go"; + goPath = ".local/share/go"; }; home = { diff --git a/hosts/elara/users/nikara/configs/console/java/default.nix b/hosts/elara/users/nikara/configs/console/java/default.nix index e6fd028..ab9aafc 100644 --- a/hosts/elara/users/nikara/configs/console/java/default.nix +++ b/hosts/elara/users/nikara/configs/console/java/default.nix @@ -15,7 +15,7 @@ gradle = { enable = true; - home = "${home}/.local/share/gradle"; + home = ".local/share/gradle"; }; }; diff --git a/hosts/elara/users/nikara/configs/gui/vscode/default.nix b/hosts/elara/users/nikara/configs/gui/vscode/default.nix index 710759d..46f229d 100644 --- a/hosts/elara/users/nikara/configs/gui/vscode/default.nix +++ b/hosts/elara/users/nikara/configs/gui/vscode/default.nix @@ -10,10 +10,13 @@ github.copilot-chat ]; - userSettings."github.copilot.enable" = { - "*" = true; - "plaintext" = true; - "markdown" = true; + userSettings = { + "github.copilot.enable" = { + "*" = true; + "plaintext" = true; + "markdown" = true; + }; + "chat.editing.alwaysSaveWithGeneratedChanges" = true; }; }; }