From e261780bd410aae727e873a9f5762342aa020087 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 25 Apr 2024 20:45:29 +0200 Subject: [PATCH] flake: Giving deploy-rs another go --- flake.lock | 53 +++++++++++++++++++++++++++++++++++++++++++++++------ flake.nix | 23 +++++++++++++++++++++++ 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 30cbe31..d4460a9 100644 --- a/flake.lock +++ b/flake.lock @@ -160,7 +160,7 @@ }, "crane_3": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils": [ "ha-now-playing", "flake-utils" @@ -188,6 +188,30 @@ "type": "github" } }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat_4", + "nixpkgs": [ + "nixpkgs" + ], + "utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1711973905, + "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", + "type": "github" + }, + "original": { + "owner": "serokell", + "repo": "deploy-rs", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -234,7 +258,7 @@ }, "eww": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ], @@ -321,6 +345,22 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696267196, @@ -336,7 +376,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -352,7 +392,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1696426674, @@ -648,7 +688,7 @@ }, "nix-ld-rs": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" @@ -827,7 +867,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "flake-utils": [ "flake-utils" ], @@ -858,6 +898,7 @@ "atuin": "atuin", "caddy-with-plugins": "caddy-with-plugins", "colmena": "colmena", + "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", "eww": "eww", diff --git a/flake.nix b/flake.nix index dd25833..371eba5 100644 --- a/flake.nix +++ b/flake.nix @@ -106,6 +106,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + deploy-rs = { + url = "github:serokell/deploy-rs"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "flake-utils"; + }; + atuin = { url = "github:atuinsh/atuin"; inputs = { @@ -197,6 +203,22 @@ }) (builtins.attrNames machines) ); + deploy = { + nodes = { + neo = { + hostname = "10.0.0.213"; + profiles = { + system = { + path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.neo; + }; + }; + }; + }; + sshUser = "erwin"; + user = "root"; + sshOpts = [ "-t" ]; + }; + colmena = { meta = { @@ -293,6 +315,7 @@ packages = [ age config.packages.git-repo-go + inputs'.deploy-rs.packages.deploy-rs inputs'.colmena.packages.colmena just lswt