Compare commits
2 commits
cb29ee3c9f
...
13bacc1ef1
| Author | SHA1 | Date | |
|---|---|---|---|
| 13bacc1ef1 | |||
| 06184eb1b3 |
2 changed files with 4 additions and 24 deletions
|
|
@ -25,13 +25,6 @@ in
|
||||||
enable = mkBoolOpt false "Whether or not to manage nix configuration.";
|
enable = mkBoolOpt false "Whether or not to manage nix configuration.";
|
||||||
package = mkOpt package pkgs.nix "Which nix package to use.";
|
package = mkOpt package pkgs.nix "Which nix package to use.";
|
||||||
|
|
||||||
default-substituter = {
|
|
||||||
url = mkOpt str "https://cache.nixos.org" "The url for the substituter.";
|
|
||||||
key =
|
|
||||||
mkOpt str "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
|
||||||
"The trusted public key for the substituter.";
|
|
||||||
};
|
|
||||||
|
|
||||||
extra-substituters = mkOpt (attrsOf substituters-submodule) { } "Extra substituters to configure.";
|
extra-substituters = mkOpt (attrsOf substituters-submodule) { } "Extra substituters to configure.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -58,7 +51,6 @@ in
|
||||||
nix =
|
nix =
|
||||||
let
|
let
|
||||||
users = [
|
users = [
|
||||||
"root"
|
|
||||||
config.metacfg.user.name
|
config.metacfg.user.name
|
||||||
]
|
]
|
||||||
++ optional config.services.hydra.enable "hydra";
|
++ optional config.services.hydra.enable "hydra";
|
||||||
|
|
@ -75,19 +67,11 @@ in
|
||||||
sandbox = true;
|
sandbox = true;
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
trusted-users = users;
|
trusted-users = users;
|
||||||
allowed-users = [
|
allowed-users = [ "@users" ];
|
||||||
"@users"
|
|
||||||
"root"
|
|
||||||
];
|
|
||||||
|
|
||||||
substituters = [
|
# NixOS already adds cache.nixos.org by default, only add extra substituters
|
||||||
cfg.default-substituter.url
|
substituters = mapAttrsToList (name: _: name) extra-substituters;
|
||||||
]
|
trusted-public-keys = mapAttrsToList (_: value: value.key) extra-substituters;
|
||||||
++ (mapAttrsToList (name: value: name) extra-substituters);
|
|
||||||
trusted-public-keys = [
|
|
||||||
cfg.default-substituter.key
|
|
||||||
]
|
|
||||||
++ (mapAttrsToList (name: value: value.key) extra-substituters);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
// (lib.optionalAttrs config.metacfg.tools.direnv.enable {
|
// (lib.optionalAttrs config.metacfg.tools.direnv.enable {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
|
|
@ -19,9 +18,6 @@ with lib.metacfg;
|
||||||
22000
|
22000
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.ccache.enable = true;
|
|
||||||
nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
|
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
|
|
||||||
services.cratedocs-mcp.enable = true;
|
services.cratedocs-mcp.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue