add rnix-lsp from flakes

This commit is contained in:
Charlotte 🦝 Delenk 2022-07-29 08:21:13 +01:00
parent d3a37c1ed9
commit 7da1e0aad0
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
4 changed files with 84 additions and 13 deletions

View file

@ -1,4 +1,8 @@
{ pkgs, lib, ... }: { {
pkgs,
lib,
...
}: {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
mutableExtensionsDir = true; mutableExtensionsDir = true;
@ -54,7 +58,7 @@
"C_Cpp.errorSquiggles" = "Disabled"; "C_Cpp.errorSquiggles" = "Disabled";
"clang-tidy.executable" = "${pkgs.llvmPackages_latest.clang-unwrapped}/bin/clang-tidy"; "clang-tidy.executable" = "${pkgs.llvmPackages_latest.clang-unwrapped}/bin/clang-tidy";
"cmake.cmakePath" = "${pkgs.cmake}/bin/cmake"; "cmake.cmakePath" = "${pkgs.cmake}/bin/cmake";
"github.copilot.enable" = { "*" = true; }; "github.copilot.enable" = {"*" = true;};
"crates.listPreReleases" = true; "crates.listPreReleases" = true;
"css.format.spaceAroundSelectorSeparator" = true; "css.format.spaceAroundSelectorSeparator" = true;
"less.format.spaceAroundSelectorSeparator" = true; "less.format.spaceAroundSelectorSeparator" = true;
@ -70,7 +74,7 @@
"redhat.telemetry.enabled" = false; # FUCK OFF "redhat.telemetry.enabled" = false; # FUCK OFF
}; };
}; };
home.activation.vscode-server = lib.hm.dag.entryAfter [ "write-boundary" ] '' home.activation.vscode-server = lib.hm.dag.entryAfter ["write-boundary"] ''
if test -f ~/.vscode-server; then if test -f ~/.vscode-server; then
if test -f "~/.vscode/extensions"; then if test -f "~/.vscode/extensions"; then
if ! test -L "~/.vscode-server/extensions"; then if ! test -L "~/.vscode-server/extensions"; then

View file

@ -3,6 +3,7 @@
, nixpkgs , nixpkgs
, nixpkgs-noto-variable , nixpkgs-noto-variable
, nix-packages , nix-packages
, rnix-lsp
, ... , ...
}: }:
with pkgs; let with pkgs; let
@ -55,16 +56,8 @@ in
sed 's/getBoolAttr."allowSubstitutes", true./true/' src/libstore/parsed-derivations.cc sed 's/getBoolAttr."allowSubstitutes", true./true/' src/libstore/parsed-derivations.cc
''; '';
}); });
rnix-lsp = prev.rnix-lsp.overrideAttrs (old: rec { rnix-lsp = rnix-lsp.packages.rnix-lsp.overrideAttrs (old: {
version = "0.3.0-alejandra"; cargoBuildOptions = [ "--no-default-features" "--features" "alejandra" ];
src = prev.fetchFromGitHub {
owner = "nix-community";
repo = "rnix-lsp";
rev = "9189b50b34285b2a9de36a439f6c990fd283c9c7";
sha256 = "sha256-ZnUtvwkcz7QlAiqQxhI4qVUhtVR+thLhG3wQlle7oZg=";
};
cargoSha256 = "0000000000000000000000000000000000000000000000000000";
cargoBuildFlags = [ "--no-default-features" "--features" "alejandra" ];
}); });
}) })
]; ];

View file

@ -667,6 +667,27 @@
"url": "https://git.chir.rs/CarolineHusky/MiiFox.net" "url": "https://git.chir.rs/CarolineHusky/MiiFox.net"
} }
}, },
"naersk": {
"inputs": {
"nixpkgs": [
"rnix-lsp",
"nixpkgs"
]
},
"locked": {
"lastModified": 1655042882,
"narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
"owner": "nix-community",
"repo": "naersk",
"rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nasin-nanpa": { "nasin-nanpa": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -976,6 +997,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_10": {
"locked": {
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1616989418, "lastModified": 1616989418,
@ -1166,6 +1203,26 @@
"type": "github" "type": "github"
} }
}, },
"rnix-lsp": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_10",
"utils": "utils_2"
},
"locked": {
"lastModified": 1658963292,
"narHash": "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=",
"owner": "nix-community",
"repo": "rnix-lsp",
"rev": "ff18e04551a39ccdab0ff9c83926db3807b23478",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "rnix-lsp",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"chir-rs": "chir-rs", "chir-rs": "chir-rs",
@ -1180,6 +1237,7 @@
"nixpkgs-noto-variable": "nixpkgs-noto-variable", "nixpkgs-noto-variable": "nixpkgs-noto-variable",
"nur": "nur", "nur": "nur",
"polymc": "polymc", "polymc": "polymc",
"rnix-lsp": "rnix-lsp",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },
@ -1309,6 +1367,21 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -19,6 +19,7 @@ rec {
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d"; nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d";
emanote.url = "github:EmaApps/emanote"; emanote.url = "github:EmaApps/emanote";
rnix-lsp.url = "github:nix-community/rnix-lsp";
nix-packages.url = "git+https://git.chir.rs/DarkKirb/nix-packages?ref=main"; nix-packages.url = "git+https://git.chir.rs/DarkKirb/nix-packages?ref=main";
nix-packages.inputs.nixpkgs.follows = "nixpkgs"; nix-packages.inputs.nixpkgs.follows = "nixpkgs";