diff --git a/flake.nix b/flake.nix index 248ae45..be8c3c7 100644 --- a/flake.nix +++ b/flake.nix @@ -34,9 +34,8 @@ packageOverrides = pkgs: let sources = import ./npins; in { - agenix = (import sources.agenix { inherit pkgs; }).agenix; + agenix = agenix.packages.x86_64-linux.default; # TODO: This should check the host architecture nur = (import sources.nur { inherit pkgs; }); - vscode-extensions = (import sources.nix-vscode-extensions).extensions.x86_64-linux; # TODO: This should check the host architecture }; }; diff --git a/home/vscode.nix b/home/vscode.nix index bb4c548..d081191 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -2,16 +2,27 @@ let inherit (lib) mkIf; + inherit (pkgs) fetchFromGitHub; + system = "x86_64-linux"; # TODO: This should check the host architecture + extensions = + (import (fetchFromGitHub { + # On a stable channel, do NOT keep this up-to-date! VS Code extensions + # have breaking changes more frequently than the NixOS release cadence. + owner = "nix-community"; + repo = "nix-vscode-extensions"; + rev = "27ce569a199d2da1a8483fe3d69dd41664da3a63"; + hash = "sha256-yyB4Kh3EFbYP+1JHza/IEeHwABypcYVi6vvWTmad/rY="; + })).extensions.${system}; in { programs.vscode = { enableExtensionUpdateCheck = false; enableUpdateCheck = false; package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - open-vsx.golang.go - open-vsx.jdinhlife.gruvbox - open-vsx.jnoortheen.nix-ide - open-vsx.ms-python.python + extensions = with extensions.open-vsx; [ + golang.go + jdinhlife.gruvbox + jnoortheen.nix-ide + ms-python.python ]; mutableExtensionsDir = false; userSettings = { diff --git a/npins/sources.json b/npins/sources.json index fc17a6d..7110f10 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -1,32 +1,5 @@ { "pins": { - "agenix": { - "type": "GitRelease", - "repository": { - "type": "GitHub", - "owner": "ryantm", - "repo": "agenix" - }, - "pre_releases": false, - "version_upper_bound": null, - "release_prefix": null, - "version": "0.15.0", - "revision": "564595d0ad4be7277e07fa63b5a991b3c645655d", - "url": "https://api.github.com/repos/ryantm/agenix/tarball/0.15.0", - "hash": "01dhrghwa7zw93cybvx4gnrskqk97b004nfxgsys0736823956la" - }, - "nix-vscode-extensions": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "nix-community", - "repo": "nix-vscode-extensions" - }, - "branch": "master", - "revision": "27ce569a199d2da1a8483fe3d69dd41664da3a63", - "url": "https://github.com/nix-community/nix-vscode-extensions/archive/27ce569a199d2da1a8483fe3d69dd41664da3a63.tar.gz", - "hash": "1dpykmk4xmpvx9i8awd93h0g1q8ir2pwsisjzc7vc5f43lm7h86b" - }, "nur": { "type": "Git", "repository": {