cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

system/nix: split into stable and unstable

Browse source
This commit is contained in:
LavaDesu 2022-02-02 17:51:55 +07:00
parent 52dac2c01d
commit 1da1b2c9dd
Signed by: cilly
GPG key ID: 6500251E087653C9
5 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/caramel/default.nix
View file

@ -13,7 +13,7 @@
base base
home-manager home-manager
input input
nix nix-porcupine
security security
./filesystem.nix ./filesystem.nix

2
hosts/sugarcane/default.nix
View file

@ -13,7 +13,7 @@
base base
home-manager home-manager
input input
nix nix-porcupine
security security
./filesystem.nix ./filesystem.nix

1
modules/default.nix
View file

@ -23,6 +23,7 @@ in {
./system/input.nix ./system/input.nix
./system/kernel.nix ./system/kernel.nix
./system/nix.nix ./system/nix.nix
./system/nix-porcupine.nix
./system/packages.nix ./system/packages.nix
./system/security.nix ./system/security.nix
./system/snapper.nix ./system/snapper.nix

19
modules/system/nix-porcupine.nix Normal file
View file

@ -0,0 +1,19 @@
{ config, lib, pkgs, ... }: {
nix = rec {
package = pkgs.nix_2_4;
binaryCaches = [
"https://cache.nixos.org?priority=10"
"https://lava.cachix.org"
];
binaryCachePublicKeys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
];
trustedBinaryCaches = binaryCaches;
extraOptions = ''
experimental-features = nix-command flakes
'';
};
nixpkgs.config.allowUnfree = true;
}

27
modules/system/nix.nix
View file

@ -1,17 +1,20 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
nix = rec { nix = {
package = pkgs.nixUnstable; package = pkgs.nixUnstable;
binaryCaches = [
"https://cache.nixos.org?priority=10" settings = rec {
"https://lava.cachix.org" substituters = [
"https://nix-gaming.cachix.org" "https://cache.nixos.org?priority=10"
]; "https://lava.cachix.org"
binaryCachePublicKeys = [ "https://nix-gaming.cachix.org"
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
"lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0=" trusted-public-keys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
]; "lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
trustedBinaryCaches = binaryCaches; "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
];
trusted-substituters = substituters;
};
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes