From af568c7b7075b766bf18f69cc85a00c081b141e0 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Sun, 23 Feb 2025 11:13:18 -0600 Subject: [PATCH] fixed deprecation warnings for vscode configs --- configurations/home-manager/leyla/vscode.nix | 149 ++++++++++--------- 1 file changed, 76 insertions(+), 73 deletions(-) diff --git a/configurations/home-manager/leyla/vscode.nix b/configurations/home-manager/leyla/vscode.nix index c9d779d..c6f8586 100644 --- a/configurations/home-manager/leyla/vscode.nix +++ b/configurations/home-manager/leyla/vscode.nix @@ -28,87 +28,90 @@ in { package = pkgs.vscodium; mutableExtensionsDir = false; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - userSettings = lib.mkMerge [ - { - "workbench.colorTheme" = "Atom One Dark"; - "cSpell.userWords" = [ - "webdav" - ]; - } - (lib.mkIf nix-development-enabled { - "nix.enableLanguageServer" = true; - "nix.serverPath" = "nil"; - "[nix]" = { - "editor.defaultFormatter" = "kamadorueda.alejandra"; - "editor.formatOnPaste" = true; - "editor.formatOnSave" = true; - "editor.formatOnType" = true; - }; - "alejandra.program" = "alejandra"; - "nixpkgs" = { - "expr" = "import {}"; - }; - }) - (lib.mkIf osConfig.services.ollama.enable { - "twinny.fileContextEnabled" = true; - "twinny.enableLogging" = false; - "twinny.completionCacheEnabled" = true; + profiles.default = { + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; - # builtins.elemAt osConfig.services.ollama.loadModels 0; - }) - ]; + userSettings = lib.mkMerge [ + { + "workbench.colorTheme" = "Atom One Dark"; + "cSpell.userWords" = [ + "webdav" + ]; + } + (lib.mkIf nix-development-enabled { + "nix.enableLanguageServer" = true; + "nix.serverPath" = "nil"; + "[nix]" = { + "editor.defaultFormatter" = "kamadorueda.alejandra"; + "editor.formatOnPaste" = true; + "editor.formatOnSave" = true; + "editor.formatOnType" = true; + }; + "alejandra.program" = "alejandra"; + "nixpkgs" = { + "expr" = "import {}"; + }; + }) + (lib.mkIf osConfig.services.ollama.enable { + "twinny.fileContextEnabled" = true; + "twinny.enableLogging" = false; + "twinny.completionCacheEnabled" = true; - extensions = ( - with open-vsx; - [ - # vs code feel extensions - ms-vscode.atom-keybindings - akamud.vscode-theme-onedark - streetsidesoftware.code-spell-checker - streetsidesoftware.code-spell-checker-german - streetsidesoftware.code-spell-checker-italian - jeanp413.open-remote-ssh + # builtins.elemAt osConfig.services.ollama.loadModels 0; + }) + ]; - # html extensions - formulahendry.auto-rename-tag - ms-vscode.live-server + extensions = ( + with open-vsx; + [ + # vs code feel extensions + ms-vscode.atom-keybindings + akamud.vscode-theme-onedark + streetsidesoftware.code-spell-checker + streetsidesoftware.code-spell-checker-german + streetsidesoftware.code-spell-checker-italian + jeanp413.open-remote-ssh - # js extensions - dsznajder.es7-react-js-snippets - dbaeumer.vscode-eslint - standard.vscode-standard - firsttris.vscode-jest-runner - stylelint.vscode-stylelint - tauri-apps.tauri-vscode + # html extensions + formulahendry.auto-rename-tag + ms-vscode.live-server - # astro blog extensions - astro-build.astro-vscode - unifiedjs.vscode-mdx - - # misc extensions - bungcip.better-toml - ] - ++ ( - lib.lists.optionals osConfig.services.ollama.enable [ - rjmacarthy.twinny - ] - ) - ++ (lib.lists.optionals nix-development-enabled [ - # nix extensions - pinage404.nix-extension-pack - jnoortheen.nix-ide - kamadorueda.alejandra - ]) - ++ ( - with vscode-marketplace; [ # js extensions - karyfoundation.nearley + dsznajder.es7-react-js-snippets + dbaeumer.vscode-eslint + standard.vscode-standard + firsttris.vscode-jest-runner + stylelint.vscode-stylelint + tauri-apps.tauri-vscode + + # astro blog extensions + astro-build.astro-vscode + unifiedjs.vscode-mdx + + # misc extensions + bungcip.better-toml ] - ) - ); + ++ ( + lib.lists.optionals osConfig.services.ollama.enable [ + rjmacarthy.twinny + ] + ) + ++ (lib.lists.optionals nix-development-enabled [ + # nix extensions + pinage404.nix-extension-pack + jnoortheen.nix-ide + kamadorueda.alejandra + ]) + ++ ( + with vscode-marketplace; [ + # js extensions + karyfoundation.nearley + ] + ) + ); + }; }; }; }