From 79012f45de35361f44f593d71869e13fc5112360 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 16 Nov 2023 00:10:22 +0100 Subject: [PATCH 1/3] Vscode: don't write nested settings --- roles/desktop/programs/vscode.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/roles/desktop/programs/vscode.nix b/roles/desktop/programs/vscode.nix index 38f1b31..dd2ef5f 100644 --- a/roles/desktop/programs/vscode.nix +++ b/roles/desktop/programs/vscode.nix @@ -10,13 +10,16 @@ let inputs = flakeSelf.inputs; in pkgs.catppuccin-vsc ]; userSettings = { + # VSCode doesn't like nested settings + # https://stackoverflow.com/questions/74134436/is-it-possible-to-express-settings-in-vs-codes-settings-json-where-each-dot-sep + # TODO: write a function that unnests settings "workbench.colorTheme" = "Catppuccin Mocha"; - "editor" = { - "fontFamily" = "JetBrainsMono Nerd Font"; + "editor.fontFamily" = "JetBrainsMono Nerd Font"; + "editor.semanticHighlighting.enabled" = true; "semanticHighlighting.enabled" = true; }; - terminal.integrated.minimumContrastRatio = 1; - window.titleBarStyle = "custom"; + "terminal.integrated.minimumContrastRatio" = 1; + "window.titleBarStyle" = "custom"; }; }; } From 5b99e3cc569aacaa2dcc89eda9e7502e6f1c5fea Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 16 Nov 2023 00:12:55 +0100 Subject: [PATCH 2/3] Vscode: add catppuccin icon theme --- roles/desktop/programs/vscode.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/desktop/programs/vscode.nix b/roles/desktop/programs/vscode.nix index dd2ef5f..a1eb40c 100644 --- a/roles/desktop/programs/vscode.nix +++ b/roles/desktop/programs/vscode.nix @@ -8,12 +8,14 @@ let inputs = flakeSelf.inputs; in extensions = with inputs.vscode-extensions.extensions.x86_64-linux.open-vsx; [ jnoortheen.nix-ide pkgs.catppuccin-vsc + catppuccin.catppuccin-vsc-icons ]; userSettings = { # VSCode doesn't like nested settings # https://stackoverflow.com/questions/74134436/is-it-possible-to-express-settings-in-vs-codes-settings-json-where-each-dot-sep # TODO: write a function that unnests settings "workbench.colorTheme" = "Catppuccin Mocha"; + "workbench.iconTheme": "catppuccin-mocha" "editor.fontFamily" = "JetBrainsMono Nerd Font"; "editor.semanticHighlighting.enabled" = true; "semanticHighlighting.enabled" = true; From 8a1d1bd41d1d51a4ea1b24fae9e63123de37de74 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 16 Nov 2023 00:13:39 +0100 Subject: [PATCH 3/3] Vscode: use nil as language server --- roles/desktop/programs/vscode.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/desktop/programs/vscode.nix b/roles/desktop/programs/vscode.nix index a1eb40c..2b468cc 100644 --- a/roles/desktop/programs/vscode.nix +++ b/roles/desktop/programs/vscode.nix @@ -18,8 +18,8 @@ let inputs = flakeSelf.inputs; in "workbench.iconTheme": "catppuccin-mocha" "editor.fontFamily" = "JetBrainsMono Nerd Font"; "editor.semanticHighlighting.enabled" = true; - "semanticHighlighting.enabled" = true; - }; + "nix.enableLanguageServer = true;" + "nix.serverPath = "${pkgs.nil}/bin/nil";" "terminal.integrated.minimumContrastRatio" = 1; "window.titleBarStyle" = "custom"; };