nix: renamed nix configurations

This commit is contained in:
Primrose 2024-06-29 11:46:16 +02:00
parent 936f03bb80
commit a446e7a076
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
5 changed files with 3 additions and 8 deletions

View file

@ -10,9 +10,6 @@ let
nix.registry.nixpkgs.flake = inputs.nixpkgs;
};
substituters = import ./substituters.nix;
extra-substituters = import ./extra-substituters.nix;
mkNixOS =
name: sys: hmOpts:
withSystem sys (
@ -30,7 +27,6 @@ let
"${self}/nix/hosts/${name}"
"${self}/nix/layouts"
inputs.agenix.nixosModules.default
substituters
inputs.home-manager.nixosModules.home-manager
{
home-manager = {
@ -41,7 +37,6 @@ let
"${self}/nix/home/_"
"${self}/nix/home/${name}"
nixpkgsRegistry
extra-substituters
hmOpts
];
};
@ -67,7 +62,6 @@ let
"${self}/nix/hosts/_"
"${self}/nix/hosts/_darwin"
"${self}/nix/hosts/${name}"
substituters
inputs.home-manager.darwinModules.home-manager
{
home-manager = {
@ -78,7 +72,6 @@ let
"${self}/nix/home/_"
"${self}/nix/home/${name}"
nixpkgsRegistry
extra-substituters
hmOpts
];
};
@ -104,7 +97,6 @@ let
"${self}/nix/home/_"
"${self}/nix/home/${name}"
nixpkgsRegistry
extra-substituters
hmOpts
];
}

View file

@ -1,33 +0,0 @@
# generates user's substituter's config
# should be used with home-manager
{ pkgs, lib, ... }:
{
nix.package = lib.mkDefault pkgs.nixVersions.nix_2_21;
nix.settings = {
/*
substituters can only be used by users that are trusted by nix -> nix trusts the user to do it right
trusted-substituters can be used by any user -> nix trusts everything the substituter provides
"In addition, each store path should be trusted as described in trusted-public-keys"
-> keys for everything
*/
extra-substituters = [
"https://nix-community.cachix.org"
"https://leana8959.cachix.org"
];
extra-trusted-substituters = [
"https://nix-community.cachix.org"
"https://leana8959.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"leana8959.cachix.org-1:CxQSAp8lcgMv8Me459of0jdXRW2tcyeYRKTiiUq8z0M="
];
experimental-features = [
"nix-command"
"flakes"
];
allow-import-from-derivation = "true";
};
}

View file

@ -1,34 +0,0 @@
# generates global config
# should be used with nixos or nix-darwin
{ pkgs, ... }:
{
nix.package = pkgs.nixVersions.nix_2_21;
nix.settings = {
/*
substituters can only be used by users that are trusted by nix -> nix trusts the user to do it right
trusted-substituters can be used by any user -> nix trusts everything the substituter provides
"In addition, each store path should be trusted as described in trusted-public-keys"
-> keys for everything
*/
substituters = [
"https://nix-community.cachix.org"
"https://leana8959.cachix.org"
];
trusted-substituters = [
"https://nix-community.cachix.org"
"https://leana8959.cachix.org"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"leana8959.cachix.org-1:CxQSAp8lcgMv8Me459of0jdXRW2tcyeYRKTiiUq8z0M="
];
experimental-features = [
"nix-command"
"flakes"
];
allow-import-from-derivation = "true";
};
}