From d8da4009c3c2ac28a6816eef00fb00aa1f6b81e7 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Wed, 7 Dec 2022 02:20:01 +1000 Subject: [PATCH] pass deploy checks too --- flake.nix | 39 +++++++++++++++------------ hosts/profiles/monitoring/default.nix | 8 +++--- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/flake.nix b/flake.nix index fd7fc905..eae92cb8 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,7 @@ "x86_64-darwin" ]; unstableOverlay = final: prev: { + # We already have these in scope unstable = unstable.legacyPackages.${prev.system}; deploy = deploy-rs.packages.${prev.system}.deploy-rs; }; @@ -211,7 +212,7 @@ # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { "anish@work" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + pkgs = nixpkgsFor."x86_64-linux"; # Home-manager requires 'pkgs' instance extraSpecialArgs = { inherit inputs; }; modules = [ ./home/core.nix @@ -221,29 +222,33 @@ }; deploy.nodes = { - curve.profiles.system = { - user = "anish"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.curve; - }; - box.profiles.system = { - user = "anish"; + box = { hostname = "mossnet.lan"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.box; + profiles.system = { + user = "anish"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.box; + }; }; - helix.profiles.system = { - user = "anish"; + helix = { hostname = "sealight.xyz"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.helix; + profiles.system = { + user = "anish"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.helix; + }; }; - lituus.profiles.system = { - user = "anish"; + lituus = { hostname = "git.sealight.xyz"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.lituus; + profiles.system = { + user = "anish"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.lituus; + }; }; - cube.profiles.system = { - user = "anish"; + cube = { hostname = "anish.lakhwara.com"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cube; + profiles.system = { + user = "anish"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cube; + }; }; }; diff --git a/hosts/profiles/monitoring/default.nix b/hosts/profiles/monitoring/default.nix index f4f4b6e5..0d2b827a 100644 --- a/hosts/profiles/monitoring/default.nix +++ b/hosts/profiles/monitoring/default.nix @@ -44,10 +44,10 @@ ]; }; - services.loki = { - #enable = true; - #configFile = /var/loki-config.yaml; - }; + # services.loki = { + # enable = true; + # configFile = /var/loki-config.yaml; + # }; #systemd.services.promtail = { # description = "Promtail service for Loki";