From 0b84c50958f88aca8bdce0464217a2fbfeb2db02 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 3 Mar 2025 16:51:45 -0600 Subject: [PATCH] Suppress deprecation warnings --- home/modules/gui.nix | 2 +- home/modules/vscodium.nix | 80 ++++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/home/modules/gui.nix b/home/modules/gui.nix index 6cf67fe..50dcdf9 100644 --- a/home/modules/gui.nix +++ b/home/modules/gui.nix @@ -150,7 +150,7 @@ in "doh-rollout.doneFirstRun" = true; "signon.rememberSignons" = false; }; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden gsconnect foxyproxy-standard diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 1b4df21..589a8db 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -23,46 +23,48 @@ in programs.vscode = { enable = true; #package = pkgs.vscodium; - extensions = - with top.vsext.extensions."${pkgs.stdenv.system}".vscode-marketplace; - [ - arrterian.nix-env-selector - asvetliakov.vscode-neovim - batisteo.vscode-django - donjayamanne.python-environment-manager - golang.go - kevinrose.vsc-python-indent - jnoortheen.nix-ide - mkhl.direnv - ms-python.python - njpwerner.autodocstring - rust-lang.rust-analyzer - tamasfe.even-better-toml - vadimcn.vscode-lldb - vscjava.vscode-java-test - vscjava.vscode-java-dependency - vscjava.vscode-java-debug - wholroyd.jinja - ] - ++ (with top.vsext.extensions."${pkgs.stdenv.system}".vscode-marketplace-release; [ - github.copilot - github.copilot-chat - ]); - userSettings = { - "direnv.restart.automatic" = true; - "direnv.path.executable" = (lib.getExe pkgs.direnv); - "extensions.autoUpdate" = false; - "extensions.experimental.affinity" = { - "asvetliakov.vscode-neovim" = 1; + profiles.default = { + extensions = + with top.vsext.extensions."${pkgs.stdenv.system}".vscode-marketplace; + [ + arrterian.nix-env-selector + asvetliakov.vscode-neovim + batisteo.vscode-django + donjayamanne.python-environment-manager + golang.go + kevinrose.vsc-python-indent + jnoortheen.nix-ide + mkhl.direnv + ms-python.python + njpwerner.autodocstring + rust-lang.rust-analyzer + tamasfe.even-better-toml + vadimcn.vscode-lldb + vscjava.vscode-java-test + vscjava.vscode-java-dependency + vscjava.vscode-java-debug + wholroyd.jinja + ] + ++ (with top.vsext.extensions."${pkgs.stdenv.system}".vscode-marketplace-release; [ + github.copilot + github.copilot-chat + ]); + userSettings = { + "direnv.restart.automatic" = true; + "direnv.path.executable" = (lib.getExe pkgs.direnv); + "extensions.autoUpdate" = false; + "extensions.experimental.affinity" = { + "asvetliakov.vscode-neovim" = 1; + }; + "git.openRepositoryInParentFolders" = "always"; + "search.exclude" = { + "**/.tox" = true; + }; + "terminal.integrated.defaultProfile.linux" = "tmux"; + "vscode-neovim.neovimInitVimPaths.darwin" = "~/.config/nvim/init.lua"; + "vscode-neovim.neovimInitVimPaths.linux" = "~/.config/nvim/init.lua"; + "workbench.settings.applyToAllProfiles" = [ "direnv.path.executable" ]; }; - "git.openRepositoryInParentFolders" = "always"; - "search.exclude" = { - "**/.tox" = true; - }; - "terminal.integrated.defaultProfile.linux" = "tmux"; - "vscode-neovim.neovimInitVimPaths.darwin" = "~/.config/nvim/init.lua"; - "vscode-neovim.neovimInitVimPaths.linux" = "~/.config/nvim/init.lua"; - "workbench.settings.applyToAllProfiles" = [ "direnv.path.executable" ]; }; }; };