thin out ssh config now that I use yoshi

3 files changed, 30 insertions, 27 deletions

diff --git a/flake.lock b/flake.lock
index f1dc9c1..afff1b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -549,11 +549,11 @@
     "yoshi-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1769401156,
-        "narHash": "sha256-FkxS0bSSRY4dRouDgfRRuAHl6CosYPZVjf0rtD5XxSs=",
+        "lastModified": 1769448007,
+        "narHash": "sha256-Wz/ZQ7BDXG8CcDmzptoK1T0E1Ok4jCmvEoL6e51nvrw=",
         "owner": "bluedragon1221",
         "repo": "yoshi",
-        "rev": "fb109139eb6ddc77c9703b3f0e0047bbdde3c03b",
+        "rev": "d5c4869cdb82b1f7b0f4abee0e177944ed4e2203",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 880eb70..a4805cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,7 +58,22 @@
   outputs = inputs: let
     inherit (import ./lib/nix-furnace/mkSystem.nix) mkNixosSystem genDocs;
 
-    buildPkgs = import inputs.nixpkgs {system = "x86_64-linux";};
+    system = "x86_64-linux";
+
+    buildPkgs = import inputs.nixpkgs {inherit system;};
+
+    deployPkgs = import inputs.nixpkgs {
+      inherit system;
+      overlays = [
+        inputs.deploy-rs.overlays.default
+        (self: super: {
+          deploy-rs = {
+            inherit (buildPkgs) deploy-rs;
+            lib = super.deploy-rs.lib;
+          };
+        })
+      ];
+    };
   in rec {
     nixosConfigurations."mercury" = mkNixosSystem {
       inherit inputs;
@@ -82,14 +97,16 @@
       hostname = "mercury";
     };
 
-    deploy.nodes."ganymede-deploy" = {
-      hostname = "ganymede-deploy";
+    deploy.nodes."ganymede" = {
+      hostname = "ganymede";
       sshUser = "root";
 
       profiles.system = {
         user = "root";
-        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos nixosConfigurations."ganymede";
+        path = deployPkgs.deploy-rs.lib.activate.nixos nixosConfigurations."ganymede";
       };
     };
+
+    checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks deploy) inputs.deploy-rs.lib;
   };
 }
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index da8b647..80c61e3 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -24,30 +24,16 @@
 
   environment.defaultPackages = lib.mkForce []; # im not a noob
 
+  programs.ssh.extraConfig = ''
+    Host ganymede
+      HostName 192.168.50.2
+      Port 2222
+  '';
+
   programs.firefox.policies.ExtensionSettings = {
     "foxyproxy@eric.h.jung" = {
       installation_mode = "force_installed";
       install_url = "https://addons.mozilla.org/firefox/downloads/latest/foxyproxy-standard/latest.xpi";
     };
   };
-
-  programs.ssh.extraConfig = ''
-    Host ganymede
-      LocalForward 8010 127.0.0.1:8010
-
-    Match host ganymede !exec "nc -z -w1 192.168.50.2 2222"
-      HostName williamsfam.us.com
-      Port 22
-      DynamicForward 9090
-
-    Match host ganymede exec "nc -z -w1 192.168.50.2 2222"
-      HostName 192.168.50.2
-      Port 2222
-
-    Host io
-      Hostname 192.168.50.3
-
-    Match host io !exec "nc -z -w1 192.168.50.3 22"
-      ProxyJump ganymede
-  '';
 }