From 00b019ed040ac4f3081bbba33e108b010034c1c2 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 30 Apr 2024 09:52:33 +0200
Subject: [PATCH] deploy-rs currently does not work over Tailscale

Neither does nixos-rebuild by the way
---
 flake.lock | 53 ++++++-----------------------------------------------
 flake.nix  | 23 -----------------------
 2 files changed, 6 insertions(+), 70 deletions(-)

diff --git a/flake.lock b/flake.lock
index 91ed4fe..369dc93 100644
--- a/flake.lock
+++ b/flake.lock
@@ -160,7 +160,7 @@
     },
     "crane_3": {
       "inputs": {
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_5",
         "flake-utils": [
           "ha-now-playing",
           "flake-utils"
@@ -188,30 +188,6 @@
         "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": [
@@ -258,7 +234,7 @@
     },
     "eww": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_4",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -345,22 +321,6 @@
       }
     },
     "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,
@@ -376,7 +336,7 @@
         "type": "github"
       }
     },
-    "flake-compat_7": {
+    "flake-compat_6": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -392,7 +352,7 @@
         "type": "github"
       }
     },
-    "flake-compat_8": {
+    "flake-compat_7": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -688,7 +648,7 @@
     },
     "nix-ld-rs": {
       "inputs": {
-        "flake-compat": "flake-compat_7",
+        "flake-compat": "flake-compat_6",
         "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
@@ -867,7 +827,7 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_8",
+        "flake-compat": "flake-compat_7",
         "flake-utils": [
           "flake-utils"
         ],
@@ -898,7 +858,6 @@
         "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 66327b9..443f2b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -106,12 +106,6 @@
       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 = {
@@ -203,22 +197,6 @@
           }) (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 = {
@@ -315,7 +293,6 @@
               packages = [
                 age
                 config.packages.git-repo-go
-                inputs'.deploy-rs.packages.deploy-rs
                 inputs'.colmena.packages.colmena
                 just
                 lswt