maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Remove cachix

Browse source
This commit is contained in:
Malte 2022-12-02 01:55:34 +01:00
parent a2330949d0
commit f91a34aa3f
8 changed files with 5 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cachix.nix
View file

@ -1,14 +0,0 @@
# WARN: this file will get overwritten by $ cachix use <name>
{
pkgs,
lib,
...
}: let
folder = ./cachix;
toImport = name: value: folder + ("/" + name);
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
in {
inherit imports;
nix.settings.substituters = ["https://cache.nixos.org/"];
}

10
cachix/mweinelt.nix
View file

@ -1,10 +0,0 @@
{
nix = {
settings.substituters = [
"https://mweinelt.cachix.org"
];
settings.trusted-public-keys = [
"mweinelt.cachix.org-1:J9OCu2VAPJ2IHzpOfoJt16Fm5xl9q8VOHqcqCGSNKsM="
];
};
}

10
cachix/pre-commit-hooks.nix
View file

@ -1,10 +0,0 @@
{
nix = {
settings.substituters = [
"https://pre-commit-hooks.cachix.org"
];
settings.trusted-public-keys = [
"pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
];
};
}

10
cachix/srid.nix
View file

@ -1,10 +0,0 @@
{
nix = {
settings.substituters = [
"https://srid.cachix.org"
];
settings.trusted-public-keys = [
"srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI="
];
};
}

7
nixos/roles/default.nix
View file

@ -4,7 +4,10 @@
lib,
...
}: {
imports = [../../common ./admin.nix ../../cachix.nix];
imports = [
../../common
./admin.nix
];
i18n = {
defaultLocale = "en_DK.UTF-8";
@ -71,8 +74,6 @@
# )
);
settings.trusted-public-keys = [
"ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI="
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
"nixbuild.net/maralorn-1:cpqv21sJgRL+ROaKY1Gr0k7AKolAKaP3S3iemGxK/30="
];
nixPath = ["/etc/nix-path"];

1
overlays/10-previews.nix
View file

@ -12,7 +12,6 @@ in {
(unstable)
nix
home-assistant
cachix
cabal2nix
chrysalis
emanote

1
overlays/pkgSets.nix
View file

@ -66,7 +66,6 @@ self: super: {
nix-output-monitor
fdroidserver
jq
cachix
;
};

2
private

@ -1 +1 @@
Subproject commit 2ec8a40f43daebadaa99fbcab52892465a9bcb4e
Subproject commit f64be4d77f76bf104d4496f1e00241de795892f3