diff --git a/cachix.nix b/cachix.nix deleted file mode 100644 index d888840a..00000000 --- a/cachix.nix +++ /dev/null @@ -1,14 +0,0 @@ -# WARN: this file will get overwritten by $ cachix use -{ - 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/"]; -} diff --git a/cachix/mweinelt.nix b/cachix/mweinelt.nix deleted file mode 100644 index d6da2ef4..00000000 --- a/cachix/mweinelt.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - nix = { - settings.substituters = [ - "https://mweinelt.cachix.org" - ]; - settings.trusted-public-keys = [ - "mweinelt.cachix.org-1:J9OCu2VAPJ2IHzpOfoJt16Fm5xl9q8VOHqcqCGSNKsM=" - ]; - }; -} diff --git a/cachix/pre-commit-hooks.nix b/cachix/pre-commit-hooks.nix deleted file mode 100644 index 75d003c7..00000000 --- a/cachix/pre-commit-hooks.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - nix = { - settings.substituters = [ - "https://pre-commit-hooks.cachix.org" - ]; - settings.trusted-public-keys = [ - "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" - ]; - }; -} diff --git a/cachix/srid.nix b/cachix/srid.nix deleted file mode 100644 index ad765413..00000000 --- a/cachix/srid.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - nix = { - settings.substituters = [ - "https://srid.cachix.org" - ]; - settings.trusted-public-keys = [ - "srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI=" - ]; - }; -} diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix index 76025a40..71485d01 100644 --- a/nixos/roles/default.nix +++ b/nixos/roles/default.nix @@ -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"]; diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix index 56d4d4e1..abd9346c 100644 --- a/overlays/10-previews.nix +++ b/overlays/10-previews.nix @@ -12,7 +12,6 @@ in { (unstable) nix home-assistant - cachix cabal2nix chrysalis emanote diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index ff177686..459b3582 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -66,7 +66,6 @@ self: super: { nix-output-monitor fdroidserver jq - cachix ; }; diff --git a/private b/private index 2ec8a40f..f64be4d7 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 2ec8a40f43daebadaa99fbcab52892465a9bcb4e +Subproject commit f64be4d77f76bf104d4496f1e00241de795892f3