From e47519137b4e75017cc984fdc772928b3d16a5e2 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 22 Aug 2024 12:52:01 +1000 Subject: [PATCH] chore(nix): remove nixops.nix --- nixops.nix | 34 ---------------------------------- outputs.nix | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 34 deletions(-) delete mode 100644 nixops.nix diff --git a/nixops.nix b/nixops.nix deleted file mode 100644 index 74f5099..0000000 --- a/nixops.nix +++ /dev/null @@ -1,34 +0,0 @@ -# NixOps configuration for the mio-ops nodes -{ - network = { - description = "mio-ops nodes"; - enableRollback = true; - }; - - network.storage.legacy = {databasefile = "~/.nixops/deployments.nixops";}; - - defaults = { - config, - pkgs, - lib, - ... - }: { - system.autoUpgrade.enable = false; # Disabled as it conflicts with NixOps - }; - - airgead = import hosts/airgead.nix; - brighde = import hosts/brighde.nix; - ceilidh = import hosts/ceilidh.nix; - cuallaidh = import hosts/cuallaidh.nix; - dhu = import hosts/dhu.nix; - dionach = import hosts/dionach.nix; - iolear-beag = import hosts/iolear-beag.nix; - doilidh = import hosts/doilidh.nix; - eamhair = import hosts/eamhair.nix; - ceitidh = import hosts/ceitidh.nix; - paidh-uachdar = import hosts/paidh-uachdar.nix; - sanganto = import hosts/sanganto.nix; - sercanto = import hosts/sercanto.nix; - sithlainnir = import hosts/sithlainnir.nix; - teintidh = import hosts/teintidh.nix; -} diff --git a/outputs.nix b/outputs.nix index 0157017..8c03d6a 100644 --- a/outputs.nix +++ b/outputs.nix @@ -16,6 +16,29 @@ in { inherit (nix.packages."${pkgs.system}") nix; inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra; }; + nixopsConfigurations."${pkgs.system}".default = { + inherit (inputs) nixpkgs; + network = { + description = "mio-ops nodes"; + enableRollback = true; + storage.legacy = {databasefile = "~/.nixops/deployments.nixops";}; + }; + airgead = import hosts/airgead.nix; + brighde = import hosts/brighde.nix; + ceilidh = import hosts/ceilidh.nix; + cuallaidh = import hosts/cuallaidh.nix; + dhu = import hosts/dhu.nix; + dionach = import hosts/dionach.nix; + iolear-beag = import hosts/iolear-beag.nix; + doilidh = import hosts/doilidh.nix; + eamhair = import hosts/eamhair.nix; + ceitidh = import hosts/ceitidh.nix; + paidh-uachdar = import hosts/paidh-uachdar.nix; + sanganto = import hosts/sanganto.nix; + sercanto = import hosts/sercanto.nix; + sithlainnir = import hosts/sithlainnir.nix; + teintidh = import hosts/teintidh.nix; + }; })) // { }