modules/nixos: enable comin by default, remove autoUpgrade
This commit is contained in:
parent
6de657cc41
commit
4451078682
5 changed files with 2 additions and 23 deletions
hosts
modules/nixos/common
|
@ -8,9 +8,6 @@
|
||||||
inputs.self.nixosModules.community-builder
|
inputs.self.nixosModules.community-builder
|
||||||
];
|
];
|
||||||
|
|
||||||
services.comin.enable = true;
|
|
||||||
system.autoUpgrade.enable = false;
|
|
||||||
|
|
||||||
# Emulate riscv64 until we have proper builders
|
# Emulate riscv64 until we have proper builders
|
||||||
boot.binfmt.emulatedSystems = [ "riscv64-linux" ];
|
boot.binfmt.emulatedSystems = [ "riscv64-linux" ];
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,6 @@
|
||||||
inputs.self.nixosModules.remote-builder
|
inputs.self.nixosModules.remote-builder
|
||||||
];
|
];
|
||||||
|
|
||||||
services.comin.enable = true;
|
|
||||||
system.autoUpgrade.enable = false;
|
|
||||||
|
|
||||||
nixCommunity.remote-builder.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEmdo1x1QkRepZf7nSe+OdEWX+wOjkBLF70vX9F+xf68 builder";
|
nixCommunity.remote-builder.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEmdo1x1QkRepZf7nSe+OdEWX+wOjkBLF70vX9F+xf68 builder";
|
||||||
|
|
||||||
networking.hostName = "build04";
|
networking.hostName = "build04";
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
{ lib, ... }:
|
|
||||||
{
|
|
||||||
system.autoUpgrade.enable = lib.mkDefault true;
|
|
||||||
system.autoUpgrade.flake = "github:nix-community/infra";
|
|
||||||
system.autoUpgrade.dates = "hourly";
|
|
||||||
system.autoUpgrade.flags = [ "--option" "accept-flake-config" "true" "--option" "tarball-ttl" "0" ];
|
|
||||||
|
|
||||||
# Restart the upgrade service if it fails twice in 5 seconds.
|
|
||||||
systemd.services.nixos-upgrade = {
|
|
||||||
unitConfig.StartLimitBurst = 2;
|
|
||||||
unitConfig.StartLimitIntervalSec = 5;
|
|
||||||
serviceConfig.Restart = "on-failure";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ inputs, lib, ... }:
|
{ inputs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.comin.nixosModules.comin
|
inputs.comin.nixosModules.comin
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
services.comin = {
|
services.comin = {
|
||||||
enable = lib.mkDefault false;
|
enable = true;
|
||||||
remotes = [
|
remotes = [
|
||||||
{
|
{
|
||||||
url = "https://github.com/nix-community/infra.git";
|
url = "https://github.com/nix-community/infra.git";
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ config, inputs, pkgs, ... }:
|
{ config, inputs, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./auto-upgrade.nix
|
|
||||||
./comin.nix
|
./comin.nix
|
||||||
../../shared/known-hosts.nix
|
../../shared/known-hosts.nix
|
||||||
../../shared/nix-daemon.nix
|
../../shared/nix-daemon.nix
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue