home

commit f35481b6f2426e1065cc9d3a57204db323dbe903
parent feba80ff3ea7edac61b8be917b3286b739403acf
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 31 May 2022 11:25:41 +0200

flake: remove deploy-rs…

… I am using nixos-rebuild for everything now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
flake.lock
 | 
47
+++--------------------------------------------
M
flake.nix
 | 
33
+--------------------------------

2 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -1,29 +1,5 @@
 {
   "nodes": {
-    "deploy-rs": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": [
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1653594315,
-        "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "184349d8149436748986d1bdba087e4149e9c160",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "type": "github"
-      }
-    },
     "devshell": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -86,22 +62,6 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
         "lastModified": 1650374568,
         "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
         "owner": "edolstra",
@@ -115,7 +75,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1648199409,
@@ -345,7 +305,7 @@
     },
     "nixos-wsl": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
@@ -474,11 +434,10 @@
     },
     "root": {
       "inputs": {
-        "deploy-rs": "deploy-rs",
         "devshell": "devshell",
         "emacs-overlay": "emacs-overlay",
         "envfs": "envfs",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_3",
         "flake-utils-plus": "flake-utils-plus",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
@@ -22,13 +22,6 @@
     nur.url = "github:nix-community/NUR";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
 
-    deploy-rs = {
-      type = "github";
-      owner = "serokell";
-      repo = "deploy-rs";
-      inputs.utils.follows = "flake-utils";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     sops-nix = {
       type = "github";
       owner = "Mic92";
@@ -68,7 +61,6 @@
     , envfs
     , nixos-wsl
     , nixos-hardware
-    , deploy-rs
     , ...
     } @ inputs:
     let
@@ -215,29 +207,7 @@
         };
       };
 
-      # deploy-rs setup
-      deploy =
-        let
-          mkNode = server: ip: fast: {
-            hostname = "${ip}";
-            fastConnection = false;
-            profiles.system.path =
-              deploy-rs.lib.x86_64-linux.activate.nixos
-                self.nixosConfigurations."${server}";
-          };
-        in
-        {
-          user = "root";
-          sshUser = "root";
-          nodes = {
-            shikoku = mkNode "shikoku" "192.168.1.24" true;
-            wakasu = mkNode "wakasu" "192.168.1.77" true;
-            sakhalin = mkNode "sakhalin" "192.168.1.70" true;
-            kerkouane = mkNode "kerkouane" "kerkouane.vpn" false;
-          };
-        };
-
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
+      # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
 
       outputsBuilder = channels:
         let
@@ -269,7 +239,6 @@
                 git
                 nixpkgs-fmt
                 sops
-                deploy-rs.packages."x86_64-linux".deploy-rs
               ];
             };
         };