Merge branch 'main' of github.com:asosnovsky/nixos-setup
This commit is contained in:
commit
baeffc96cc
4 files changed
+23
-3
No files matched your search
@@ -17,6 +17,7 @@
|
||||
enable = false;
|
||||
enableDevelopmentKit = false;
|
||||
}
|
||||
, localNixCaches ? [ ]
|
||||
, ...
|
||||
}:
|
||||
{ ... }: {
|
||||
@@ -24,6 +25,7 @@
|
||||
(import ./nix {
|
||||
user = user;
|
||||
systemStateVersion = systemStateVersion;
|
||||
localNixCaches = localNixCaches;
|
||||
})
|
||||
] ++ (if desktop.enable then
|
||||
[ (import ./desktop ({ user = user; } // desktop)) ]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ user, systemStateVersion }:
|
||||
{ user, systemStateVersion, localNixCaches ? [ ] }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
# Nix core
|
||||
@@ -10,11 +10,11 @@
|
||||
"https://cache.nixos.org"
|
||||
"https://cache.flox.dev"
|
||||
"https://devenv.cachix.org"
|
||||
];
|
||||
] ++ localNixCaches;
|
||||
trusted-substituters = [
|
||||
"https://cache.flox.dev"
|
||||
"https://devenv.cachix.org"
|
||||
];
|
||||
] ++ localNixCaches;
|
||||
trusted-users = [ "root" user.name ];
|
||||
trusted-public-keys = [
|
||||
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
|
||||
|
||||
Reference in new issue
Block a user