diff --git a/nix/home-manager/programs/vscode/default.nix b/nix/home-manager/programs/vscode/default.nix index 2746fcb..1318aaf 100644 --- a/nix/home-manager/programs/vscode/default.nix +++ b/nix/home-manager/programs/vscode/default.nix @@ -25,9 +25,8 @@ in { tomoki1207.pdf vscodevim.vim - bbenoist.nix + # bbenoist.nix jnoortheen.nix-ide - # kamadorueda.alejandra ms-vscode.theme-tomorrowkit nonylene.dark-molokai-theme @@ -75,7 +74,6 @@ in { home.packages = [ pkgs.nixpkgs-fmt - pkgs.alejandra pkgs.nil ]; } diff --git a/nix/scripts/nix4vscode/config.toml b/nix/home-manager/programs/vscode/nix4vscode/config.toml similarity index 58% rename from nix/scripts/nix4vscode/config.toml rename to nix/home-manager/programs/vscode/nix4vscode/config.toml index 55c54da..38f9978 100644 --- a/nix/scripts/nix4vscode/config.toml +++ b/nix/home-manager/programs/vscode/nix4vscode/config.toml @@ -3,3 +3,7 @@ vscode_version = "1.94.2" [[extensions]] publisher_name = "FelixZeller" extension_name = "markdown-oxide" + +[[extensions]] +publisher_name = "ibecker" +extension_name = "treefmt-vscode" diff --git a/nix/home-manager/programs/vscode/nix4vscode/default.nix b/nix/home-manager/programs/vscode/nix4vscode/default.nix new file mode 100644 index 0000000..5cc0669 --- /dev/null +++ b/nix/home-manager/programs/vscode/nix4vscode/default.nix @@ -0,0 +1,56 @@ +{ + pkgs, + lib, +}: let + inherit (pkgs.stdenv) isDarwin isLinux isi686 isx86_64 isAarch32 isAarch64; + vscode-utils = pkgs.vscode-utils; + merge = lib.attrsets.recursiveUpdate; +in + merge + (merge + (merge + (merge + { + "felixzeller"."markdown-oxide" = vscode-utils.extensionFromVscodeMarketplace { + name = "markdown-oxide"; + publisher = "felixzeller"; + version = "1.1.0"; + sha256 = "07l37hkg106m3nl9530l7i39iw1kibckv1zi4n23gbp7srdrwbs3"; + }; + } + (lib.attrsets.optionalAttrs (isLinux && (isi686 || isx86_64)) { + "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace { + name = "treefmt-vscode"; + publisher = "ibecker"; + version = "2.1.0"; + sha256 = "1r17wjpw8xiha5r9h3146facxghpcp416zf8551sw93cmam9ky6j"; + arch = "linux-x64"; + }; + })) + (lib.attrsets.optionalAttrs (isLinux && (isAarch32 || isAarch64)) { + "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace { + name = "treefmt-vscode"; + publisher = "ibecker"; + version = "2.1.0"; + sha256 = "0swvl7fkjcwp43grnrhnmy60a5m3hfwawk204byi8hhbczy131li"; + arch = "linux-arm64"; + }; + })) + (lib.attrsets.optionalAttrs (isDarwin && (isi686 || isx86_64)) { + "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace { + name = "treefmt-vscode"; + publisher = "ibecker"; + version = "2.1.0"; + sha256 = "1swq9hy6a9nzkrn07j21g59pyk2m7aqsfi1pphl9l9y8p4zwiaqm"; + arch = "darwin-x64"; + }; + })) + (lib.attrsets.optionalAttrs (isDarwin && (isAarch32 || isAarch64)) { + "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace { + name = "treefmt-vscode"; + publisher = "ibecker"; + version = "2.1.0"; + sha256 = "1xg3wnn3f1kvsz5a09l0cjpzfm3l9va73cahbvl14mx3n6734r2m"; + arch = "darwin-arm64"; + }; + })