fix: wrangle vscode config

This commit is contained in:
Nickolaj Jepsen 2025-03-07 10:12:35 +01:00
parent 9548960d6a
commit c5f8df4b9f
3 changed files with 59 additions and 60 deletions

View file

@ -9,7 +9,7 @@ _: {
"bluez5.enable-sbc-xq" = true; "bluez5.enable-sbc-xq" = true;
"bluez5.enable-msbc" = true; "bluez5.enable-msbc" = true;
"bluez5.enable-hw-volume" = true; "bluez5.enable-hw-volume" = true;
"bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ]; "bluez5.roles" = ["hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag"];
};
}; };
};
} }

View file

@ -5,13 +5,9 @@
lib, lib,
... ...
}: let }: let
# stable = inputs.nix-vscode-extensions.extensions.${pkgs.system}.vscode-marketplace-release;
nix-vscode-extensions = (inputs.nix-vscode-extensions.overlays.default pkgs pkgsUnstable);
# vscode-extensions = nix-vscode-extensions.extensions.${pkgs.system};
vscodePackage = pkgsUnstable.vscode; vscodePackage = pkgsUnstable.vscode;
vscodeMarketplace = nix-vscode-extensions.vscode-marketplace; vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};
vscodeMarketplaceRelease = nix-vscode-extensions.vscode-marketplace-release; vscodePkgs = vscode-extensions.vscode-marketplace // vscode-extensions.vscode-marketplace-release; # Prefer release over pre-release
vscodePkgs = vscodeMarketplace // vscodeMarketplaceRelease; # Prefer release over pre-release
mkFormatter = formatter: languages: { mkFormatter = formatter: languages: {
"[${lib.concatStringsSep "][" languages}]" = { "[${lib.concatStringsSep "][" languages}]" = {
@ -19,6 +15,9 @@
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
}; };
}; };
# I can't get nix-vscode-extensions to respect allowUnfree, so this is a workaround
allowUnfree = ext: ext.override {meta.license = [];};
in { in {
fireproof.home-manager = { fireproof.home-manager = {
programs.vscode = { programs.vscode = {
@ -59,11 +58,11 @@ in {
]; ];
extensions = with vscodePkgs; [ extensions = with vscodePkgs; [
# Remote # Remote
ms-vscode-remote.remote-ssh (allowUnfree ms-vscode-remote.remote-ssh)
# AI # AI
github.copilot (allowUnfree github.copilot)
github.copilot-chat (allowUnfree github.copilot-chat)
# Python # Python
ms-pyright.pyright ms-pyright.pyright

View file

@ -57,5 +57,5 @@ _: {
}; };
}; };
}; };
}; };
} }