Compare commits
2 commits
51fe8f9f0a
...
5df99ba01d
Author | SHA1 | Date | |
---|---|---|---|
5df99ba01d | |||
c6e07e644a |
5 changed files with 28 additions and 22 deletions
|
@ -39,9 +39,5 @@ in {
|
|||
exec ${pkgs.disko}/bin/disko-install --flake "${nixos-config}#not522" --disk main "${nixos-config.nixosConfigurations.not522.config.disko.devices.disk.main.device}"
|
||||
'')
|
||||
];
|
||||
nix.settings.substituters = lib.mkForce [
|
||||
"https://attic.chir.rs/chir-rs/"
|
||||
"https://hydra.chir.rs"
|
||||
"https://cache.nixos.org"
|
||||
];
|
||||
isInstaller = true;
|
||||
}
|
||||
|
|
|
@ -18,9 +18,5 @@
|
|||
./graphical.nix
|
||||
];
|
||||
};
|
||||
nix.settings.substituters = lib.mkForce [
|
||||
"https://attic.chir.rs/chir-rs/"
|
||||
"https://hydra.chir.rs"
|
||||
"https://cache.nixos.org"
|
||||
];
|
||||
isInstaller = true;
|
||||
}
|
||||
|
|
|
@ -16,4 +16,5 @@ with lib; {
|
|||
"${home-manager}/nixos"
|
||||
];
|
||||
options.isGraphical = mkEnableOption "Whether or not this configuration is a graphical install";
|
||||
options.isInstaller = mkEnableOption "Whether or not this configuration is an installer and has no access to secrets";
|
||||
}
|
||||
|
|
|
@ -1,13 +1,19 @@
|
|||
{config, ...}: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
imports = [
|
||||
./link-inputs.nix
|
||||
./lix.nix
|
||||
./autoupdater.nix
|
||||
];
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://attic.chir.rs/chir-rs/"
|
||||
"https://hydra.int.chir.rs"
|
||||
substituters = mkMerge [
|
||||
["https://attic.chir.rs/chir-rs/"]
|
||||
(mkIf (!config.isInstaller) ["https://hydra.int.chir.rs"])
|
||||
(mkIf config.isInstaller ["https://hydra.chir.rs"])
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg="
|
||||
|
|
|
@ -1,10 +1,17 @@
|
|||
{config, ...}: {
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
authKeyFile = config.sops.secrets."services/tailscale/authKey".path;
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
config = mkIf (!config.isInstaller) {
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
authKeyFile = config.sops.secrets."services/tailscale/authKey".path;
|
||||
};
|
||||
sops.secrets."services/tailscale/authKey".sopsFile = ./tailscale.yaml;
|
||||
environment.persistence."/persistent".directories = [
|
||||
"/var/lib/tailscale"
|
||||
];
|
||||
};
|
||||
sops.secrets."services/tailscale/authKey".sopsFile = ./tailscale.yaml;
|
||||
environment.persistence."/persistent".directories = [
|
||||
"/var/lib/tailscale"
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue