feat(vscode): inline nix4vscode call
This commit is contained in:
parent
c4abade9e8
commit
61492aefc6
3 changed files with 22 additions and 8 deletions
|
@ -91,12 +91,12 @@
|
|||
KANIDM_URL =
|
||||
self.nixosConfigurations.sj-srv1.config.containers.webserver.config.services.kanidm.serverSettings.origin;
|
||||
|
||||
shellHook =
|
||||
shellHook = builtins.concatStringsSep "\n" [
|
||||
(self.inputs.nixago.lib.${pkgs.system}.make {
|
||||
data = self'.formatter.settings;
|
||||
output = "treefmt.toml";
|
||||
format = "toml";
|
||||
}).shellHook
|
||||
+ '''';
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@ in
|
|||
)
|
||||
++ (
|
||||
let
|
||||
nix4vscodeConfig = pkgs.writeText "nix4vscode.toml" ''
|
||||
nix4vscodeToml = pkgs.writeText "nix4vscode.toml" ''
|
||||
vscode_version = "${config.programs.vscode.package.version}"
|
||||
|
||||
[[extensions]]
|
||||
|
@ -70,18 +70,31 @@ in
|
|||
publisher_name = "ibecker"
|
||||
extension_name = "treefmt-vscode"
|
||||
'';
|
||||
nix4vscode =
|
||||
nix4vscodeNix =
|
||||
pkgs.runCommand "nix4vscode.nix"
|
||||
{
|
||||
# nix4vscode needs internet access
|
||||
__noChroot = true;
|
||||
nativeBuildInputs = [ repoFlake.inputs.nix4vscode.packages.${pkgs.stdenv.system}.default ];
|
||||
requiredSystemFeatures = [ "recursive-nix" ];
|
||||
buildInputs = [
|
||||
pkgs.nix
|
||||
pkgs.cacert
|
||||
repoFlake.inputs.nix4vscode.packages.${pkgs.stdenv.system}.default
|
||||
# pkgs.strace
|
||||
];
|
||||
# outputHashAlgo = "sha256";
|
||||
# outputHashMode = "recursive";
|
||||
# outputHash = lib.fakeSha256;
|
||||
}
|
||||
''
|
||||
export RUST_BACKTRACE=full
|
||||
# set -x
|
||||
# export RUST_BACKTRACE=full
|
||||
# export RUST_LOG=trace
|
||||
export HOME=$(mktemp -d)
|
||||
nix4vscode ${nix4vscodeConfig} > $out
|
||||
# strace -ffZyyY
|
||||
nix4vscode ${nix4vscodeToml} > $out
|
||||
'';
|
||||
nix4vscodeExtensions = builtins.removeAttrs (pkgs.callPackage nix4vscode { }) [
|
||||
nix4vscodeExtensions = builtins.removeAttrs (pkgs.callPackage nix4vscodeNix { }) [
|
||||
"override"
|
||||
"overrideDerivation"
|
||||
];
|
||||
|
|
|
@ -19,6 +19,7 @@ in
|
|||
"nix-command"
|
||||
"flakes"
|
||||
"ca-derivations"
|
||||
"recursive-nix"
|
||||
];
|
||||
|
||||
nix.settings.system-features = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue