From 05b661a4957479c24d04e1250dce8d89b4158f44 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 20 Jul 2022 14:13:22 +1000 Subject: [PATCH] nixops: converted to flakes --- .envrc | 2 ++ nixops.nix | 21 --------------------- outputs.nix | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 nixops.nix diff --git a/.envrc b/.envrc index 005a801..1678f0e 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,4 @@ use flake watch_file flake.nix + +export NIXOPS_DEPLOYMENT=jfdic-ops diff --git a/nixops.nix b/nixops.nix deleted file mode 100644 index 4efccda..0000000 --- a/nixops.nix +++ /dev/null @@ -1,21 +0,0 @@ -# NixOps configuration for the jfdic-ops nodes - -{ - network = { - description = "jfdic-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 - }; - - toscano = import ./hosts/toscano.nix; -} diff --git a/outputs.nix b/outputs.nix index 99f2b92..29d26ac 100644 --- a/outputs.nix +++ b/outputs.nix @@ -20,6 +20,25 @@ in { }; })) // { + nixopsConfigurations.default = { + inherit nixpkgs; + network = { + description = "jfdic-ops nodes"; + enableRollback = true; + storage.legacy = { + databasefile = "~/.nixops/deployments.nixops"; + }; + }; + defaults = { + config, + pkgs, + lib, + ... + }: { + system.autoUpgrade.enable = false; # Disabled as it conflicts with NixOps + }; + toscano = import ./hosts/toscano.nix; + }; nixosConfigurations = import ./nixos/configurations.nix (inputs // { inherit inputs;